Commit in `SimDist/packages` on MAIN
`clhep/GNUmakefile.in`	+10	-8	1.1 -> 1.2
`gdml/GNUmakefile.in`	+11	-11	1.2 -> 1.3
`geant4/GNUmakefile.in`	+13	-11	1.4 -> 1.5
`lcdd/GNUmakefile.in`	+15	-13	1.1 -> 1.2
`lcio/GNUmakefile.in`	+13	-10	1.2 -> 1.3
`lcphys/GNUmakefile.in`	+10	-10	1.1 -> 1.2
`slic/GNUmakefile.in`	+14	-18	1.1 -> 1.2
`xerces/GNUmakefile.in`	+13	-10	1.2 -> 1.3
	+99	-91

8 modified files

improvements to and cleanup of package makefiles

SimDist/packages/clhep

GNUmakefile.in 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- GNUmakefile.in	20 Oct 2005 00:08:07 -0000	1.1
+++ GNUmakefile.in	18 Nov 2005 01:31:53 -0000	1.2
@@ -1,17 +1,14 @@

-# $Header: /cvs/lcd/SimDist/packages/clhep/GNUmakefile.in,v 1.1 2005/10/20 00:08:07 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/clhep/GNUmakefile.in,v 1.2 2005/11/18 01:31:53 jeremy Exp $

 #
 # Build rules for CLHEP package.
 #

-# common vars
-include ../../build/common.gmk
-
-# CLHEP build vars

+# build vars

 include $(PWD)/package.gmk
 
 .PHONY: all

-all: src config package install

+all: download config package install

 
 config:
 	cd $(clhep_build_dir) && ./configure --prefix=$(clhep_base_dir) --disable-shared

@@ -22,8 +19,13 @@

 package:
 	cd $(clhep_build_dir) && $(MAKE)

-src:
-	cd $(clhep_package_dir) && rm -rf $(clhep_version) && ./src.sh

+source: download
+
+download: 
+	cd $(clhep_package_dir) && rm -rf $(clhep_version) && ./@download_script@

 
 clean:
 	cd $(clhep_build_dir) && $(MAKE) clean

+
+distclean:
+	cd $(clhep_package_dir) && rm -rf $(clhep_version) && rm -rf @gen_files@ &> /dev/null

SimDist/packages/gdml

GNUmakefile.in 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- GNUmakefile.in	26 Oct 2005 06:17:19 -0000	1.2
+++ GNUmakefile.in	18 Nov 2005 01:31:53 -0000	1.3
@@ -1,22 +1,17 @@

-# $Header: /cvs/lcd/SimDist/packages/gdml/GNUmakefile.in,v 1.2 2005/10/26 06:17:19 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/gdml/GNUmakefile.in,v 1.3 2005/11/18 01:31:53 jeremy Exp $

 #
 # Build rules for GDML package.
 #

-# common vars
-include ../../build/common.gmk
-
-# build vars for this package

+# build vars

 include $(PWD)/package.gmk
 
 # deps

-include ../xerces/xerces.gmk
-include ../clhep/clhep.gmk
-include ../geant4/geant4.gmk

+include $(PWD)/deps.gmk

 
 .PHONY: all

-all: src config package install

+all: download config package install

 
 config:
 	cd $(gdml_build_dir) && ./configure --enable-shared-libs=no

@@ -27,8 +22,13 @@

 package:
 	cd $(gdml_build_dir) && $(MAKE)

-src:
-	cd $(gdml_package_dir) && rm -rf $(gdml_version) && ./src.sh

+source: download
+
+download:
+	cd $(gdml_package_dir) && rm -rf $(gdml_version) && ./@download_script@

 
 clean:
 	cd $(gdml_build_dir) && $(MAKE) clean

+
+distclean:
+	cd $(gdml_package_dir) && rm -rf $(gdml_version) && rm -rf @gen_files@ &> /dev/null

SimDist/packages/geant4

GNUmakefile.in 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- GNUmakefile.in	26 Oct 2005 06:17:19 -0000	1.4
+++ GNUmakefile.in	18 Nov 2005 01:31:53 -0000	1.5
@@ -1,23 +1,20 @@

-# $Header: /cvs/lcd/SimDist/packages/geant4/GNUmakefile.in,v 1.4 2005/10/26 06:17:19 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/geant4/GNUmakefile.in,v 1.5 2005/11/18 01:31:53 jeremy Exp $

 #
 # Build rules for Geant4 package.
 #

-# common vars
-include ../../build/common.gmk
-

 # package vars
 include $(PWD)/package.gmk

-# Geant4 vars and CLHEP dep
-include $(PWD)/geant4.gmk

+# Geant4's vars 
+include $(PWD)/env.gmk

-# FIXME: hard coded deps
-include ../clhep/clhep.gmk

+# deps
+include $(PWD)/deps.gmk

 
 .PHONY: all

-all: src config package install

+all: source config package install

 
 config:

@@ -34,8 +31,13 @@

 lib:
 	cd $(geant4_build_dir) && $(MAKE)

-src:
-	cd $(geant4_package_dir) && rm -rf $(geant4_version) && ./src.sh && ./patch.sh

+source: download
+
+download:
+	cd $(geant4_package_dir) && rm -rf $(geant4_version) && ./@download_script@ && ./@patch_script@

 
 clean:
 	cd $(geant4_build_dir) && $(MAKE) clean

+
+distclean:
+	cd $(geant4_package_dir) && rm -rf $(geant4_version) && rm -rf @gen_files@ &> /dev/null

SimDist/packages/lcdd

GNUmakefile.in 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- GNUmakefile.in	20 Oct 2005 00:08:10 -0000	1.1
+++ GNUmakefile.in	18 Nov 2005 01:31:54 -0000	1.2
@@ -1,23 +1,20 @@

-# $Header: /cvs/lcd/SimDist/packages/lcdd/GNUmakefile.in,v 1.1 2005/10/20 00:08:10 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/lcdd/GNUmakefile.in,v 1.2 2005/11/18 01:31:54 jeremy Exp $

-# Build rules for CLHEP package.

+# Build rules for LCDD package.

-# common vars
-include ../../build/common.gmk
-
-# CLHEP build vars

+# build vars

 include $(PWD)/package.gmk

+# LCDD's vars

 include lcdd.gmk

-include ../xerces/xerces.gmk
-include ../gdml/gdml.gmk
-include ../clhep/clhep.gmk
-include ../geant4/geant4.gmk

+
+# deps
+include $(PWD)/deps.gmk

 
 .PHONY: all

-all: src config package install

+all: cvs config package install

 
 config:
 	cd $(lcdd_build_dir) && ./configure

@@ -27,8 +24,13 @@

 package:
 	cd $(lcdd_build_dir) && $(MAKE)

-src:
-	cd $(lcdd_package_dir) && rm -rf $(lcdd_version) && ./src.sh

+source: cvs
+
+cvs:
+	cd $(lcdd_package_dir) && rm -rf $(lcdd_version) && ./@cvs_script@

 
 clean:
 	cd $(lcdd_build_dir) && $(MAKE) clean

+
+distclean:
+	cd $(lcdd_package_dir) && rm -rf $(lcdd_version) && rm -rf @gen_files@ &> /dev/null

SimDist/packages/lcio

GNUmakefile.in 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- GNUmakefile.in	25 Oct 2005 18:37:41 -0000	1.2
+++ GNUmakefile.in	18 Nov 2005 01:31:54 -0000	1.3
@@ -1,21 +1,19 @@

-# $Header: /cvs/lcd/SimDist/packages/lcio/GNUmakefile.in,v 1.2 2005/10/25 18:37:41 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/lcio/GNUmakefile.in,v 1.3 2005/11/18 01:31:54 jeremy Exp $

-# Build rules for CLHEP package.

+# Build rules for LCIO package.

 #
 
 ANT=ant

-# common vars
-include ../../build/common.gmk
-
-# CLHEP build vars

+# build vars

 include $(PWD)/package.gmk

-include $(PWD)/lcio.gmk

+# LCIO's vars
+include $(PWD)/env.gmk

 
 .PHONY: all

-all: src config package install

+all: cvs config package install

 
 config:

@@ -24,8 +22,13 @@

 package:
 	cd $(lcio_build_dir) && PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" && $(ANT) aid.generate cpp

-src:
-	cd $(lcio_package_dir) && rm -rf $(lcio_version) && ./src.sh

+source: cvs
+
+cvs:
+	cd $(lcio_package_dir) && rm -rf $(lcio_version) && ./@cvs_script@

 
 clean:
 	cd $(lcio_build_dir) && $(ANT) clean

+
+distclean:
+	cd $(lcio_package_dir) && rm -rf $(lcio_version) && rm -rf @gen_files@ &> /dev/null

SimDist/packages/lcphys

GNUmakefile.in 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- GNUmakefile.in	20 Oct 2005 00:08:12 -0000	1.1
+++ GNUmakefile.in	18 Nov 2005 01:31:55 -0000	1.2
@@ -1,21 +1,17 @@

-# $Header: /cvs/lcd/SimDist/packages/lcphys/GNUmakefile.in,v 1.1 2005/10/20 00:08:12 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/lcphys/GNUmakefile.in,v 1.2 2005/11/18 01:31:55 jeremy Exp $

 #
 # Build rules for LCPhys package.
 #

