[Assorted-commits] SF.net SVN: assorted:[920] sandbox/trunk/src/java/java-from-c/Makefile

[<yan...@us...>]

Revision: 920
          http://assorted.svn.sourceforge.net/assorted/?rev=920&view=rev
Author:   yangzhang
Date:     2008-08-01 16:17:16 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
updated makefile with more direct build strategy

Modified Paths:
--------------
    sandbox/trunk/src/java/java-from-c/Makefile

Modified: sandbox/trunk/src/java/java-from-c/Makefile
===================================================================
--- sandbox/trunk/src/java/java-from-c/Makefile	2008-08-01 15:48:56 UTC (rev 919)
+++ sandbox/trunk/src/java/java-from-c/Makefile	2008-08-01 16:17:16 UTC (rev 920)
@@ -1,11 +1,28 @@
 CPATH := /usr/lib/jvm/java-6-openjdk/include:/usr/lib/jvm/java-6-openjdk/include/linux
-LIBRARY_PATH := /usr/lib/jvm/java-6-openjdk/jre/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server
+LIBRARY_PATH := $(JAVA_HOME)/jre/lib:$(JAVA_HOME)/jre/lib/amd64:$(JAVA_HOME)/jre/lib/amd64/jli:$(JAVA_HOME)/jre/lib/amd64/jli:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server
 LD_LIBRARY_PATH := $(LIBRARY_PATH):.
 
 all: test
 	./test
 
+dbg: test
+	gdb test
+
+# Two modes of building this.  The first is the more direct way for Linux, and
+# the second is more compatible with OS X platforms (which requires two
+# separate libraries to be built, a .jnilib and a .dylib).
+
+ifeq ($(mode),)
+
 test: JniTest.h jnitest.cpp libjnitest.so
+	g++ -g3 -o test jnitest.cpp libjnitest.so -ljava
+
+libjnitest.so: jnilib.cpp JniTest.h
+	g++ -g3 -shared -fPIC -o libjnitest.so jnilib.cpp
+
+else
+
+test: JniTest.h jnitest.cpp libjnitest.so
 	g++ -g3 -o test jnitest.cpp librealjnitest.so -ljava
 
 libjnitest.so: librealjnitest.so
@@ -14,6 +31,8 @@
 librealjnitest.so: jnilib.cpp JniTest.h
 	g++ -g3 -shared -fPIC -o librealjnitest.so jnilib.cpp
 
+endif
+
 JniTest.h: JniTest.class
 	javah JniTest
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.