[cmucl-commit] [git] CMU Common Lisp branch master updated. snapshot-2014-12-1-gf8a84c4

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  f8a84c4251d74a2c3f3f17ff465b3d2d0ad78e72 (commit)
      from  3dd74e81b64c6fbae4ffacbea5d848170bbc1f6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f8a84c4251d74a2c3f3f17ff465b3d2d0ad78e72
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Sat Jan 3 11:55:07 2015 -0800

    Move the vpath stuff to GNUMakefile from the configs.
    
    These paths don't depend on the config so GNUMakefile is the right
    place.

diff --git a/src/lisp/Config.ppc_darwin b/src/lisp/Config.ppc_darwin
index 803970d..dc395b8 100644
--- a/src/lisp/Config.ppc_darwin
+++ b/src/lisp/Config.ppc_darwin
@@ -1,8 +1,4 @@
 # -*- Mode: makefile -*-
-PATH1 = ../../src/lisp
-vpath %.h $(PATH1)
-vpath %.c $(PATH1)
-vpath %.S $(PATH1)
 CPPFLAGS = -I. -I$(PATH1)
 
 # For Mac OS X 10.2, gcc3 is appropriate.  For 10.4, gcc (gcc 4.0) is ok.  But
diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common
index 55204c0..1c6d70f 100644
--- a/src/lisp/Config.sparc_common
+++ b/src/lisp/Config.sparc_common
@@ -2,19 +2,6 @@
 
 # Common configuration for sparc/solaris builds.
 
-# These tell gmake where to look for .h, .c and .S files.  Mostly for
-# building the binary outside of the src tree.
-
-PATH1 = ../../src/lisp
-vpath %.h .:$(PATH1)
-vpath %.c .:$(PATH1)
-vpath %.S .:$(PATH1)
-
-CMULOCALE = ../../src/i18n/locale
-vpath %.pot $(CMULOCALE)
-vpath %.po  $(CMULOCALE)
-vpath %.mo  $(CMULOCALE)
-
 CPP_DEFINE_OPTIONS := -DSOLARIS -DSVR4
 # Enable support for :linkage-table feature.
 
diff --git a/src/lisp/Config.x86_common b/src/lisp/Config.x86_common
index dc896ab..abd098c 100644
--- a/src/lisp/Config.x86_common
+++ b/src/lisp/Config.x86_common
@@ -1,18 +1,5 @@
 # -*- Mode: makefile -*-
 
-# These tell gmake where to look for .h, .c and .S files.  Mostly for
-# building the binary outside of the src tree.
-
-PATH1 = ../../src/lisp
-vpath %.h $(PATH1)
-vpath %.c $(PATH1)
-vpath %.S $(PATH1)
-
-CMULOCALE = ../../src/i18n/locale
-vpath %.pot $(CMULOCALE)
-vpath %.po  $(CMULOCALE)
-vpath %.mo  $(CMULOCALE)
-
 CPP_DEFINE_OPTIONS := -Di386
 
 # Enable support for :linkage-table feature.
diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile
index ad9b472..29bb52a 100644
--- a/src/lisp/GNUmakefile
+++ b/src/lisp/GNUmakefile
@@ -1,7 +1,21 @@
 # $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/GNUmakefile,v 1.39 2010/10/14 17:47:12 rtoy Exp $
 
+# These tell gmake where to look for .h, .c and .S files.  Mostly for
+# building the binary outside of the src tree.
+
+PATH1 = ../../src/lisp
+vpath %.h $(PATH1)
+vpath %.c $(PATH1)
+vpath %.S $(PATH1)
+
+CMULOCALE = ../../src/i18n/locale
+vpath %.pot $(CMULOCALE)
+vpath %.po  $(CMULOCALE)
+vpath %.mo  $(CMULOCALE)
+
 all: lisp.nm
 
+
 -include internals.inc
 include Config
 
@@ -130,3 +144,4 @@ translations-update:
 	    msgfmt -v  ../../src/$$po/$$f.po -o ../$$po/$$f.mo; \
 	  done; done
 
+

-----------------------------------------------------------------------

Summary of changes:
 src/lisp/Config.ppc_darwin   |  4 ----
 src/lisp/Config.sparc_common | 13 -------------
 src/lisp/Config.x86_common   | 13 -------------
 src/lisp/GNUmakefile         | 15 +++++++++++++++
 4 files changed, 15 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp