From 81b43965eb7f887a53ec966b9c368c76e10434f5 Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 4 Sep 1999 11:39:43 +0000 Subject: [PATCH] changed dependency generation. git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1163 379699f6-c40d-0410-875b-85095c16579e --- jode/jode/Makefile.am | 9 +++++---- jode/jode/bytecode/Makefile.am | 9 +++++---- jode/jode/decompiler/Makefile.am | 9 +++++---- jode/jode/expr/Makefile.am | 9 +++++---- jode/jode/flow/Makefile.am | 9 +++++---- jode/jode/jvm/Makefile.am | 9 +++++---- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/jode/jode/Makefile.am b/jode/jode/Makefile.am index 06369e0..425c216 100644 --- a/jode/jode/Makefile.am +++ b/jode/jode/Makefile.am @@ -5,7 +5,8 @@ SUBDIRS = util bytecode type jvm expr flow decompiler obfuscator @SWINGUI@ 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@ @@ -25,13 +26,13 @@ EXTRA_DIST = $(MY_JAVA_FILES) JARFILE = jode-@VERSION@.jar #data_DATA = $(JARFILE) -@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/bytecode/Makefile.am b/jode/jode/bytecode/Makefile.am index 278e005..20aad51 100644 --- a/jode/jode/bytecode/Makefile.am +++ b/jode/jode/bytecode/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@ @@ -31,13 +32,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/decompiler/Makefile.am b/jode/jode/decompiler/Makefile.am index 7fc5051..0876798 100644 --- a/jode/jode/decompiler/Makefile.am +++ b/jode/jode/decompiler/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@ @@ -30,13 +31,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/expr/Makefile.am b/jode/jode/expr/Makefile.am index 2f649e9..6d846cf 100644 --- a/jode/jode/expr/Makefile.am +++ b/jode/jode/expr/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@ @@ -56,13 +57,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/flow/Makefile.am b/jode/jode/flow/Makefile.am index 7a0c7b8..7fc1fc5 100644 --- a/jode/jode/flow/Makefile.am +++ b/jode/jode/flow/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@ @@ -54,13 +55,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/jvm/Makefile.am b/jode/jode/jvm/Makefile.am index 06d0202..dfa3f84 100644 --- a/jode/jode/jvm/Makefile.am +++ b/jode/jode/jvm/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@ @@ -23,13 +24,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