diff options
Diffstat (limited to 'libjava/classpath/lib/Makefile.am')
| -rw-r--r-- | libjava/classpath/lib/Makefile.am | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am index 3f2de4187c8..f2089f243d6 100644 --- a/libjava/classpath/lib/Makefile.am +++ b/libjava/classpath/lib/Makefile.am @@ -5,13 +5,6 @@ JAVA_DEPEND = java.dep ## this file and restart the make process again sinclude $(JAVA_DEPEND) -propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) -cssfiles := $(shell cd $(top_srcdir) && $(FIND) gnu java javax org -name \*\.css -print) -## GCJ LOCAL: prune .svn directories -metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print | fgrep -v .svn) -## END GCJ LOCAL -iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) - compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER) # handling source to bytecode compiler programs like gcj, jikes and kjc @@ -35,8 +28,6 @@ endif # FOUND_KJC endif # FOUND_GCJ endif # FOUND_JIKES -JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB) - if CREATE_COLLECTIONS COLLECTIONS = collections.jar @@ -100,23 +91,18 @@ glibj.zip: classes compile-classes resources endif # USE_PREBUILT_GLIBJ_ZIP resources: copy-vmresources.sh - @list='$(propertyfiles)'; for p in $$list; do \ + @list=`cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print -o -name \*\.css -print`; for p in $$list; do \ dirname=`dirname $$p`; \ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ cp $(top_srcdir)/resource/$$p $$p; \ done - @list='$(cssfiles)'; for p in $$list; do \ - dirname=`dirname $$p`; \ - if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ - cp $(top_srcdir)/$$p $$p; \ - done - @list='$(metafiles)'; for p in $$list; do \ + @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \ dirname=`dirname $$p`; \ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ cp $(top_srcdir)/resource/$$p $$p; \ done @$(SHELL) ./copy-vmresources.sh - @list='$(iconfiles)'; for p in $$list; do \ + @list=`cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print`; for p in $$list; do \ dirname=`dirname $$p`; \ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ cp $(top_srcdir)/$$p $$p; \ |
