diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-07-09 22:21:37 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-07-09 22:21:37 +0000 |
| commit | 0a54298efa8253b9aa8680075e7d34e3688057ef (patch) | |
| tree | 4b3d17942838ad751b3eecfed5c9b1b80f9a86f4 /lib | |
| parent | 5dcdd6c62db92f3c76da56417a0a029a27d06ec3 (diff) | |
| download | classpath-0a54298efa8253b9aa8680075e7d34e3688057ef.tar.gz | |
2006-07-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD --> generics-branch for
2006/07/02 to 2006/07/09.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 7 | ||||
| -rw-r--r-- | lib/copy-vmresources.sh.in | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 0b0d3650f..f0e962346 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,7 +7,7 @@ sinclude $(JAVA_DEPEND) propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org META-INF -type d ! -name CVS -print) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) -metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -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) @@ -167,9 +167,10 @@ compile-classes: classes $(JAVA_SRCS) Makefile EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ - glibj.zip classes.1 classes.2 \ + glibj.zip classes.1 classes.2 Makefile.deps \ $(top_builddir)/gnu/java/locale/LocaleData.java \ $(JAVA_DEPEND) +DISTCLEANFILES = standard.omit clean-local: -rm -rf gnu @@ -180,8 +181,6 @@ clean-local: -rm -rf sun -rm -rf META-INF -rm -rf lists - -rm -f Makefile.deps - -rm -f standard.omit dist-hook: mkdir -p $(distdir) diff --git a/lib/copy-vmresources.sh.in b/lib/copy-vmresources.sh.in index 39b3292e7..dbda9de20 100644 --- a/lib/copy-vmresources.sh.in +++ b/lib/copy-vmresources.sh.in @@ -13,7 +13,7 @@ for p in ${vmdirs}; do for u in ${dirs}; do mkdir -p ${destMetaDir}/${u}; done; - files=`find . -name "CVS" -prune -o -type f -print`; + files=`find . -name "CVS" -prune -o -name "*.in" -prune -o -type f -print`; for u in ${files}; do cp ${u} ${destMetaDir}/${u}; done |