diff options
| author | paltherr <paltherr@epfl.ch> | 2003-11-03 12:53:09 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-11-03 12:53:09 +0000 |
| commit | f2edc84853de62dbf63c9c1cda34d06e153ce88c (patch) | |
| tree | 6dc0d1a4dfc6dfb78447c2f9e7ce26f723232a3d | |
| parent | a87a5ed43ecdc3e877c1f9d40c72c56026bd678e (diff) | |
| download | scala-f2edc84853de62dbf63c9c1cda34d06e153ce88c.tar.gz scala-f2edc84853de62dbf63c9c1cda34d06e153ce88c.tar.bz2 scala-f2edc84853de62dbf63c9c1cda34d06e153ce88c.zip | |
- Added Makefile.import
- Moved some stuff from Makefile and Makefile.config into
Makefile.import
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | Makefile.config | 28 | ||||
| -rw-r--r-- | Makefile.import | 44 | ||||
| -rw-r--r-- | doc/reference/Makefile | 2 | ||||
| -rw-r--r-- | doc/tutorial/Makefile | 2 |
5 files changed, 60 insertions, 40 deletions
@@ -8,13 +8,12 @@ ROOT = . -include $(ROOT)/Makefile.config +include $(ROOT)/Makefile.import ############################################################################## # Variables -# project -PROJECT_VERSION = $(shell $(TAIL) -1 $(VERSION_FILE)) +# project sources PROJECT_SOURCES += $(LAMPLIB_SOURCES) PROJECT_SOURCES += $(META_SOURCES) PROJECT_SOURCES += $(COMPILER_SOURCES) @@ -25,10 +24,6 @@ PROJECT_SOURCES += $(DTD2SCALA_SOURCES) PROJECT_SOURCES += $(SCALAP_SOURCES) PROJECT_SOURCES += $(SCALATEST_SOURCES) -# version management -VERSION_FILE = $(PROJECT_ROOT)/VERSION -VERSION_SCRIPT = $(PROJECT_SUPPORTDIR)/scripts/version-manager - # scala scripts wrapper SCRIPTS_PREFIX = $(PROJECT_BINARYDIR) SCRIPTS_WRAPPER = $(SCRIPTS_PREFIX)/.scala_wrapper @@ -154,10 +149,6 @@ SC_COMPILER = SCALAC SC_OUTPUTDIR = $(PROJECT_OUTPUTDIR) SC_CLASSPATH = $(PROJECT_OUTPUTDIR) -# scala compiler -SCALAC ?= $(PROJECT_BINARYDIR)/scalac -SCALADOC ?= $(PROJECT_BINARYDIR)/scaladoc - ############################################################################## # Commands @@ -275,6 +266,17 @@ version-increment : .PHONY : version-increment ############################################################################## +# Commands - CVS management + +cvs-fix-perms : + $(strip \ + $(FIND) . -type f -perm +a=x | \ + $(GREP) -v '.*/bin/.*' | \ + $(XARGS) -r $(CHMOD) a-x) + +.PHONY : cvs-fix-perms + +############################################################################## # Targets .latest-bootstrap : diff --git a/Makefile.config b/Makefile.config index dd05b54abf..4e624faef4 100644 --- a/Makefile.config +++ b/Makefile.config @@ -92,32 +92,6 @@ PICO_FLAGS ?= -make -source 1.4 # XSLT processor XSLTPROC ?= xsltproc -XSLTPROC_FLAGS ?= - -############################################################################## -# Makefile functions - -RUN ?= $(ECHO) '$(1)'; $(1) || exit $$? -READLIST ?= $(shell $(CAT) $(1) | $(GREP) -v "^\#") - -############################################################################## -# Includes - -include $(PROJECT_SUPPORTDIR)/make/default.mk -include $(PROJECT_SUPPORTDIR)/make/cygwin.mk -include $(PROJECT_SUPPORTDIR)/make/exec.mk -include $(PROJECT_SUPPORTDIR)/make/grep.mk -include $(PROJECT_SUPPORTDIR)/make/wc.mk - -############################################################################## -# Commands - -cvs-fix-perms : - $(strip \ - $(FIND) . -type f -perm +a=x | \ - $(GREP) -v '.*/bin/.*' | \ - $(XARGS) -r $(CHMOD) a-x) - -.PHONY : cvs-fix-perms +XSLTPROC_FLAGS ?= ############################################################################## diff --git a/Makefile.import b/Makefile.import new file mode 100644 index 0000000000..fe5632d0c0 --- /dev/null +++ b/Makefile.import @@ -0,0 +1,44 @@ +############################################################-*-Makefile-*-#### +# Project Imports +############################################################################## +# $Id$ + +############################################################################## +# Read configuration + +include $(ROOT)/Makefile.config + +############################################################################## +# Variables + +# project +PROJECT_VERSION = $(shell $(TAIL) -1 $(VERSION_FILE)) + +# version management +VERSION_FILE = $(PROJECT_ROOT)/VERSION +VERSION_SCRIPT = $(PROJECT_SUPPORTDIR)/scripts/version-manager + +# scala tools +SCALAC = $(PROJECT_BINARYDIR)/scalac +SCALAP = $(PROJECT_BINARYDIR)/scalap +SCALAINT = $(PROJECT_BINARYDIR)/scalaint +SCALARUN = $(PROJECT_BINARYDIR)/scalarun +SCALADOC = $(PROJECT_BINARYDIR)/scaladoc +DTD2SCALA = $(PROJECT_BINARYDIR)/dtd2scala + +############################################################################## +# Makefile functions + +RUN = $(ECHO) '$(1)'; $(1) || exit $$? +READLIST = $(shell $(CAT) $(1) | $(GREP) -v "^\#") + +############################################################################## +# Includes + +include $(PROJECT_SUPPORTDIR)/make/default.mk +include $(PROJECT_SUPPORTDIR)/make/cygwin.mk +include $(PROJECT_SUPPORTDIR)/make/exec.mk +include $(PROJECT_SUPPORTDIR)/make/grep.mk +include $(PROJECT_SUPPORTDIR)/make/wc.mk + +############################################################################## diff --git a/doc/reference/Makefile b/doc/reference/Makefile index 956405ae47..cd188c7d45 100644 --- a/doc/reference/Makefile +++ b/doc/reference/Makefile @@ -8,7 +8,7 @@ ROOT = ../.. -include $(ROOT)/Makefile.config +include $(ROOT)/Makefile.import ############################################################################## # Variables diff --git a/doc/tutorial/Makefile b/doc/tutorial/Makefile index 10be722285..f55675ef56 100644 --- a/doc/tutorial/Makefile +++ b/doc/tutorial/Makefile @@ -8,7 +8,7 @@ ROOT = ../.. -include $(ROOT)/Makefile.config +include $(ROOT)/Makefile.import ############################################################################## # Variables |