-# common vars
-include ../../build/common.gmk
-

 # CLHEP build vars
 include $(PWD)/package.gmk
 
 # FIXME: hard-coded deps

-include ../clhep/clhep.gmk
-include ../geant4/geant4.gmk

+include $(PWD)/deps.gmk

 
 .PHONY: all

-all: src config package install

+all: cvs config package install

 
 config:

@@ -24,8 +20,12 @@

 package:
 	cd $(lcphys_build_dir) && $(MAKE)

-src:
-	cd $(lcphys_package_dir) && rm -rf $(lcphys_version) && ./src.sh

+source: cvs
+
+cvs:
+	cd $(lcphys_package_dir) && rm -rf $(lcphys_version) && ./@cvs_script@

 
 clean:

-#	cd $(lcphys_build_dir) && $(MAKE) clean

+
+distclean:
+	cd $(lcphys_package_dir) && rm -rf $(lcphys_version) && rm -rf @gen_files@ &> /dev/null

SimDist/packages/slic

GNUmakefile.in 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- GNUmakefile.in	20 Oct 2005 00:08:13 -0000	1.1
+++ GNUmakefile.in	18 Nov 2005 01:31:55 -0000	1.2
@@ -1,29 +1,20 @@

-# $Header: /cvs/lcd/SimDist/packages/slic/GNUmakefile.in,v 1.1 2005/10/20 00:08:13 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/slic/GNUmakefile.in,v 1.2 2005/11/18 01:31:55 jeremy Exp $

-# Build rules for CLHEP package.

+# Build rules for SLIC package.

-# common vars
-include ../../build/common.gmk
-
-# CLHEP build vars

+# build vars

 include $(PWD)/package.gmk

-include slic.gmk

+# SLIC's vars
+include $(PWD)/env.gmk

 
 # deps

-include ../xerces/xerces.gmk
-include ../lcphys/lcphys.gmk
-include ../xerces/xerces.gmk
-include ../gdml/gdml.gmk
-include ../clhep/clhep.gmk
-include ../geant4/geant4.gmk
-include ../lcdd/lcdd.gmk
-include ../lcio/lcio.gmk

+include $(PWD)/deps.gmk

 
 .PHONY: all

-all: src config package install

+all: cvs config package install

 
 config:
 	cd $(slic_build_dir) && ./configure

@@ -33,8 +24,13 @@

 package:
 	cd $(slic_build_dir) && $(MAKE) all

-src:
-	cd $(slic_package_dir) && rm -rf $(slic_version) && ./src.sh

+source: cvs
+
+cvs:
+	cd $(slic_package_dir) && rm -rf $(slic_version) && ./@cvs_script@

 
 clean:
 	cd $(slic_build_dir) && $(MAKE) clean

+
+distclean:
+	cd $(slic_package_dir) && rm -rf $(slic_version) && rm -rf @gen_files@ &> /dev/null

SimDist/packages/xerces

GNUmakefile.in 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- GNUmakefile.in	25 Oct 2005 22:47:04 -0000	1.2
+++ GNUmakefile.in	18 Nov 2005 01:31:55 -0000	1.3
@@ -1,19 +1,17 @@

-# $Header: /cvs/lcd/SimDist/packages/xerces/GNUmakefile.in,v 1.2 2005/10/25 22:47:04 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/xerces/GNUmakefile.in,v 1.3 2005/11/18 01:31:55 jeremy Exp $

-# Build rules for CLHEP package.

+# Build rules for Xerces package.

-# common vars
-include ../../build/common.gmk
-
-# CLHEP build vars

+# build vars

 include $(PWD)/package.gmk

-include $(PWD)/xerces.gmk

+# Xerces vars
+include $(PWD)/env.gmk

 
 .PHONY: all

-all: src config package install

+all: download config package install

 
 config:
 	cd $(xerces_build_dir) && ./runConfigure @xerces_configure_args@

@@ -24,8 +22,13 @@

 package:
 	cd $(xerces_build_dir) && $(MAKE)

-src:
-	cd $(xerces_package_dir) && rm -rf $(xerces_version) && ./src.sh && ./patch.sh

+source: download
+
+download:
+	cd $(xerces_package_dir) && rm -rf $(xerces_version) && ./@cvs_script@ && ./@patch_script@

 
 clean:
 	cd $(xerces_build_dir) && $(MAKE) clean

+
+distclean:
+	cd $(xerces_package_dir) && rm -rf $(xerces_version) && rm -rf @gen_files@ &> /dev/null

CVSspam 0.2.8