lcdd
diff -u -r1.18 -r1.19
--- GNUmakefile 12 Sep 2005 18:11:45 -0000 1.18
+++ GNUmakefile 17 Nov 2005 19:59:19 -0000 1.19
@@ -12,41 +12,41 @@
# def target
.PHONY: all
-# create lib and copy it
+# create the LCDD lib and copy it
all: lib lib_copy
-# local settings from running configure
+# include local settings from running configure
include $(PWD)/GNUmakefile.local
-# setup compiler defs from configure
+# include G4 architecture
+include $(G4INSTALL)/config/architecture.gmk
+
+# setup the basic compiler defs from configure
CPPFLAGS += $(LCDD_CPPFLAGS)
CPPFLAGS += $(LCDD_CXXFLAGS)
CPPFLAGS += $(LCDD_DEFS)
-# LCDD make includes (gmk) dir
+# set the directory containing make fragments
MAKEINCLUDES := $(LCDD_BASE)/config/make
-# G4 arch
-include $(G4INSTALL)/config/architecture.gmk
-
-# GDML
+# GDML includes and libs
ifdef GDML_BASE
include $(MAKEINCLUDES)/gdml.gmk
else
$(error define GDML_BASE)
endif
-# Xerces
+# Xerces includes and libs
ifdef XERCESCROOT
include $(MAKEINCLUDES)/xerces.gmk
else
$(error define XERCESCROOT)
endif
-# Geant4 binmake and special settings
+# Geant4 binmake and a few special settings
include $(MAKEINCLUDES)/geant4.gmk
-# Debugging symbols if G4
+# debugging symbols
ifdef G4DEBUG
CPPFLAGS += -g -ggdb
endif
@@ -56,6 +56,7 @@
CPPFLAGS += -pg
endif
+# copy the lib from tmp to lib dir
lib_copy:
@if [ ! -e $(G4WORKDIR)/lib ]; then mkdir $(G4WORKDIR)/lib; fi
@cp $(G4TMP)/$(G4SYSTEM)/$(G4TARGET)/lib$(G4TARGET).* $(G4WORKDIR)/lib
lcdd/config/make
diff -u -r1.5 -r1.6
--- gdml.gmk 10 Mar 2005 00:11:29 -0000 1.5
+++ gdml.gmk 17 Nov 2005 19:59:19 -0000 1.6
@@ -6,22 +6,13 @@
# GDML includes
CPPFLAGS += -I$(GDML_BASE)/G4Binding/G4Processor \
-I$(GDML_BASE)/G4Binding/G4Subscribers \
+ -I$(GDML_BASE)/G4Binding/G4Writer \
+ -I$(GDML_BASE)/Common/Writer \
-I$(GDML_BASE)/Common/Schema \
-I$(GDML_BASE)/Common/Processes \
-I$(GDML_BASE)/Common/Saxana
-# Processor and Subscribers have circular dep!
-GDML_LINK_LIBS += \
- -L$(GDML_LIB_DIR) \
- -lG4Processor \
- -lG4Subscribers \
- -lG4Processor \
- -lG4Subscribers \
- -lSaxana \
- -lProcesses
+GDML_LINK_LIBS += -L$(GDML_LIB_DIR)
+GDML_LINK_LIBS += -lSaxana -lProcesses -lWriter -lG4Processor -lG4Subscribers -lG4Writer -lG4Subscribers -lG4Processor -lSaxana -lProcesses -lWriter
-# -static \
-
-LDFLAGS += $(GDML_LINK_LIBS)
-#EXTRALIBS += $(GDML_LINK_LIBS)
-#LOADLIBS += $(GDML_LINK_LIBS)
+EXTRALIBS += $(GDML_LINK_LIBS)