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

[David Gay]

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

Modified Files:
	Makefile.am 
Log Message:
build both 32 and 64-bit versions of the JNI code so as to support both
32 and 64-bit JDKs
install the appropriate JNI version depending on whether the JDK is 32 or 64-bit

all this is for Linux only for now


Index: Makefile.am
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/java/serial/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	5 Jun 2007 21:08:55 -0000	1.4
--- Makefile.am	6 Jun 2007 22:40:18 -0000	1.5
***************
*** 7,17 ****
  tinyoslib_PROGRAMS = @TOSCOMMLIB@
  
! EXTRA_PROGRAMS = libtoscomm.so toscomm.dll
  
! libtoscomm_so_SOURCES = \
    NativeSerialEnums.h \
    NativeSerial_linux.cpp \
    TOSComm_wrap.cxx
  
  toscomm_dll_SOURCES = \
    NativeSerialEnums.h \
--- 7,23 ----
  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
! # (the -O1 code is slightly weird, but works at least ;-))
! SOFLAGS = -O1 -shared -fPIC "-I$(JDK)/include" "-I$(JDK)/include/linux"
! 
! libtoscomm_32_so_SOURCES = \
    NativeSerialEnums.h \
    NativeSerial_linux.cpp \
    TOSComm_wrap.cxx
  
+ libtoscomm_64_so_SOURCES = $(libtoscomm_32_so_SOURCES)
+ 
  toscomm_dll_SOURCES = \
    NativeSerialEnums.h \
***************
*** 19,25 ****
    TOSComm_wrap.cxx
  
! libtoscomm.so: $(libtoscomm_so_SOURCES)
! 	$(CXX) -m32 -O2 -shared -fPIC "-I$(JDK)/include" "-I$(JDK)/include/linux" \
! 	  -o $@ NativeSerial_linux.cpp
  
  toscomm.dll: $(toscomm_dll_SOURCES)
--- 25,35 ----
    TOSComm_wrap.cxx
  
! libtoscomm-32.so: $(libtoscomm_so_SOURCES)
! 	$(CXX) -m32 $(SOFLAGS) -o $@ NativeSerial_linux.cpp
! 
! libtoscomm-64.so: $(libtoscomm_so_SOURCES)
! 	@echo $(CXX) -m64 $(SOFLAGS) -o $@ NativeSerial_linux.cpp
! 	@$(CXX) -m64 $(SOFLAGS) -o $@ NativeSerial_linux.cpp || \
! 	(echo 64-bit libtoscomm.so NOT GENERATED - DO NOT USE THIS RUN TO BUILD AN RPM; echo Press return to continue; read; rm -f libtoscomm-64.so)
  
  toscomm.dll: $(toscomm_dll_SOURCES)