--- java-gcj-compat-1.0.50/Makefile.am.orig 2006-01-14 02:42:15.000000000 +0100 +++ java-gcj-compat-1.0.50/Makefile.am 2006-01-14 02:43:52.000000000 +0100 @@ -5,9 +5,6 @@ jardir = $(SDK_LIB_DIR) jar_DATA = tools.jar -javadoc_jarfile = /usr/share/java/com-sun-javadoc-0.7.7.jar -taglet_jarfile = /usr/share/java/com-sun-tools-doclets-Taglet-0.7.7.jar - tools_jar_source_files = \ $(top_builddir)/com/sun/tools/javac/Config.java \ com/sun/tools/javac/Main.java \ @@ -20,10 +17,7 @@ javadoc_class_files = com/sun/tools/doclets/Taglet.class com/sun/javadoc/Doc.class -$(javadoc_class_files): $(javadoc_jarfile) $(taglet_jarfile) - $(JAR) xf $(javadoc_jarfile) - $(JAR) xf $(taglet_jarfile) - rm -rf META-INF +$(javadoc_class_files): pr13212.so: pr13212.c $(GCJ_BIN_DIR)/gcc$(gcc_suffix) $(CFLAGS) -fPIC -shared -o $@ $< -lgcj @@ -32,7 +26,7 @@ echo | $(GCJ_BIN_DIR)/gcc$(gcc_suffix) -shared -O2 -fPIC -o libjawt.so -Wl,-soname,libjawt.so -xc - -lgcjawt tools.jar: $(tools_jar_class_files) $(javadoc_class_files) - $(JAR) cMf $@ $(tools_jar_class_files) com/sun/javadoc com/sun/tools/doclets + $(JAR) cMf $@ $(tools_jar_class_files) java: java.c $(GCJ_BIN_DIR)/gcc$(gcc_suffix) $(CFLAGS) -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" -DARCH="\"$(CPU)\"" -DGCJ_BIN_DIR="\"$(GCJ_BIN_DIR)\"" -o $@ $< --- java-gcj-compat-1.0.50/Makefile.in.orig 2006-01-14 02:42:15.000000000 +0100 +++ java-gcj-compat-1.0.50/Makefile.in 2006-01-14 02:44:06.000000000 +0100 @@ -168,8 +168,6 @@ jardir = $(SDK_LIB_DIR) jar_DATA = tools.jar -javadoc_jarfile = /usr/share/java/com-sun-javadoc-0.7.7.jar -taglet_jarfile = /usr/share/java/com-sun-tools-doclets-Taglet-0.7.7.jar tools_jar_source_files = \ $(top_builddir)/com/sun/tools/javac/Config.java \ com/sun/tools/javac/Main.java \ @@ -509,10 +507,7 @@ $(tools_jar_class_files): %.class: %.java $(JAVAC) -d . -I . $< -$(javadoc_class_files): $(javadoc_jarfile) $(taglet_jarfile) - $(JAR) xf $(javadoc_jarfile) - $(JAR) xf $(taglet_jarfile) - rm -rf META-INF +$(javadoc_class_files): pr13212.so: pr13212.c $(GCJ_BIN_DIR)/gcc$(gcc_suffix) $(CFLAGS) -fPIC -shared -o $@ $< -lgcj @@ -521,7 +516,7 @@ echo | $(GCJ_BIN_DIR)/gcc$(gcc_suffix) -shared -O2 -fPIC -o libjawt.so -Wl,-soname,libjawt.so -xc - -lgcjawt tools.jar: $(tools_jar_class_files) $(javadoc_class_files) - $(JAR) cMf $@ $(tools_jar_class_files) com/sun/javadoc com/sun/tools/doclets + $(JAR) cMf $@ $(tools_jar_class_files) java: java.c $(GCJ_BIN_DIR)/gcc$(gcc_suffix) $(CFLAGS) -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" -DARCH="\"$(CPU)\"" -DGCJ_BIN_DIR="\"$(GCJ_BIN_DIR)\"" -o $@ $<
