[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/java/serial Makefile.am, 1.5, 1.6

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/java/serial
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23621/tinyos/java/serial

Modified Files:
	Makefile.am 
Log Message:
Fixed bug not allowing libgetenv and libtoscomm to be generated for darwin

Index: Makefile.am
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/java/serial/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	6 Jun 2007 22:40:18 -0000	1.5
--- Makefile.am	28 Aug 2007 04:34:46 -0000	1.6
***************
*** 7,11 ****
  tinyoslib_PROGRAMS = @TOSCOMMLIB@
  
! EXTRA_PROGRAMS = libtoscomm-32.so libtoscomm-64.so toscomm.dll
  
  # Compiling libtoscomm.so with -O2 generates bad code with gcc 4.1.x on x86_64
--- 7,11 ----
  tinyoslib_PROGRAMS = @TOSCOMMLIB@
  
! EXTRA_PROGRAMS = libtoscomm-32.so libtoscomm-64.so toscomm.dll libtoscomm.jnilib
  
  # Compiling libtoscomm.so with -O2 generates bad code with gcc 4.1.x on x86_64
***************
*** 25,28 ****
--- 25,37 ----
    TOSComm_wrap.cxx
  
+ libtoscomm_jnilib_SOURCES = \
+   NativeSerialEnums.h \
+   NativeSerial_darwin.cpp \
+   TOSComm_wrap.cxx
+ 
+ libtoscomm.jnilib:  $(libtoscomm_jnilib_SOURCES)
+ 	$(CXX) -O2 -bundle "-I$(JDK)/Headers" \
+ 	 -o $@ NativeSerial_darwin.cpp
+ 
  libtoscomm-32.so: $(libtoscomm_so_SOURCES)
  	$(CXX) -m32 $(SOFLAGS) -o $@ NativeSerial_linux.cpp