diff -u -r1.14 -r1.15
--- configure	28 Jan 2006 01:32:19 -0000	1.14
+++ configure	30 Jan 2006 20:48:11 -0000	1.15
@@ -272,7 +272,7 @@

 PACKAGE_STRING='SimDist v1r0p0'
 [log in to unmask]
 

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_ant ANT have_wget WGET have_scp SCP host_os platform compiler os_shared_libs_var packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download g!
 dml_config_opts g4system geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version dist_dir LIBOBJS LTLIBOBJS'

+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_ant ANT have_wget WGET have_scp SCP host_os platform compiler os_shared_libs_var packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download gdm!
 l_config_opts g4system geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version dist_dir LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.

@@ -1232,6 +1232,10 @@

+#AC_CANONICAL_BUILD
+#AC_CANONICAL_HOST
+#AC_CANONICAL_TARGET
+

 # check for required progs
 
 

@@ -2649,11 +2653,11 @@

 
 echo "export PACKAGE_BUILDDIR = @gdml_build_dir@" >> $f ;
 

-if test -z "${package_base_dir}"

+if test -z "${package_base_dir}/CPPGDML"

 then
   v=`eval echo $gdml_build_dir`
 else

-  v=${package_base_dir}

+  v=${package_base_dir}/CPPGDML

 fi
 
 gdml_build_dir=$v

@@ -2791,11 +2795,11 @@

 
 echo "export PACKAGE_DIR = @geant4_package_dir@" >> $f ;
 

-if test -z "${package_base_dir}"

+if test -z "${package_dir}"

 then
   v=`eval echo $geant4_package_dir`
 else

-  v=${package_base_dir}

+  v=${package_dir}

 fi
 
 geant4_package_dir=$v

@@ -3194,6 +3198,23 @@

 
 f=$sim_packages_dir/lcphys/package.gmk.in
 

+echo "export PACKAGE_CVSMODULE = @lcphys_cvsmodule@" >> $f ;
+
+if test -z "LCPhys"
+then
+  v=`eval echo $lcphys_cvsmodule`
+else
+  v=LCPhys
+fi
+
+lcphys_cvsmodule=$v
+
+
+
+
+
+f=$sim_packages_dir/lcphys/package.gmk.in
+

 echo "export PACKAGE_CVSROOT = @lcphys_cvsroot@" >> $f ;
 
 if test -z "${cvsroot}"

@@ -4345,6 +4366,7 @@

 s,@lcphys_version@,$lcphys_version,;t t
 s,@lcphys_package_dir@,$lcphys_package_dir,;t t
 s,@lcphys_base_dir@,$lcphys_base_dir,;t t

+s,@lcphys_cvsmodule@,$lcphys_cvsmodule,;t t

 s,@lcphys_cvsroot@,$lcphys_cvsroot,;t t
 s,@slic@,$slic,;t t
 s,@slic_version@,$slic_version,;t t

diff -u -r1.2 -r1.3
--- package.gmk.in	28 Jan 2006 01:32:20 -0000	1.2
+++ package.gmk.in	30 Jan 2006 20:48:13 -0000	1.3
@@ -1,4 +1,4 @@

-# $Id: package.gmk.in,v 1.2 2006/01/28 01:32:20 jeremy Exp $

+# $Id: package.gmk.in,v 1.3 2006/01/30 20:48:13 jeremy Exp $

 
 #
 # Generic package build rules.

@@ -7,6 +7,9 @@

 # common build vars
 include @[log in to unmask]
 

+# package vars
+include $(CURDIR)/package.gmk
+

 # these expected to be included or defined externally
 ifndef PACKAGE
   $(error define PACKAGE to name of package)

@@ -47,18 +50,24 @@

   PACKAGE_CVSVERSION=$(PACKAGE_VERSION)
 endif
 

-# rules that should be forced
-.PHONY: download cvs config compile install srcclean distclean

+# OPTIONAL package dependencies
+-include $(PACKAGE_DIR)/deps.gmk
+
+# OPTIONAL package make vars 
+-include $(PACKAGE_DIR)/env.gmk

 
 # default rule

-.DEFAULT: build

+.DEFAULT: all

-# build package
-build: src config compile install

+# rules that should be forced
+.PHONY: all download cvs config compile install srcclean packageclean distclean
+
+# default rule
+default: all

 
 # download tgz file from WWW
 download:

-	@if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \

+	if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \

 	cd $(PACKAGE_DIR) ; \
 	$(WGET) $(PACKAGE_DOWNLOAD) -O $(PACKAGE_TGZ_LOCAL) ; \
 	echo "Decompressing $(PACKAGE_TGZ_LOCAL) ..." ; \

@@ -70,7 +79,7 @@

 
 # check package out of CVS
 cvs:

-	@if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \

