diff --git a/Makefile b/Makefile index 7341a5b..d619425 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ pixieDict.cxx : pixieDAQ.h pixieDAQLinkDef.h @echo "--------- creating pcm and cxx " @rootcling -f pixieDict.cxx -c pixieDAQ.h -p $(PIXIE_LIB_PATH) pixieDAQLinkDef.h -pixieDAQ.o : pixieDAQ.cpp pixieDAQ.h +pixieDAQ.o : pixieDict.cxx pixieDAQ.cpp pixieDAQ.h @echo "--------- creating pixieDAQ.o" $(CC) $(CFLAGS) $(PIXIE_LIB_PATH) pixieDAQ.cpp Pixie16Class.cpp pixieDict.cxx $(ROOT_FLAG) @@ -59,20 +59,20 @@ mainSettings.o : mainSettings.cpp mainSettings.h #-------------------------- example : example.o @echo "-------- making example" - $(CC) $(PIXIE_LIB_PATH) example.o $(LIBS) -o example + $(CC) $(PIXIE_LIB_PATH) testing/example.o $(LIBS) -o testing/example -example.o : example.cpp +example.o : testing/example.cpp @echo "-------- making example.o" - $(CC) $(CFLAGS) $(PIXIE_LIB_PATH) example.cpp + $(CC) $(CFLAGS) $(PIXIE_LIB_PATH) testing/example.cpp -o testing/example.o #-------------------------- test : test.o Pixie16Class.o @echo "-------- making test" - $(CC) $(PIXIE_LIB_PATH) test.o Pixie16Class.o $(LIBS) -o test $(ROOT_FLAG) + $(CC) $(PIXIE_LIB_PATH) testing/test.o Pixie16Class.o $(LIBS) -o testing/test $(ROOT_FLAG) -test.o : test.cpp +test.o : testing/test.cpp @echo "-------- making test.o" - $(CC) $(CFLAGS) $(PIXIE_LIB_PATH) test.cpp $(ROOT_FLAG) + $(CC) $(CFLAGS) $(PIXIE_LIB_PATH) testing/test.cpp $(ROOT_FLAG) -o testing/test.o #origin root example @@ -82,6 +82,6 @@ test.o : test.cpp clean: - rm -f *.o test *.pcm example pixieDAQ *.gch *.cxx + rm -f *.o testing/test testing/example testing/*.o *.pcm testing/example pixieDAQ *.gch *.cxx diff --git a/Pixie16_FSU_Sample_Setup.set b/testing/Pixie16_FSU_Sample_Setup.set similarity index 100% rename from Pixie16_FSU_Sample_Setup.set rename to testing/Pixie16_FSU_Sample_Setup.set diff --git a/Pixie16_example_legacy.set b/testing/Pixie16_example_legacy.set similarity index 100% rename from Pixie16_example_legacy.set rename to testing/Pixie16_example_legacy.set diff --git a/evtReader.h b/testing/evtReader.h similarity index 100% rename from evtReader.h rename to testing/evtReader.h diff --git a/example.cpp b/testing/example.cpp similarity index 100% rename from example.cpp rename to testing/example.cpp diff --git a/example.sh b/testing/example.sh similarity index 100% rename from example.sh rename to testing/example.sh diff --git a/example_3.2.cpp b/testing/example_3.2.cpp similarity index 100% rename from example_3.2.cpp rename to testing/example_3.2.cpp diff --git a/example_config.json b/testing/example_config.json similarity index 100% rename from example_config.json rename to testing/example_config.json diff --git a/read-set-legacy.c b/testing/read-set-legacy.c similarity index 100% rename from read-set-legacy.c rename to testing/read-set-legacy.c diff --git a/test.cpp b/testing/test.cpp similarity index 99% rename from test.cpp rename to testing/test.cpp index 2acaf96..7fd878b 100644 --- a/test.cpp +++ b/testing/test.cpp @@ -11,7 +11,7 @@ #include /* struct timeval, select() */ #include /* tcgetattr(), tcsetattr() */ -#include "Pixie16Class.h" +#include "../Pixie16Class.h" #include "TROOT.h" #include "TSystem.h"