X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tools%2Ftinyos%2Fjava%2Fenv%2FMakefile.am;h=f451e8060464fd54ac6d24f39a965526af770d2d;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=5fad4c025a4eea99f50005c225a6b1eca447be86;hpb=1ba974b83d19fc41bf80acd52726f36f7f1df297;p=tinyos-2.x.git

diff --git a/tools/tinyos/java/env/Makefile.am b/tools/tinyos/java/env/Makefile.am
index 5fad4c02..f451e806 100644
--- a/tools/tinyos/java/env/Makefile.am
+++ b/tools/tinyos/java/env/Makefile.am
@@ -6,12 +6,25 @@ tinyoslibdir=$(libdir)/tinyos
 
 tinyoslib_PROGRAMS = @GETENVLIB@
 
-EXTRA_PROGRAMS = libgetenv.so getenv.dll
+EXTRA_PROGRAMS = libgetenv-32.so libgetenv-64.so getenv.dll libgetenv.jnilib
 
-libgetenv_so_SOURCES = net_tinyos_util_Env.h net_tinyos_util_Env.c
+SOFLAGS = "-I$(JDK)/include/linux" "-I$(JDK)/include" -shared -fpic
 
-libgetenv.so : net_tinyos_util_Env.h net_tinyos_util_Env.c
-	gcc "-I$(JDK)/include/linux" "-I$(JDK)/include" -shared -fpic net_tinyos_util_Env.c -o$@
+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$@ || \
+	(echo 32-bit libgetenv.so NOT GENERATED - DO NOT USE THIS RUN TO BUILD AN RPM; echo Press return to continue; read; rm -f $@)
+
+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 $@)
 
 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 $@
+