diff options
| author | Dalibor Topic <robilad@yahoo.com> | 2007-04-19 10:53:55 +0000 |
|---|---|---|
| committer | Dalibor Topic <robilad@yahoo.com> | 2007-04-19 10:53:55 +0000 |
| commit | 1a1b751cb05793b0be82333e6b0cd5e04e043362 (patch) | |
| tree | a934164f07ae643de7c7e89f7edf6853b05113cd /lib | |
| parent | bdb79238ac61cbdbd7b1ee9aef2f617740eb56a4 (diff) | |
| download | classpath-1a1b751cb05793b0be82333e6b0cd5e04e043362.tar.gz | |
2007-04-19 Dalibor Topic <robilad@kaffe.org>
* lib/Makefile.am (propertyfiles, cssfiles, metafiles,
iconfiles) Removed variables, inlined them into resource
target to avoid use of shell construct and fix portability
warning from autimake 1.10.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index c5e16f44b..d7e82a2c8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,11 +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) -metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print) -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 @@ -101,23 +96,23 @@ 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`; 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 \ + @list=`cd $(top_srcdir) && $(FIND) gnu java javax org -name \*\.css -print`; 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; \ |