Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

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/.

slsDetectorServers/.gitignore

@@ -1,4 +0,0 @@
-*.o
-*~
-#*#
-.project

slsDetectorSoftware/.gitignore

@@ -1,4 +0,0 @@
-*.o
-*~
-#*#
-.project

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

slsReceiverSoftware/.gitignore

@@ -1,9 +0,0 @@
-*~
-*.o
-build/*
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-.project
-.cproject