From 936aa4ced02eebf995002961dcff4a4e2bb20502 Mon Sep 17 00:00:00 2001 From: "pedemont%us.ibm.com" Date: Wed, 18 Oct 2006 20:08:19 +0000 Subject: [PATCH] OK, let's simplify this, to see if I can fix the bustage. XULRunner only. git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@213808 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/java/xpcom/interfaces/Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mozilla/extensions/java/xpcom/interfaces/Makefile.in b/mozilla/extensions/java/xpcom/interfaces/Makefile.in index c96d76520cb..0b77d49b2f4 100644 --- a/mozilla/extensions/java/xpcom/interfaces/Makefile.in +++ b/mozilla/extensions/java/xpcom/interfaces/Makefile.in @@ -75,18 +75,15 @@ GARBAGE_DIRS += _java $(JAVA_SRCS_DIR):: $(NSINSTALL) -D $@ -COPIED_JAVA_SRCS = $(addprefix $(JAVA_SRCS_DIR)/,$(notdir $(JAVA_SRCS))) -$(COPIED_JAVA_SRCS): $(JAVA_SRCS) $(JAVA_SRCS_DIR) - @echo Copying Java source files - $(NSINSTALL) -m 644 $^ - $(JAVA_SRCS_DIR)/IXPCOMError.java: $(topsrcdir)/xpcom/base/nsError.h gen-nsError.pl Makefile Makefile.in $(JAVA_SRCS_DIR) $(PERL) $(srcdir)/../gen-nsError.pl < $< > $@ # Using the temporary "java.files" avoids an "argument list too long" # error on Windows when using *.java COMPILED_JAVA_CLASSES = $(addprefix org/mozilla/xpcom/,$(notdir $(JAVA_SRCS:.java=.class))) -$(COMPILED_JAVA_CLASSES): $(JAVA_SRCS_DIR)/IXPCOMError.java $(COPIED_JAVA_SRCS) +$(COMPILED_JAVA_CLASSES): $(JAVA_SRCS_DIR)/IXPCOMError.java $(JAVA_SRCS) + @echo Copying Java source files + $(NSINSTALL) -m 644 $(JAVA_SRCS) $(JAVA_SRCS_DIR) @echo Compiling Java classes find _java -name "*.java" > java.files find $(JAVA_DIST_DIR)/default -name "*.java" >> java.files