--- PamCut/makefile	2009/08/26 16:34:13	1.5
+++ PamCut/makefile	2010/07/08 10:43:14	1.10.2.1
@@ -26,8 +26,13 @@
 # "#ifdef DEBUGPAMCUT" and "#endif"). Note that if you
 # use debug instructions also in the .h code (headers) you will also have to add -DDEBUGPAMCUT
 # to the compiler options for the main analysis program.
-OPTIMIZE = -g3 #-DDEBUGPAMCUT
+# 3) Since this is a general compiler flag it can also be used, eg., to set the -m32 flag
+OPTIMIZE = -O3 ${PAM_BIT} #-DDEBUGPAMCUT
 
+# Linker flags
+# The flags defined here will be directly inserted into the linker invocation. Place here the
+# -m32 flag, for example.
+LINKERFLAGS = ${PAM_BIT}
 
 # Library flags
 # Pamela software is modular, so some libraries may not be available in some istallations.
@@ -35,8 +40,20 @@
 # PamCut software which make use of unavailable libraries. Remember to place
 # the code to be excluded between proper preprocessor directives. See the documentation or the cut
 # TofNucleiZCut for an example.
-
-EXCLUSIONFLAGS = -DNO_CALONUCLEI -DNO_TRKNUCLEI #-DNO_TOFNUCLEI -DNO_CALONUCLEI -DNO_TRKNUCLEI
+# Since PamCut headers may refer to the optional libraries, it's important to define the same 
+# flags when compiling the analysis code. Otherwise, analysis code will include PamCut headers which,
+# if no exclusion flag is set, will try to include optional software headers.
+# Conversely, if you use optional libraries remember to tell it to the linker.
+# 
+# Excluded cuts and actions:
+# NO_CALONUCLEI: CaloNucleiZCut
+# NO_TRKNUCLEI: TrkNucleiZCut
+# NO_TOFNUCLEI: TofNucleiZCut
+# NO_CALOPRESAMPLER: ReprocessCaloAction
+# NO_CALOAXIS: CaloAngleCut, CaloCrossCut, CaloGeomCut, CaloGeomYSensCut, CaloIonCut, CaloNHitCut,
+#              CaloNotIntCut (reduced functionality), CaloTrackChi2Cut, CaloTrackCut, 
+#              TrackRedGeomCut (reduced functionality), CaloChi2HistoAction, CaloAxisChi2VsRigHistoAction
+EXCLUSIONFLAGS = -DNO_CALONUCLEI -DNO_TRKNUCLEI -DNO_TOFNUCLEI -DNO_CALOPRESAMPLER -DNO_CALOAXIS
 
 # Put below the files on which every .cpp  must depend on, ie., those files that,
 # if modified, will trigger a complete recompilation of the project. 
@@ -67,13 +84,17 @@
 	@echo "**** Compiler version and compilation host ****"
 	@$(C++) --version | grep GCC
 	@hostname
+	@echo "**** Compilation flags ****"
+	@echo OPTIMIZE: $(OPTIMIZE)
+	@echo LINKERFLAGS: $(LINKERFLAGS)
+	@echo EXCLUSIONFLAGS: $(EXCLUSIONFLAGS)
 	@echo
-	
+
 # Tool invocations
 libPamCut.so: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C++ Linker'
-	$(C++) -shared -o"libPamCut.so" $(OBJS)
+	$(C++) -shared $(LINKERFLAGS) -o"libPamCut.so" $(OBJS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
@@ -86,7 +107,7 @@
 	@rm -f ${PAM_LIB}/libPamCut.so
 	@rm -rf ${PAM_INC}/PamCut
 	@echo Installed files successfully removed. 
-	
+
 install:
 	@if [[ "${PAM_INC}" == ""  || "${PAM_LIB}" == "" ]]; then \
 	    echo Pamela environment not set. ; \