[Gzz-commits] libvob ./Makefile src/jni/Makefile

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/27 03:00:37

Modified files:
        .              : Makefile 
        src/jni        : Makefile 

Log message:
        twid

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/Makefile.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: libvob/Makefile
diff -u libvob/Makefile:1.19 libvob/Makefile:1.20
--- libvob/Makefile:1.19        Wed Mar 26 08:15:03 2003
+++ libvob/Makefile     Thu Mar 27 03:00:37 2003
@@ -1,12 +1,12 @@
 include rules.mk
 
-SUBDIRS = ctest src/trans src/util src/texture src/paper src/os src/jni 
src/main
+SUBDIRS = ctest src/trans src/util src/texture src/paper src/os src/main
 
 RAWSRC = `find org/ -name "*.java"` 
 
 .PHONY: all subdirs $(SUBDIRS)
 
-all: subdirs java jni
+all: subdirs generate java jni
 
 CLASSDIR=CLASSES/
 
@@ -22,7 +22,8 @@
 
 ctest: src/trans
 
-src/jni: src/os src/texture src/util src/trans src/main
+generate: src/os src/texture src/util src/trans src/main
+       make -C src/jni -f Makefile-Gen 
 
 jni: src/jni java
        make -C src/jni jnilib
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.20 libvob/src/jni/Makefile:1.21
--- libvob/src/jni/Makefile:1.20        Thu Mar 27 02:56:55 2003
+++ libvob/src/jni/Makefile     Thu Mar 27 03:00:37 2003
@@ -25,12 +25,12 @@
 
 LIBS=-lGL -lGLU -lstdc++ -lfreetype `gdk-pixbuf-config --libs`
 
-all: $(sources:.cxx=.o) Gen 
+all: $(sources:.cxx=.o) jnilib 
 
 jnilib: libvobjni.so
 
 Gen: Gen.o
-       $(CXX) -o Gen Gen.o ../util/Debug.o $(LIBS)$
+       $(CXX) -o Gen Gen.o ../util/Debug.o $(LIBS)
 
 GLRen.gen.cxx: Gen GLRen.template.java
        (cd ../..; src/jni/Gen)