+	if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \

 	cd $(PACKAGE_DIR) ; \
 	rm -rf $(PACKAGE_VERSION) ; \
 	cvs -d $(PACKAGE_CVSROOT) co -d $(PACKAGE_VERSION) -r $(PACKAGE_CVSVERSION) $(PACKAGE_CVSMODULE); \

@@ -80,30 +89,31 @@

 
 # patch the source if a patch script exists
 patch:

-	@if [ -e "./@patch_script@" ]; then cd $(PACKAGE_DIR) && ./@patch_script@; fi;:

+	if [ -e "./@patch_script@" ]; then cd $(PACKAGE_DIR) && ./@patch_script@; fi;:

 
 # run configure if a configure script exists
 config:

-	@cd $(PACKAGE_BUILDDIR) && if [ -e "$(PACKAGE_CONFIG)" ]; then $(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS); fi;:

+	cd $(PACKAGE_BUILDDIR) && if [ -e "$(PACKAGE_CONFIG)" ]; then $(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS); fi;:

 
 # default compile rule

-compile_default:
-	@cd $(PACKAGE_BUILDDIR) && $(MAKE);:
-
-compile: compile_default

+compile:
+	cd $(PACKAGE_BUILDDIR) && $(MAKE);:

 
 # install package

-install_default:
-	-cd $(PACKAGE_BUILDDIR) && $(MAKE) install;:
-
-install: install_default

+install:
+	echo "install: $(PACKAGE)" ; \
+	cd $(PACKAGE_BUILDDIR) && $(MAKE) install;:

 
 # clean sources
 srcclean:

-	@cd $(PACKAGE_BUILDDIR) && $(MAKE) clean;:

+	cd $(PACKAGE_BUILDDIR) && $(MAKE) clean;:
+
+# delete the source dir
+packageclean:
+	cd $(PACKAGE_DIR) && rm -rf $(PACKAGE_VERSION) ; :

 
 # clean the package
 distclean:

-	@cd $(PACKAGE_DIR) && \
-	rm -rf $(PACKAGE_VERSION) \
-	&& rm -rf package.gmk.in package.gmk env.gmk patch.sh GNUmakefile $(PACKAGE_TGZ_LOCAL) &> /dev/null;:

+	cd $(PACKAGE_DIR) ; \
+	rm -rf $(PACKAGE_VERSION) ; \
+	rm -rf package.gmk.in package.gmk env.gmk patch.sh GNUmakefile $(PACKAGE_TGZ_LOCAL) &> /dev/null;:

diff -u -r1.1 -r1.2
--- Makefile.in	27 Jan 2006 09:05:47 -0000	1.1
+++ Makefile.in	30 Jan 2006 20:48:13 -0000	1.2
@@ -1,14 +1,7 @@

-# $Header: /cvs/lcd/SimDist/packages/clhep/Makefile.in,v 1.1 2006/01/27 09:05:47 jeremy Exp $
-
-# package vars
-include $(PWD)/package.gmk

+# $Header: /cvs/lcd/SimDist/packages/clhep/Makefile.in,v 1.2 2006/01/30 20:48:13 jeremy Exp $

 
 # generic package targets
 include @[log in to unmask]
 

-# source is downloaded
-.PHONY: src
-src: download
-
-# use default compile rule
-compile: compile_default

+# default rule
+all: download config compile install

diff -u -r1.1 -r1.2
--- Makefile.in	27 Jan 2006 09:05:48 -0000	1.1
+++ Makefile.in	30 Jan 2006 20:48:13 -0000	1.2
@@ -1,20 +1,7 @@

-# $Header: /cvs/lcd/SimDist/packages/gdml/Makefile.in,v 1.1 2006/01/27 09:05:48 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/gdml/Makefile.in,v 1.2 2006/01/30 20:48:13 jeremy Exp $

 
 # package vars

-include $(PWD)/package.gmk
-
-# generic package targets

 include @[log in to unmask]
 

-# deps
-include $(PWD)/deps.gmk
-
-# source is downloaded
-.PHONY: src
-src: download
-
-# use default compile rule
-compile: compile_default
-
-install:
-	@echo "GDML: dummy install target"

+# default rule
+all: download config compile

diff -u -r1.3 -r1.4
--- Makefile.in	28 Jan 2006 01:32:21 -0000	1.3
+++ Makefile.in	30 Jan 2006 20:48:13 -0000	1.4
@@ -1,23 +1,10 @@

-# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.3 2006/01/28 01:32:21 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.4 2006/01/30 20:48:13 jeremy Exp $

-# package vars
-include $(PWD)/package.gmk
-
-# generic package targets

+# package build

 include @[log in to unmask]
 

-# dependencies
-include $(PWD)/deps.gmk
-
-# G4 environment vars
-include $(PWD)/env.gmk
-
-# source is downloaded and patched
-.PHONY: src
-src: download patch
-
-# compile is default + physics lists + includes
-compile: compile_default phys includes

