changed dependency generation

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1165 379699f6-c40d-0410-875b-85095c16579e
branch_1_1
jochen 26 years ago
parent a23cab6985
commit 6afd4abd28
  1. 9
      jode/jode/swingui/Makefile.am
  2. 9
      jode/jode/type/Makefile.am
  3. 9
      jode/jode/util/Makefile.am

@ -3,7 +3,8 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\ 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@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@ SUBSTCP = @SUBSTCP@
@ -17,13 +18,13 @@ MY_JAVA_FILES = \
noinst_DATA = $(MY_JAVA_FILES:.java=.class) noinst_DATA = $(MY_JAVA_FILES:.java=.class)
EXTRA_DIST = $(MY_JAVA_FILES) EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include Makefile.dep
%.class: %.java %.class: %.java
$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class Makefile.dep: $(MY_JAVA_FILES:.java=.class)
$(JAVADEP) $< >$@ $(JAVADEP) $^
clean-local: clean-local:
@rm -f *.class @rm -f *.class

@ -3,7 +3,8 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\ 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@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@ SUBSTCP = @SUBSTCP@
@ -22,13 +23,13 @@ MY_JAVA_FILES = \
noinst_DATA = $(MY_JAVA_FILES:.java=.class) noinst_DATA = $(MY_JAVA_FILES:.java=.class)
EXTRA_DIST = $(MY_JAVA_FILES) EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include Makefile.dep
%.class: %.java %.class: %.java
$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class Makefile.dep: $(MY_JAVA_FILES:.java=.class)
$(JAVADEP) $< >$@ $(JAVADEP) $^
clean-local: clean-local:
@rm -f *.class @rm -f *.class

@ -3,7 +3,8 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\ 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@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@ SUBSTCP = @SUBSTCP@
@ -18,13 +19,13 @@ MY_JAVA_FILES = \
noinst_DATA = $(MY_JAVA_FILES:.java=.class) noinst_DATA = $(MY_JAVA_FILES:.java=.class)
EXTRA_DIST = $(MY_JAVA_FILES) EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include Makefile.dep
%.class: %.java %.class: %.java
$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class Makefile.dep: $(MY_JAVA_FILES:.java=.class)
$(JAVADEP) $< >$@ $(JAVADEP) $^
clean-local: clean-local:
@rm -f *.class @rm -f *.class

Loading…
Cancel
Save