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

[David Gay]

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

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/env/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	5 Jun 2007 21:09:15 -0000	1.3
--- Makefile.am	6 Jun 2007 22:40:18 -0000	1.4
***************
*** 7,16 ****
  tinyoslib_PROGRAMS = @GETENVLIB@
  
! EXTRA_PROGRAMS = libgetenv.so getenv.dll
  
! libgetenv_so_SOURCES = net_tinyos_util_Env.h net_tinyos_util_Env.c
  
! libgetenv.so : net_tinyos_util_Env.h net_tinyos_util_Env.c
! 	gcc "-I$(JDK)/include/linux" "-I$(JDK)/include" -shared -fpic -m32 net_tinyos_util_Env.c -o$@
  
  getenv.dll: net_tinyos_util_Env.h net_tinyos_util_Env.c
--- 7,24 ----
  tinyoslib_PROGRAMS = @GETENVLIB@
  
! EXTRA_PROGRAMS = libgetenv-32.so libgetenv-64.so getenv.dll
  
! SOFLAGS = "-I$(JDK)/include/linux" "-I$(JDK)/include" -shared -fpic
  
! libgetenv_32_so_SOURCES = net_tinyos_util_Env.h net_tinyos_util_Env.c
! libgetenv_64_so_SOURCES = $(libgetenv_32_so_SOURCES)
! 
! libgetenv-32.so : net_tinyos_util_Env.h net_tinyos_util_Env.c
! 	$(CC) $(SOFLAGS) -m32 net_tinyos_util_Env.c -o$@
! 
! libgetenv-64.so : net_tinyos_util_Env.h net_tinyos_util_Env.c
! 	@echo $(CC) $(SOFLAGS) -m64 net_tinyos_util_Env.c -o$@
! 	@$(CC) $(SOFLAGS) -m64 net_tinyos_util_Env.c -o$@ || \
! 	(echo 64-bit libgetenv.so NOT GENERATED - DO NOT USE THIS RUN TO BUILD AN RPM; echo Press return to continue; read; rm -f libtoscomm-64.so)
  
  getenv.dll: net_tinyos_util_Env.h net_tinyos_util_Env.c