From b8adb33675855887aebbd627612685511bf9009d Mon Sep 17 00:00:00 2001 From: "Stephen A. Wood" <saw@jlab.org> Date: Wed, 2 Oct 2013 11:33:07 -0400 Subject: [PATCH] Compatibility with github version of podd. Use HALLC_MODS in make file to turn on Hall C changes in Podd. Remove unneeded and now broken includes of THaDB.h. --- Makefile | 5 ++--- src/THcParmList.cxx | 1 - src/THcParmList.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f7ce5d6..96eeb7a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ # List only the implementation files (*.cxx). For every implementation file # there must be a corresponding header file (*.h). - SRC = src/THcInterface.cxx src/THcParmList.cxx src/THcAnalyzer.cxx \ src/THcHallCSpectrometer.cxx \ src/THcDetectorMap.cxx \ @@ -125,7 +124,7 @@ ifeq ($(CXX),) $(error $(ARCH) invalid architecture) endif -CXXFLAGS += $(INCLUDES) +CXXFLAGS += $(INCLUDES) -DHALLC_MODS LIBS += $(ROOTLIBS) $(SYSLIBS) GLIBS += $(ROOTGLIBS) $(SYSLIBS) @@ -175,7 +174,7 @@ $(USERLIB): $(HDR) $(OBJS) $(HDR_COMPILEDATA) $(LIBHALLA) $(LIBDC) $(LIBSCALER): $(ANALYZER)/Makefile @echo "Building Podd" - @cd $(ANALYZER) ; make + @cd $(ANALYZER) ; export PODD_EXTRA_DEFINES=-DHALLC_MODS ; make $(USERDICT).cxx: $(RCHDR) $(HDR) $(LINKDEF) @echo "Generating dictionary $(USERDICT)..." diff --git a/src/THcParmList.cxx b/src/THcParmList.cxx index 7223f85..4edf5e2 100644 --- a/src/THcParmList.cxx +++ b/src/THcParmList.cxx @@ -8,7 +8,6 @@ #define INCLUDESTR "#include" -#include "THaDB.h" #include "TObjArray.h" #include "TObjString.h" diff --git a/src/THcParmList.h b/src/THcParmList.h index 96a4d1a..830e6e7 100644 --- a/src/THcParmList.h +++ b/src/THcParmList.h @@ -7,7 +7,6 @@ // ////////////////////////////////////////////////////////////////////////// -#include "THaDB.h" #include "THaVarList.h" #include "THaTextvars.h" -- GitLab