diff --git a/recipe/copy_lib.sh b/recipe/copy_lib.sh index 4c427ee92..9a33e00d2 100644 --- a/recipe/copy_lib.sh +++ b/recipe/copy_lib.sh @@ -6,9 +6,8 @@ mkdir $PREFIX/include/slsDetectorPackage #Shared and static libraries cp build/bin/libSlsDetector.so $PREFIX/lib/. -cp build/bin/libSlsDetector.a $PREFIX/lib/. cp build/bin/libSlsReceiver.so $PREFIX/lib/. -cp build/bin/libSlsReceiver.a $PREFIX/lib/. +cp build/bin/libSlsSupport.so $PREFIX/lib/. #Binaries cp build/bin/sls_detector_acquire $PREFIX/bin/. diff --git a/slsDetectorServers/.gitignore b/slsDetectorServers/.gitignore deleted file mode 100644 index 825dda897..000000000 --- a/slsDetectorServers/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.o -*~ -#*# -.project diff --git a/slsDetectorSoftware/.gitignore b/slsDetectorSoftware/.gitignore deleted file mode 100644 index 825dda897..000000000 --- a/slsDetectorSoftware/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.o -*~ -#*# -.project diff --git a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt index 1355808d9..cae8b43ba 100644 --- a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt +++ b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt @@ -2,18 +2,12 @@ set(SOURCES sls_detector_client.cpp ) -include_directories( - ../../slsSupportLib/include - ../multiSlsDetector - ../slsDetector - ../slsReceiverInterface -) - add_executable(sls_detector_get ${SOURCES} ) target_link_libraries(sls_detector_get slsDetectorShared + slsSupportLib pthread zmq rt diff --git a/slsReceiverSoftware/.gitignore b/slsReceiverSoftware/.gitignore deleted file mode 100644 index dd542bc66..000000000 --- a/slsReceiverSoftware/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -*~ -*.o -build/* -GPATH -GRTAGS -GSYMS -GTAGS -.project -.cproject \ No newline at end of file