Makefile modification, some jank involved

Author: xedaq

CControl_Handler.cc

@@ -1,15 +1,19 @@
 #include "CControl_Handler.hh"
 #include "DAXHelpers.hh"
 #include "V2718.hh"
+#ifdef HASDDC10
 #include "DDC10.hh"
+#endif
 #include "V1495.hh"
 #include <bsoncxx/builder/stream/document.hpp>
 
 CControl_Handler::CControl_Handler(std::shared_ptr<MongoLog>& log, std::string procname) : DAQController(log, procname){
   fCurrentRun = fBID = fBoardHandle-1;
   fV2718 = nullptr;
   fV1495 = nullptr;
+#ifdef HASDDC10
   fDDC10 = nullptr;
+#endif
   fStatus = DAXHelpers::Idle;
 }
 
@@ -60,6 +64,7 @@ int CControl_Handler::Arm(std::shared_ptr<Options>& opts){
   fBoardHandle = fV2718->GetHandle();
   fLog->Entry(MongoLog::Local, "V2718 Initialized");
 
+#ifdef HASDDC10
   // Getting options for DDC10 HEV module
   std::vector<BoardType> dv = fOptions->GetBoards("DDC10");
   if (dv.size() == 1){
@@ -78,6 +83,7 @@ int CControl_Handler::Arm(std::shared_ptr<Options>& opts){
      }
   } else {
   }
+#endif // HASDDC10
 
   std::vector<BoardType> mv = fOptions->GetBoards("V1495");
   if (mv.size() == 1){
@@ -124,9 +130,11 @@ int CControl_Handler::Stop(){
     }
     fV2718.reset();
   }
+  fV1495.reset();
+#ifdef HASDDC10
   // Don't need to stop the DDC10 but just clean up a bit
   fDDC10.reset();
-  fV1495.reset();
+#endif
 
   fStatus = DAXHelpers::Idle;
   return 0;

CControl_Handler.hh

@@ -4,8 +4,10 @@
 #include "DAQController.hh"
 
 class V2718;
-class DDC10;
 class V1495;
+#ifdef HASDDC10
+class DDC10;
+#endif
 
 class CControl_Handler : public DAQController{
 public:
@@ -20,8 +22,10 @@ public:
 private:
 
   std::unique_ptr<V2718> fV2718;
-  std::unique_ptr<DDC10> fDDC10;
   std::unique_ptr<V1495> fV1495;
+#ifdef HASDDC10
+  std::unique_ptr<DDC10> fDDC10;
+#endif
 
   int fStatus;
   int fCurrentRun;

Makefile

@@ -3,14 +3,26 @@ CC	= g++
 CXX	= g++
 CFLAGS	= -Wall -Wextra -pedantic -pedantic-errors -g -DLINUX -std=c++17 -pthread $(shell pkg-config --cflags libmongocxx)
 CPPFLAGS := $(CFLAGS)
-LDFLAGS = -lCAENVME -lstdc++fs -llz4 -lblosc $(shell pkg-config --libs libmongocxx) $(shell pkg-config --libs libbsoncxx) -lexpect -ltcl8.6
+IS_READER0 := false
+ifeq "$(shell hostname)" "reader0"
+	IS_READER0 = true
+endif
+LDFLAGS = -lCAENVME -lstdc++fs -llz4 -lblosc $(shell pkg-config --libs libmongocxx) $(shell pkg-config --libs libbsoncxx)
 #LDFLAGS_CC = ${LDFLAGS} -lexpect -ltcl8.6
 
-SOURCES_SLAVE = $(wildcard *.cc)
+SOURCES_SLAVE = CControl_Handler.cc DAQController.cc f1724.cc main.cc MongoLog.cc \
+				Options.cc StraxFormatter.cc V1495.cc V1724.cc V1724_MV.cc \
+				V1730.cc V2718.cc
 OBJECTS_SLAVE = $(SOURCES_SLAVE:%.cc=%.o)
 DEPS_SLAVE = $(OBJECTS_SLAVE:%.o=%.d)
 EXEC_SLAVE = redax
 
+ifeq "$(IS_READER0)" "true"
+	SOURCES_SLAVE += DDC10.cc
+	CFLAGS += -DHASDDC10
+	LDFLAGS += -lexpect -ltcl8.6
+endif
+
 all: $(EXEC_SLAVE)
 
 $(EXEC_SLAVE) : $(OBJECTS_SLAVE)