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

[Kevin Klues]

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

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/env/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	6 Jun 2007 22:40:18 -0000	1.4
--- Makefile.am	28 Aug 2007 04:34:46 -0000	1.5
***************
*** 7,11 ****
  tinyoslib_PROGRAMS = @GETENVLIB@
  
! EXTRA_PROGRAMS = libgetenv-32.so libgetenv-64.so getenv.dll
  
  SOFLAGS = "-I$(JDK)/include/linux" "-I$(JDK)/include" -shared -fpic
--- 7,11 ----
  tinyoslib_PROGRAMS = @GETENVLIB@
  
! EXTRA_PROGRAMS = libgetenv-32.so libgetenv-64.so getenv.dll libgetenv.jnilib
  
  SOFLAGS = "-I$(JDK)/include/linux" "-I$(JDK)/include" -shared -fpic
***************
*** 24,25 ****
--- 24,29 ----
  getenv.dll: net_tinyos_util_Env.h net_tinyos_util_Env.c
  	gcc -shared -o$@ -mno-cygwin "-I$(JDK)/include" "-I$(JDK)/include/win32" -D_JNI_IMPLEMENTATION -Wl,--kill-at net_tinyos_util_Env.c
+ 
+ libgetenv.jnilib : net_tinyos_util_Env.h net_tinyos_util_Env.c
+ 	gcc "-I$(JDK)/Headers" -bundle -fPIC net_tinyos_util_Env.c -o $@
+