From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4942 invoked by alias); 26 Nov 2007 15:34:31 -0000 Received: (qmail 4917 invoked by uid 367); 26 Nov 2007 15:34:30 -0000 Date: Mon, 26 Nov 2007 15:34:00 -0000 Message-ID: <20071126153430.4902.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Rename GEN_CLASSDIR to JAVAROOT. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ed76fbbf22fd2ebcc1eb96e78e3acaa3b83b1a1a X-Git-Newrev: f68aa034c04d450d803e963eac9bb7bc4c70a019 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2007-q4/txt/msg00456.txt.bz2 The branch, master has been updated via f68aa034c04d450d803e963eac9bb7bc4c70a019 (commit) from ed76fbbf22fd2ebcc1eb96e78e3acaa3b83b1a1a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f68aa034c04d450d803e963eac9bb7bc4c70a019 Author: Andrew Cagney Date: Mon Nov 26 10:35:59 2007 -0500 Rename GEN_CLASSDIR to JAVAROOT. frysk-common/ChangeLog 2007-11-26 Andrew Cagney * Makefile.rules (JAVAROOT): Rename GEN_CLASSDIR. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 2 ++ frysk-common/Makefile.rules | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 389f0eb..5e68b5c 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,5 +1,7 @@ 2007-11-26 Andrew Cagney + * Makefile.rules (JAVAROOT): Rename GEN_CLASSDIR. + * Makefile.gen.sh (--jni): New option. 2007-11-23 Andrew Cagney diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules index 9204c8f..b1ebe23 100644 --- a/frysk-common/Makefile.rules +++ b/frysk-common/Makefile.rules @@ -92,7 +92,7 @@ GEN_CLASSPATH = GEN_SOURCEPATH = $(srcdir) $(top_builddir) empty= space=$(empty) $(empty) -GEN_CLASSDIR = classes +JAVAROOT = classes GEN_GCC_BUILDTREE_RPATHS = $(top_builddir)/elfutils/libdw @@ -155,7 +155,7 @@ SOURCEPATH = $(subst $(space),:,$(strip $(GEN_SOURCEPATH))) CLASSPATH = $(subst $(space),:,$(strip $(GEN_CLASSPATH))) DBPATH = $(subst $(space),:,$(strip \ $(patsubst %.jar,%.db,$(filter %.jar,$(GEN_CLASSPATH))) \ - $(foreach dir,$(patsubst %/$(GEN_CLASSDIR),%,$(filter-out %.jar,$(GEN_CLASSPATH))),$(dir)/$(notdir $(dir)).db) \ + $(foreach dir,$(patsubst %/$(JAVAROOT),%,$(filter-out %.jar,$(GEN_CLASSPATH))),$(dir)/$(notdir $(dir)).db) \ )) # XXX: GCJ: I think there should be a -Wextraneous-throws; I think @@ -652,7 +652,7 @@ distclean-cvsignored: # explicit clean rule is needed as CLEANFILES can't handle directories. CLEANFILES += files-java.list -CLEANDIRS += $(GEN_CLASSDIR) +CLEANDIRS += $(JAVAROOT) files-java.list: files.list if test -s $(top_srcdir)/files.list ; then \ sed -n < $(top_srcdir)/files.list > $@.tmp \ @@ -665,9 +665,9 @@ files-java.list: files.list cp /dev/null $@ ; \ fi ${GEN_DIRNAME}.jar: files-java.list - rm -rf $(GEN_CLASSDIR) - mkdir -p $(GEN_CLASSDIR) - $(JAVAC) -d $(GEN_CLASSDIR) $(JAVACFLAGS) \ + rm -rf $(JAVAROOT) + mkdir -p $(JAVAROOT) + $(JAVAC) -d $(JAVAROOT) $(JAVACFLAGS) \ @$(top_builddir)/files-java.list \ 2>&1 | tee $*.log if test -s $*.log \ @@ -675,10 +675,10 @@ ${GEN_DIRNAME}.jar: files-java.list then rm $*.log ; false ; \ fi rm -f $*.log - cd $(GEN_CLASSDIR) ; \ + cd $(JAVAROOT) ; \ find * -name '*.class' -print \ | $(JAR) -@ -cf $@ - mv $(GEN_CLASSDIR)/$@ $@ + mv $(JAVAROOT)/$@ $@ # When ECJ is available, use it as an extra lint pass. GCJ has the # habit of silently compiling invalid Java code (garbage in, garbage hooks/post-receive -- frysk system monitor/debugger