+# default rule
+all: download patch config compile phys includes test

 
 # physics lists
 phys:

@@ -30,4 +17,3 @@

 # test geant4 installation by trying to compile one of the examples
 test:
 	@cd $(PACKAGE_BASEDIR)/examples/novice/N01/ && export G4WORKDIR=`pwd` && $(MAKE) all;

-

diff -u -r1.1 -r1.2
--- Makefile.in	27 Jan 2006 09:05:49 -0000	1.1
+++ Makefile.in	30 Jan 2006 20:48:14 -0000	1.2
@@ -1,19 +1,7 @@

-# $Header: /cvs/lcd/SimDist/packages/lcdd/Makefile.in,v 1.1 2006/01/27 09:05:49 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/lcdd/Makefile.in,v 1.2 2006/01/30 20:48:14 jeremy Exp $

-# package vars
-include $(PWD)/package.gmk
-
-# generic package build

+# package build

 include @[log in to unmask]
 

-# environment
-include $(PWD)/env.gmk
-
-# dependencies
-include $(PWD)/deps.gmk
-
-# source by CVS
-src: cvs
-
-# use default compile rule
-compile: compile_default

+# default
+all: cvs config compile 

diff -u -r1.1 -r1.2
--- Makefile.in	27 Jan 2006 09:05:49 -0000	1.1
+++ Makefile.in	30 Jan 2006 20:48:14 -0000	1.2
@@ -1,21 +1,12 @@

-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.1 2006/01/27 09:05:49 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.2 2006/01/30 20:48:14 jeremy Exp $

-# package vars
-include $(PWD)/package.gmk
-
-# generic package build

+# package build

 include @[log in to unmask]
 

-# LCIO vars
-include $(PWD)/env.gmk
-
-# source from CVS
-.PHONY: src
-src: cvs

+# default
+all: cvs config compile_ant

-# compile with ant
-compile:

+# ant compile
+.PHONY: compile_ant
+compile_ant:

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

-
-#srcclean:
-#	cd $(PACKAGE_BUILDDIR) && $(ANT) clean

diff -u -r1.1 -r1.2
--- Makefile.in	27 Jan 2006 09:05:50 -0000	1.1
+++ Makefile.in	30 Jan 2006 20:48:14 -0000	1.2
@@ -1,18 +1,7 @@

-# $Header: /cvs/lcd/SimDist/packages/lcphys/Makefile.in,v 1.1 2006/01/27 09:05:50 jeremy Exp $
-
-# package vars
-include $(PWD)/package.gmk

+# $Header: /cvs/lcd/SimDist/packages/lcphys/Makefile.in,v 1.2 2006/01/30 20:48:14 jeremy Exp $

 
 # generic package build
 include @[log in to unmask]
 

-# dependencies
-include $(PWD)/deps.gmk
-
-# source by CVS
-.PHONY: src
-src: cvs
-
-# use default compile rule
-.PHONY: compile
-compile: compile_default

+# default build rule
+all: cvs config compile

diff -u -r1.1 -r1.2
--- Makefile.in	27 Jan 2006 09:05:50 -0000	1.1
+++ Makefile.in	30 Jan 2006 20:48:15 -0000	1.2
@@ -1,22 +1,13 @@

-# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.1 2006/01/27 09:05:50 jeremy Exp $
-
-# package vars
-include $(PWD)/package.gmk

+# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.2 2006/01/30 20:48:15 jeremy Exp $

 
 # generic package build
 include @[log in to unmask]
 

-# environment
-include $(PWD)/env.gmk
-
-# dependencies
-include $(PWD)/deps.gmk
-
-# source by CVS
-.PHONY: src
-src: cvs

+# default rule
+all: cvs config compile_all

 
 # custom compile rule

-.PHONY: compile
-compile:

+# OVERRIDES package
+.PHONY: compile_all
+compile_all:

 	cd $(PACKAGE_BUILDDIR) && $(MAKE) all;:

diff -u -r1.2 -r1.3
--- Makefile.in	28 Jan 2006 01:32:21 -0000	1.2
+++ Makefile.in	30 Jan 2006 20:48:15 -0000	1.3
@@ -1,18 +1,7 @@

-# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.2 2006/01/28 01:32:21 jeremy Exp $
-
-# package vars
-include $(PWD)/package.gmk

+# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.3 2006/01/30 20:48:15 jeremy Exp $

 
 # generic package targets
 include @[log in to unmask]
 

-# environment
-include $(PWD)/env.gmk
-
-# source is downloaded and patched
-.PHONY: src
-src: download patch
-
-# use default compile rule
-.PHONY: compile
-compile: compile_default

+# default compile rule
+all: download patch config compile install