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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/24 13:49:43

Modified files:
        .              : rules.mk 
        src/jni        : Makefile 

Log message:
        Fix deps

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/rules.mk.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: libvob/rules.mk
diff -u libvob/rules.mk:1.16 libvob/rules.mk:1.17
--- libvob/rules.mk:1.16        Tue Apr 22 15:50:05 2003
+++ libvob/rules.mk     Thu Apr 24 13:49:42 2003
@@ -1,6 +1,6 @@
 GCCVER=3.2
 
-.SUFFIXES: $(SUFFIXES) .dep .cxx .vobgenobj .transgenobj .vobdep .transdep 
.vobjniobj .transjniobj .vobgenjni .transgenjni
+.SUFFIXES: $(SUFFIXES) .dep .cxx .vobgenobj .transgenobj .vobdep .transdep 
.vobjniobj .transjniobj .vobgenjni .transgenjni .vobjnidep .transjnidep
 
 CXX=g++-$(GCCVER)
 CXXLINK=gcc-$(GCCVER)
@@ -34,7 +34,16 @@
 JAVAC=javac
 
 %.dep: %.cxx
-       $(SHELL) -ec '$(CXX) -M $(CPPFLAGS) $< \
+       $(SHELL) -ec '$(CXX) -x c++ -M $(CPPFLAGS) $< \
+                      | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
+                      [ -s $@ ] || rm -f $@'
+
+%.vobjnidep: %.vobgenjni
+       $(SHELL) -ec '$(CXX) -x c++ -M $(CPPFLAGS) $< \
+                      | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
+                      [ -s $@ ] || rm -f $@'
+%.transjnidep: %.transgenjni
+       $(SHELL) -ec '$(CXX) -x c++ -M $(CPPFLAGS) $< \
                       | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
                       [ -s $@ ] || rm -f $@'
 
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.25 libvob/src/jni/Makefile:1.26
--- libvob/src/jni/Makefile:1.25        Tue Apr 15 09:54:20 2003
+++ libvob/src/jni/Makefile     Thu Apr 24 13:49:42 2003
@@ -47,4 +47,6 @@
 $(sources:.cxx=.dep) $(OBJS): org_nongnu_libvob_gl_GL.h 
org_nongnu_libvob_gl_GLRen.h org_nongnu_libvob_gl_Paper.h
 
 include $(sources:.cxx=.dep)
+include $(VOBS:%=%.vobjnidep)
+include $(TRANS:%=%.transjnidep)