--- PamVMC/PamG4RunConfiguration/Makefile 2007/06/28 07:16:56 1.1 +++ PamVMC/PamG4RunConfiguration/Makefile 2009/02/18 17:05:04 1.2 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 2006/12/12 16:21:38 brun Exp $ +# $Id: Makefile 306 2007-11-19 16:15:32Z rdm $ ############################### geant4_vmc Makefile ########################### @@ -8,6 +8,7 @@ PLATFORM = $(shell root-config --arch) endif + TOPDIR = $(G4VMC_DIR) BINDIR = $(G4WORKDIR)/tmp/tgt_$(PLATFORM)/$(PACKAGE) LIBDIR = $(G4WORKDIR)/lib/tgt_$(PLATFORM) @@ -15,23 +16,26 @@ ifeq ($(ROOTSYS),) ROOT_INCDIR = $(shell root-config --incdir) ROOT_BINDIR = $(shell root-config --prefix)/bin +ROOT_ETCDIR = $(shell root-config --prefix)/etc/vmc else ROOT_INCDIR = $(ROOTSYS)/include ROOT_BINDIR = $(ROOTSYS)/bin +ROOT_ETCDIR = $(ROOTSYS)/etc/vmc endif -include $(TOPDIR)/config/Makefile.$(PLATFORM) +include $(ROOT_ETCDIR)/Makefile.$(PLATFORM) + ############################### Sources ####################################### # Rules # -include $(TOPDIR)/config/MakeRules +include $(ROOT_ETCDIR)/MakeRules # Dictionary # GDICT := $(BINDIR)/$(PACKAGE)Cint.cxx GDICTH := $(GDICT:.cxx=.h) -GDICTO := $(patsubst %.cxx,$(BINDIR)/%.o,$(GDICT)) +GDICTO := $(patsubst %.cxx,%.o,$(GDICT)) # Sources # @@ -40,8 +44,10 @@ # C++ Headers processed by CINT # -HDRS := inc/PamG4RunConfiguration.h \ - inc/$(PACKAGE)LinkDef.h +HDRS := include/PamG4RunConfiguration.h \ + # include/PamG4RangeCutsPhysicsList.h \ + # include/PamG4RangeCutsPhysics.h \ + include/$(PACKAGE)LinkDef.h # Objects # @@ -51,14 +57,14 @@ # Make include list # ifndef G4INCLUDE - G4INCLUDE := $(G4LIB)../../include + G4INCLUDE := $(G4INSTALL)/include endif -INCDIR := -Iinc -I$(G4INCLUDE) \ +INCDIR := -Iinclude -I$(G4INCLUDE) \ -I$(CLHEP_BASE_DIR)/include \ - -I$(G4INSTALL)/source/physics_lists/hadronic/LHEP_BIC_HP/include \ - -I$(G4INSTALL)/source/physics_lists/hadronic/Packaging/include \ - -I$(G4INSTALL)/examples/novice/N03/include \ + -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BERT/include \ + -I$(G4INSTALL)/physics_lists/hadronic/Packaging/include \ + -I$(G4INSTALL)/examples/novice/N03/include \ -I$(TOPDIR)/include ifneq ($(USE_VGM),) @@ -170,13 +176,13 @@ depend: $(SRCS) -TOCLEAN = $(BINDIR) $(TOPDIR)/include -TOCLEANALL = $(BINDIR) $(TOPDIR)/include $(LIBDIR) +TOCLEAN = $(BINDIR) +TOCLEANALL = $(BINDIR) $(LIBDIR) MAKEDIST = ../config/makedist.sh lib MAKEDISTSRC = ../config/makedist.sh -include $(TOPDIR)/config/MakeMacros +include $(ROOT_ETCDIR)/MakeMacros ############################### Dependencies ##################################