From 6afd4abd284bd53cfee210ec0c3399b50cce4f4b Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 4 Sep 1999 11:40:52 +0000 Subject: [PATCH] changed dependency generation git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1165 379699f6-c40d-0410-875b-85095c16579e --- jode/jode/swingui/Makefile.am | 9 +++++---- jode/jode/type/Makefile.am | 9 +++++---- jode/jode/util/Makefile.am | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/jode/jode/swingui/Makefile.am b/jode/jode/swingui/Makefile.am index e5e7cad..79069b6 100644 --- a/jode/jode/swingui/Makefile.am +++ b/jode/jode/swingui/Makefile.am @@ -3,7 +3,8 @@ JAR = @JAR@ JAVAC = @JAVAC@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\ - -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) + -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) \ + -depfile=Makefile.dep CLASSPATH = @CLASSPATH@ CLASSLIB = @CLASSLIB@ SUBSTCP = @SUBSTCP@ @@ -17,13 +18,13 @@ MY_JAVA_FILES = \ noinst_DATA = $(MY_JAVA_FILES:.java=.class) EXTRA_DIST = $(MY_JAVA_FILES) -@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) +@QUOTE@-include Makefile.dep %.class: %.java $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $< -%.dep: %.class - $(JAVADEP) $< >$@ +Makefile.dep: $(MY_JAVA_FILES:.java=.class) + $(JAVADEP) $^ clean-local: @rm -f *.class diff --git a/jode/jode/type/Makefile.am b/jode/jode/type/Makefile.am index 288847d..755ed90 100644 --- a/jode/jode/type/Makefile.am +++ b/jode/jode/type/Makefile.am @@ -3,7 +3,8 @@ JAR = @JAR@ JAVAC = @JAVAC@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\ - -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) + -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) \ + -depfile=Makefile.dep CLASSPATH = @CLASSPATH@ CLASSLIB = @CLASSLIB@ SUBSTCP = @SUBSTCP@ @@ -22,13 +23,13 @@ MY_JAVA_FILES = \ noinst_DATA = $(MY_JAVA_FILES:.java=.class) EXTRA_DIST = $(MY_JAVA_FILES) -@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) +@QUOTE@-include Makefile.dep %.class: %.java $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $< -%.dep: %.class - $(JAVADEP) $< >$@ +Makefile.dep: $(MY_JAVA_FILES:.java=.class) + $(JAVADEP) $^ clean-local: @rm -f *.class diff --git a/jode/jode/util/Makefile.am b/jode/jode/util/Makefile.am index 6e20052..1fbeb4c 100644 --- a/jode/jode/util/Makefile.am +++ b/jode/jode/util/Makefile.am @@ -3,7 +3,8 @@ JAR = @JAR@ JAVAC = @JAVAC@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\ - -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) + -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) \ + -depfile=Makefile.dep CLASSPATH = @CLASSPATH@ CLASSLIB = @CLASSLIB@ SUBSTCP = @SUBSTCP@ @@ -18,13 +19,13 @@ MY_JAVA_FILES = \ noinst_DATA = $(MY_JAVA_FILES:.java=.class) EXTRA_DIST = $(MY_JAVA_FILES) -@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) +@QUOTE@-include Makefile.dep %.class: %.java $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $< -%.dep: %.class - $(JAVADEP) $< >$@ +Makefile.dep: $(MY_JAVA_FILES:.java=.class) + $(JAVADEP) $^ clean-local: @rm -f *.class