diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-03-16 01:54:51 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-03-16 01:54:51 +0000 |
| commit | 289e97d2c542e2cda0dc64070f4ee1f2e6ed4c58 (patch) | |
| tree | ee50fae966f14de8ed878974dc3df495764e29ce | |
| parent | 79166a875a5e3d65e2153a76e55ad5edec26c325 (diff) | |
| download | gcc-289e97d2c542e2cda0dc64070f4ee1f2e6ed4c58.zip gcc-289e97d2c542e2cda0dc64070f4ee1f2e6ed4c58.tar.gz gcc-289e97d2c542e2cda0dc64070f4ee1f2e6ed4c58.tar.bz2 | |
re PR classpath/26688 (Classpath Makefiles assume CVS source control)
PR libgcj/26688:
* lib/Makefile.in: Rebuilt.
* lib/Makefile.am (propertydirs): Ignore .svn directories.
(metafiles): Likewise.
From-SVN: r112115
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 7 | ||||
| -rw-r--r-- | libjava/classpath/lib/Makefile.am | 6 | ||||
| -rw-r--r-- | libjava/classpath/lib/Makefile.in | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index f1901eb..e226d84 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,10 @@ +2006-03-15 Tom Tromey <tromey@redhat.com> + + PR libgcj/26688: + * lib/Makefile.in: Rebuilt. + * lib/Makefile.am (propertydirs): Ignore .svn directories. + (metafiles): Likewise. + 2006-03-10 Tom Tromey <tromey@redhat.com> For PR libgcj/25713: diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am index f4e4540..d73be80 100644 --- a/libjava/classpath/lib/Makefile.am +++ b/libjava/classpath/lib/Makefile.am @@ -5,9 +5,11 @@ JAVA_DEPEND = java.dep ## this file and restart the make process again sinclude $(JAVA_DEPEND) -propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print) +## GCJ LOCAL: prune .svn directories +propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print | fgrep -v .svn) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java 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 -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:.:$(USER_CLASSLIB) diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index 75f7871..e9b4f22 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -259,9 +259,9 @@ target_os = @target_os@ target_vendor = @target_vendor@ vm_classes = @vm_classes@ JAVA_DEPEND = java.dep -propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print) +propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print | fgrep -v .svn) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java 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 -type f -print | fgrep -v .svn) 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:.:$(USER_CLASSLIB) @FOUND_ECJ_TRUE@@FOUND_GCJX_FALSE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE@@FOUND_KJC_FALSE@JAVAC = $(ECJ) -source 1.4 -encoding UTF-8 -warn:-deprecation,serial,unused -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes |