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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/08 08:55:50

Modified files:
        .              : Makefile 
        src/jni        : Makefile Makefile-Gen 

Log message:
        Try to fix javahs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/Makefile.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile-Gen.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: libvob/Makefile
diff -u libvob/Makefile:1.27 libvob/Makefile:1.28
--- libvob/Makefile:1.27        Mon Apr  7 11:58:50 2003
+++ libvob/Makefile     Tue Apr  8 08:55:50 2003
@@ -27,7 +27,7 @@
        make -C src/jni -f Makefile-Gen 
 
 jni: src/jni java
-       make -C src/jni javahs
+       make -C src/jni -f Makefile-Gen javahs
        make -C src/jni jnilib
 
 subdirs: $(SUBDIRS)
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.23 libvob/src/jni/Makefile:1.24
--- libvob/src/jni/Makefile:1.23        Fri Apr  4 07:34:59 2003
+++ libvob/src/jni/Makefile     Tue Apr  8 08:55:50 2003
@@ -48,13 +48,3 @@
 
 include $(sources:.cxx=.dep)
 
-.PHONY: javahs
-
-javahs: made_org_nongnu_libvob_gl_GL.h made_org_nongnu_libvob_gl_GLRen.h 
made_org_nongnu_libvob_gl_Paper.h
-
-made_org_nongnu_libvob_gl_GL.h: ../../CLASSES/org/nongnu/libvob/gl/GL.class
-       javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.GL && 
touch made_org_nongnu_libvob_gl_GL.h
-made_org_nongnu_libvob_gl_GLRen.h: 
../../CLASSES/org/nongnu/libvob/gl/GLRen.class
-       javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.GLRen 
&& touch made_org_nongnu_libvob_gl_GLRen.h
-made_org_nongnu_libvob_gl_Paper.h: 
../../CLASSES/org/nongnu/libvob/gl/Paper.class 
-       javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.Paper 
&& touch made_org_nongnu_libvob_gl_Paper.h
Index: libvob/src/jni/Makefile-Gen
diff -u libvob/src/jni/Makefile-Gen:1.4 libvob/src/jni/Makefile-Gen:1.5
--- libvob/src/jni/Makefile-Gen:1.4     Fri Apr  4 07:34:59 2003
+++ libvob/src/jni/Makefile-Gen Tue Apr  8 08:55:50 2003
@@ -43,6 +43,16 @@
 Generator: GeneratorMain.o $(VOB_OBJS) $(TRANS_OBJS)
        $(CXX) -o Generator $(CXXFLAGS) $(EXTRAINCLUDE) GeneratorMain.cxx 
$(VOB_OBJS) $(TRANS_OBJS) ../util/Debug.o $(LIBS)
 
+.PHONY: javahs
+
+javahs: made_org_nongnu_libvob_gl_GL.h made_org_nongnu_libvob_gl_GLRen.h 
made_org_nongnu_libvob_gl_Paper.h
+
+made_org_nongnu_libvob_gl_GL.h: ../../CLASSES/org/nongnu/libvob/gl/GL.class
+       javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.GL && 
touch made_org_nongnu_libvob_gl_GL.h
+made_org_nongnu_libvob_gl_GLRen.h: 
../../CLASSES/org/nongnu/libvob/gl/GLRen.class
+       javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.GLRen 
&& touch made_org_nongnu_libvob_gl_GLRen.h
+made_org_nongnu_libvob_gl_Paper.h: 
../../CLASSES/org/nongnu/libvob/gl/Paper.class 
+       javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.Paper 
&& touch made_org_nongnu_libvob_gl_Paper.h
 
 include $(VOBS:%=%.vobdep)
 include $(TRANS:%=%.transdep)