diff --git a/config/cmake/FindEPICSBase.cmake b/config/cmake/FindEPICSBase.cmake
index aa6611ea7d6acd13676d92c0bd8e0eab823a7d2d..e9f99f2f7403d5f1ff8d0aa9b5e803ea67e23b62 100644
--- a/config/cmake/FindEPICSBase.cmake
+++ b/config/cmake/FindEPICSBase.cmake
@@ -15,24 +15,62 @@ if (EPICS_BASE_FOUND)
 
     endif (${EPICS_BASE_VERSION} VERSION_LESS "3.15")
 
+    set (EPICS_BASE_CAS_LIBS "")
+    set (EPICS_BASE_CA_LIBS "")
+
+    foreach (_ca_lib IN LISTS _epics_calibs_libs_intl)
+        message("Searching for ${_ca_lib} from ${_epics_calibs_libs_intl}")
+        find_library("_concrete_ca_lib_${_ca_lib}" ${_ca_lib} HINTS ${EPICS_BASE_LIBRARY_DIRS})
+        list(APPEND EPICS_BASE_CA_LIBS "${_concrete_ca_lib_${_ca_lib}}")
+    endforeach(_ca_lib)
+    message("CA LIBS = ${EPICS_BASE_CA_LIBS}")
+
+    foreach (_cas_lib IN LISTS _epics_caslibs_libs_intl)
+        message("Searching for ${_cas_lib} from ${_epics_caslibs_libs_intl}")
+        find_library("_concrete_cas_lib_${_cas_lib}" ${_cas_lib} HINTS ${EPICS_BASE_LIBRARY_DIRS})
+        list(APPEND EPICS_BASE_CAS_LIBS "${_concrete_cas_lib_${_cas_lib}}")
+    endforeach(_cas_lib)
+    message("CAS LIBS = ${EPICS_BASE_CAS_LIBS}")
+
     add_library(_epics_base_ca_intl INTERFACE)
     target_include_directories(_epics_base_ca_intl INTERFACE
             ${EPICS_BASE_INCLUDE_DIRS})
     target_compile_options(_epics_base_ca_intl INTERFACE
             ${EPICS_BASE_CFLAGS_OTHER})
+    target_link_libraries(_epics_base_ca_intl INTERFACE
+            ${EPICS_BASE_CA_LIBS})
 
     add_library(_epics_base_cas_intl INTERFACE)
     target_include_directories(_epics_base_cas_intl INTERFACE
             ${EPICS_BASE_INCLUDE_DIRS})
     target_compile_options(_epics_base_cas_intl INTERFACE
             ${EPICS_BASE_CFLAGS_OTHER})
+    target_link_libraries(_epics_base_cas_intl INTERFACE
+            ${EPICS_BASE_CAS_LIBS})
 
-    set (EPICS_BASE_CAS_LIBS ${_epics_caslibs_libs_intl})
-    set (EPICS_BASE_CA_LIBS ${_epics_calibs_libs_intl})
+    find_path(_epics_gdd_include gdd.h
+            hints ${EPICS_BASE_INCLUDE_DIRS})
+    find_library(_epics_gdd_lib gdd HINTS ${EPICS_BASE_LIBRARY_DIRS})
 
     add_library(epics::ca ALIAS _epics_base_ca_intl)
     add_library(epics::cas ALIAS _epics_base_cas_intl)
 
+    if (_epics_gdd_include AND _epics_gdd_lib)
+
+        add_library(_epics_base_gdd_intl INTERFACE)
+        target_include_directories(_epics_base_gdd_intl INTERFACE
+                ${_epics_gdd_include})
+        target_compile_options(_epics_base_gdd_intl INTERFACE
+                ${EPICS_BASE_CFLAGS_OTHER})
+        target_link_libraries(_epics_base_gdd_intl INTERFACE
+                ${_epics_gdd_lib})
+
+        add_library(epics::gdd ALIAS _epics_base_gdd_intl)
+
+    else (_epics_gdd_include AND _epics_gdd_lib)
+        message("EPICS gdd library not found")
+    endif (_epics_gdd_include AND _epics_gdd_lib)
+
     message("Found epics-base")
     message("version ${EPICS_BASE_VERSION}")
     message("libs ${EPICS_BASE_LIBRARIES}")
diff --git a/src/daqd/CMakeLists.txt b/src/daqd/CMakeLists.txt
index 8b4b0de3cfb6c7cfeb7a21fd99d04e55f25de2e5..2d17f10fca8b7eaa11e3cdcbbb0f75732d86565a 100644
--- a/src/daqd/CMakeLists.txt
+++ b/src/daqd/CMakeLists.txt
@@ -99,267 +99,267 @@ set (DAQD_COMMON_SRC
 		comm_impl.cc
         )
 
-########
-# FW Build
-####
-
-add_library(fw_daqd_gds STATIC ${DAQD_GDS_SRC})
-target_compile_definitions(fw_daqd_gds PRIVATE
-        ${DAQD_BUILD_INFO_DEFINES}
-        -D_GNU_SOURCE -D_DEFAULT_SOURCE
-        -D_X86_64_ -DUNIX -Dlinux
-        -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11
-        -DLIGO_GDS -D_TP_DAQD
-        -DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
-        )
-target_compile_options(fw_daqd_gds PRIVATE
-        -mtune=generic -m64
-        -Wno-deprecated -Wno-write-strings
-        )
-target_include_directories(fw_daqd_gds PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/../include
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(fw_daqd_gds PUBLIC ldastools::framecpp)
-#c++ -c -DSERVER_VERSION=\"2.0\" -DPRODUCTION_DATE=\"now\" -DPRODUCTION_MACHINE=\"this\" -DGDS_TESTPOINT_SUPPORT
-#  -D_GNU_SOURCE -D_DEFAULT_SOURCE
-#  -D_X86_64_ -DUNIX -Dlinux
-#  -mtune=generic -m64
-#  -I/opt/epics/base-3.15.4/include -I/opt/epics/base-3.15.4/include/os/Linux -I/opt/epics/base-3.15.4/include/compiler/gcc -I/opt/gm/include -I/opt/mx/include
-#   -g -Wno-deprecated -Wno-write-strings
-#  -DDAQD_BUILD_FW -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch-build/build/fw -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/daqd -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/include
-#  -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -g -O
-#  -DLIGO_GDS -D_TP_DAQD -DARCHIVE=\"/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/daqd/../gds\" -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/gds
-
-add_library(fw_common STATIC ${DAQD_COMMON_SRC})
-target_include_directories(fw_common PRIVATE
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../include
-        )
-target_compile_definitions(fw_common PRIVATE
-        ${DAQD_BUILD_INFO_DEFINES}
-        ${CDS_GDSFLAGS}
-        -D_GNU_SOURCE -D_DEFAULT_SOURCE
-        -D_X86_64_ -DUNIX -Dlinux -DUNIX
-        -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11
-        -DDAQD_BUILD_FW)
-target_compile_options(fw_common PRIVATE
-        -mtune=generic -m64
-        -Wno-deprecated -Wno-write-strings
-        )
-target_link_libraries(fw_common PRIVATE
-        epics::ca epics::cas ldastools::framecpp
-		run_number::run_number)
-
-#c++ -c -DSERVER_VERSION=\"2.0\" -DPRODUCTION_DATE=\"now\" -DPRODUCTION_MACHINE=\"this\" -DGDS_TESTPOINT_SUPPORT
-#  -D_GNU_SOURCE -D_DEFAULT_SOURCE
-#  -D_X86_64_ -DUNIX -Dlinux
-#  -mtune=generic -m64
-#  -I/opt/epics/base-3.15.4/include -I/opt/epics/base-3.15.4/include/os/Linux -I/opt/epics/base-3.15.4/include/compiler/gcc -I/opt/gm/include -I/opt/mx/include -g -Wno-deprecated -Wno-write-strings -DDAQD_BUILD_FW -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch-build/build/fw -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/daqd -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/include
-#  -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -g -O
-
-add_library(fw_comm STATIC ${CMAKE_CURRENT_BINARY_DIR}/comm.cc)
-target_compile_definitions(fw_comm PRIVATE
-        ${DAQD_BUILD_INFO_DEFINES}
-        -DDAQD_BUILD_FW ${CDS_GDSFLAGS} -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11)
-target_compile_options(fw_comm PRIVATE
-        -mtune=generic -m64
-        -Wno-deprecated -Wno-write-strings
-        )
-target_include_directories(fw_comm PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-target_link_libraries(fw_comm PRIVATE
-        epics::cas ldastools::framecpp)
-#set_target_properties(fw_comm
-#        PROPERTIES COMPILE_FLAGS "-DDAQD_BUILD_FW ${CDS_GDSFLAGS} -D_REENTRANT -DNO_RTL=1")
-# -DSERVER_VERSION=\\\"2.0\\\" -DPRODUCTION_DATE=\\\"Mon Feb  6 11:59:36 PST 2017\\\"
-# -DPRODUCTION_MACHINE=\\\"Linux ubuntu 4.4.0-59-generic #80-Ubuntu SMP Fri Jan 6 17:47:47 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux\\\"
-# -DGDS_TESTPOINT_SUPPORT
-# -std=c++11 -I/opt/ldas-tools-al-2.5.5/include -I/opt/ldas-tools-framecpp-2.5.2/include
-# -D_GNU_SOURCE -D_DEFAULT_SOURCE
-# -D_X86_64_ -DUNIX -Dlinux
-# -mtune=generic -m64
-# -I/opt/epics/base-3.15.4/include -I/opt/epics/base-3.15.4/include/os/Linux -I/opt/epics/base-3.15.4/include/compiler/gcc
-# -I/opt/gm/include -I/opt/mx/include
-# -g -Wno-deprecated -Wno-write-strings
-# -DDAQD_BUILD_FW
-# -I/home/jonathan.hanks/Documents/advLigoRTS/branches/build-3.3/build/fw -I/home/jonathan.hanks/Documents/advLigoRTS/branches/branch-3.3/src/daqd -I/home/jonathan.hanks/Documents/advLigoRTS/branches/branch-3.3/src/include
-# -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION -g -O
-
-link_directories(${EPICS_BASE_LIBRARY_DIRS}
-        ${FrameCPP_LIBRARY_DIRS})
-
-add_executable(daqd_fw ${MAIN_DAQD_SRC})
-target_include_directories(daqd_fw PRIVATE
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-target_compile_definitions(daqd_fw PRIVATE ${DAQD_FCPP_FLAGS} -DDAQD_BUILD_FW ${CDS_GDSFLAGS} -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11)
-target_compile_options(daqd_fw PRIVATE
-        ${DAQD_BUILD_INFO_DEFINES}
-        -Wno-deprecated -Wno-write-strings)
-target_link_libraries(daqd_fw fw_common fw_comm fw_daqd_gds ca Com cas gdd epics::ca epics::cas
-        ${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
-        ${FrameCPP_LIBRARIES}
-        ${CMAKE_THREAD_LIBS_INIT}
-		run_number::run_number
-        )
+#########
+## FW Build
+#####
+#
+#add_library(fw_daqd_gds STATIC ${DAQD_GDS_SRC})
+#target_compile_definitions(fw_daqd_gds PRIVATE
+#        ${DAQD_BUILD_INFO_DEFINES}
+#        -D_GNU_SOURCE -D_DEFAULT_SOURCE
+#        -D_X86_64_ -DUNIX -Dlinux
+#        -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11
+#        -DLIGO_GDS -D_TP_DAQD
+#        -DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
+#        )
+#target_compile_options(fw_daqd_gds PRIVATE
+#        -mtune=generic -m64
+#        -Wno-deprecated -Wno-write-strings
+#        )
+#target_include_directories(fw_daqd_gds PRIVATE
+#        ${CMAKE_CURRENT_SOURCE_DIR}/../include
+#        ${CMAKE_CURRENT_SOURCE_DIR}
+#        ${CMAKE_CURRENT_BINARY_DIR})
+#target_link_libraries(fw_daqd_gds PUBLIC ldastools::framecpp)
+##c++ -c -DSERVER_VERSION=\"2.0\" -DPRODUCTION_DATE=\"now\" -DPRODUCTION_MACHINE=\"this\" -DGDS_TESTPOINT_SUPPORT
+##  -D_GNU_SOURCE -D_DEFAULT_SOURCE
+##  -D_X86_64_ -DUNIX -Dlinux
+##  -mtune=generic -m64
+##  -I/opt/epics/base-3.15.4/include -I/opt/epics/base-3.15.4/include/os/Linux -I/opt/epics/base-3.15.4/include/compiler/gcc -I/opt/gm/include -I/opt/mx/include
+##   -g -Wno-deprecated -Wno-write-strings
+##  -DDAQD_BUILD_FW -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch-build/build/fw -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/daqd -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/include
+##  -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -g -O
+##  -DLIGO_GDS -D_TP_DAQD -DARCHIVE=\"/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/daqd/../gds\" -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/gds
+#
+#add_library(fw_common STATIC ${DAQD_COMMON_SRC})
+#target_include_directories(fw_common PRIVATE
+#        ${CMAKE_CURRENT_BINARY_DIR}
+#        ${CMAKE_CURRENT_SOURCE_DIR}
+#        ${CMAKE_CURRENT_SOURCE_DIR}/../include
+#        )
+#target_compile_definitions(fw_common PRIVATE
+#        ${DAQD_BUILD_INFO_DEFINES}
+#        ${CDS_GDSFLAGS}
+#        -D_GNU_SOURCE -D_DEFAULT_SOURCE
+#        -D_X86_64_ -DUNIX -Dlinux -DUNIX
+#        -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11
+#        -DDAQD_BUILD_FW)
+#target_compile_options(fw_common PRIVATE
+#        -mtune=generic -m64
+#        -Wno-deprecated -Wno-write-strings
+#        )
+#target_link_libraries(fw_common PRIVATE
+#        epics::ca epics::cas ldastools::framecpp
+#		run_number::run_number)
+#
+##c++ -c -DSERVER_VERSION=\"2.0\" -DPRODUCTION_DATE=\"now\" -DPRODUCTION_MACHINE=\"this\" -DGDS_TESTPOINT_SUPPORT
+##  -D_GNU_SOURCE -D_DEFAULT_SOURCE
+##  -D_X86_64_ -DUNIX -Dlinux
+##  -mtune=generic -m64
+##  -I/opt/epics/base-3.15.4/include -I/opt/epics/base-3.15.4/include/os/Linux -I/opt/epics/base-3.15.4/include/compiler/gcc -I/opt/gm/include -I/opt/mx/include -g -Wno-deprecated -Wno-write-strings -DDAQD_BUILD_FW -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch-build/build/fw -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/daqd -I/home/jonathan.hanks/Documents/Programming/aligo-rts-scratch/src/include
+##  -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -g -O
+#
+#add_library(fw_comm STATIC ${CMAKE_CURRENT_BINARY_DIR}/comm.cc)
+#target_compile_definitions(fw_comm PRIVATE
+#        ${DAQD_BUILD_INFO_DEFINES}
+#        -DDAQD_BUILD_FW ${CDS_GDSFLAGS} -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11)
+#target_compile_options(fw_comm PRIVATE
+#        -mtune=generic -m64
+#        -Wno-deprecated -Wno-write-strings
+#        )
+#target_include_directories(fw_comm PRIVATE
+#        ${CMAKE_CURRENT_SOURCE_DIR}
+#        ${CMAKE_CURRENT_BINARY_DIR}
+#        ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+#target_link_libraries(fw_comm PRIVATE
+#        epics::cas ldastools::framecpp)
+##set_target_properties(fw_comm
+##        PROPERTIES COMPILE_FLAGS "-DDAQD_BUILD_FW ${CDS_GDSFLAGS} -D_REENTRANT -DNO_RTL=1")
+## -DSERVER_VERSION=\\\"2.0\\\" -DPRODUCTION_DATE=\\\"Mon Feb  6 11:59:36 PST 2017\\\"
+## -DPRODUCTION_MACHINE=\\\"Linux ubuntu 4.4.0-59-generic #80-Ubuntu SMP Fri Jan 6 17:47:47 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux\\\"
+## -DGDS_TESTPOINT_SUPPORT
+## -std=c++11 -I/opt/ldas-tools-al-2.5.5/include -I/opt/ldas-tools-framecpp-2.5.2/include
+## -D_GNU_SOURCE -D_DEFAULT_SOURCE
+## -D_X86_64_ -DUNIX -Dlinux
+## -mtune=generic -m64
+## -I/opt/epics/base-3.15.4/include -I/opt/epics/base-3.15.4/include/os/Linux -I/opt/epics/base-3.15.4/include/compiler/gcc
+## -I/opt/gm/include -I/opt/mx/include
+## -g -Wno-deprecated -Wno-write-strings
+## -DDAQD_BUILD_FW
+## -I/home/jonathan.hanks/Documents/advLigoRTS/branches/build-3.3/build/fw -I/home/jonathan.hanks/Documents/advLigoRTS/branches/branch-3.3/src/daqd -I/home/jonathan.hanks/Documents/advLigoRTS/branches/branch-3.3/src/include
+## -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION -g -O
+#
+#link_directories(${EPICS_BASE_LIBRARY_DIRS}
+#        ${FrameCPP_LIBRARY_DIRS})
+#
+#add_executable(daqd_fw ${MAIN_DAQD_SRC})
+#target_include_directories(daqd_fw PRIVATE
+#        ${CMAKE_CURRENT_BINARY_DIR}
+#        ${CMAKE_CURRENT_SOURCE_DIR}
+#        ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+#target_compile_definitions(daqd_fw PRIVATE ${DAQD_FCPP_FLAGS} -DDAQD_BUILD_FW ${CDS_GDSFLAGS} -D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11)
+#target_compile_options(daqd_fw PRIVATE
+#        ${DAQD_BUILD_INFO_DEFINES}
+#        -Wno-deprecated -Wno-write-strings)
+#target_link_libraries(daqd_fw fw_common fw_comm fw_daqd_gds ca Com cas gdd epics::ca epics::cas
+#        ${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
+#        ${FrameCPP_LIBRARIES}
+#        ${CMAKE_THREAD_LIBS_INIT}
+#		run_number::run_number
+#        )
 
 if (${MX_FOUND})
-###########
-# DC Build with mx support
-####
-set (DAQD_DC_MAIN_SRC
-		archive.cc
-		profiler.cc
-		filesys.cc
-		epics_pvs.cc
-		trend.cc
-		net_writer.cc
-		circ.cc
-		framesend.cc
-		gdsmutex.cc
-		edcu.cc
-		epicsServer.cc
-		exServer.cc
-		exScalarPV.cc
-		exVectorPV.cc
-		exPV.cc
-		exChannel.cc
-		framerecv.cc
-		listener.cc
-		daqd.cc
-		comm_impl.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
-
-set (DAQD_DC_GDS_SRC
-		gds.cc)
-
-add_library(dc_mx_gds STATIC ${DAQD_DC_GDS_SRC})
-target_compile_definitions(dc_mx_gds PRIVATE
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DLIGO_GDS
-		-D_TP_DAQD
-		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
-		-DDAQD_BUILD_DC)
-target_include_directories(dc_mx_gds PUBLIC
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}
-		)
-target_compile_options(dc_mx_gds PUBLIC
-		-fno-common
-		-Wno-deprecated
-		-Wno-write-strings
-		)
-target_link_libraries(dc_mx_gds PRIVATE
-		gds::daqd
-		ldastools::framecpp
-		mx::myriexpress)
-
-add_executable(daqd_dc_mx ${DAQD_DC_MAIN_SRC} producer.cc mx_rcvr.cc)
-target_compile_definitions(daqd_dc_mx PUBLIC
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DDAQD_BUILD_DC
-		)
-target_include_directories(daqd_dc_mx PUBLIC
-		${CMAKE_CURRENT_BINARY_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		)
-target_link_libraries(daqd_dc_mx PUBLIC
-		gds::daqd
-		dc_mx_gds
-		run_number::run_number
-		ca Com cas gdd epics::ca epics::cas
-		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
-		ldastools::framecpp
-		${CMAKE_THREAD_LIBS_INIT}
-		mx::myriexpress
-		)
-
-###########
-# mx-symm Build with mx support
-####
-set (DAQD_MXSYMM_MAIN_SRC
-		archive.cc
-		profiler.cc
-		filesys.cc
-		epics_pvs.cc
-		trend.cc
-		net_writer.cc
-		circ.cc
-		#framesend.cc
-		#gdsmutex.cc
-		edcu.cc
-		epicsServer.cc
-		exServer.cc
-		exScalarPV.cc
-		exVectorPV.cc
-		exPV.cc
-		exChannel.cc
-		framerecv.cc
-		listener.cc
-		daqd.cc
-		comm_impl.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
-
-add_library(dc_mxsymm_gds STATIC gds.cc)
-target_compile_definitions(dc_mxsymm_gds PRIVATE
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DLIGO_GDS
-		-D_TP_DAQD
-		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_MXSYMM)
-target_include_directories(dc_mxsymm_gds PUBLIC
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}
-		)
-target_compile_options(dc_mxsymm_gds PUBLIC
-		-fno-common
-		-Wno-deprecated
-		-Wno-write-strings
-		)
-target_link_libraries(dc_mxsymm_gds PRIVATE
-		gds::daqd
-		ldastools::framecpp
-		mx::myriexpress)
-
-add_executable(daqd_mxsymm ${DAQD_MXSYMM_MAIN_SRC} producer.cc mx_rcvr.cc)
-target_compile_definitions(daqd_mxsymm PUBLIC
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_MXSYMM
-		)
-target_include_directories(daqd_mxsymm PUBLIC
-		${CMAKE_CURRENT_BINARY_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		)
-target_link_libraries(daqd_mxsymm PUBLIC
-		gds::daqd
-		dc_mxsymm_gds
-		run_number::run_number
-		ca Com cas gdd epics::ca epics::cas
-		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
-		ldastools::framecpp
-		${CMAKE_THREAD_LIBS_INIT}
-		mx::myriexpress
-		)
-
-
-install(TARGETS daqd_mxsymm daqd_dc_mx DESTINATION bin)
+############
+## DC Build with mx support
+#####
+#set (DAQD_DC_MAIN_SRC
+#		archive.cc
+#		profiler.cc
+#		filesys.cc
+#		epics_pvs.cc
+#		trend.cc
+#		net_writer.cc
+#		circ.cc
+#		framesend.cc
+#		gdsmutex.cc
+#		edcu.cc
+#		epicsServer.cc
+#		exServer.cc
+#		exScalarPV.cc
+#		exVectorPV.cc
+#		exPV.cc
+#		exChannel.cc
+#		framerecv.cc
+#		listener.cc
+#		daqd.cc
+#		comm_impl.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
+#
+#set (DAQD_DC_GDS_SRC
+#		gds.cc)
+#
+#add_library(dc_mx_gds STATIC ${DAQD_DC_GDS_SRC})
+#target_compile_definitions(dc_mx_gds PRIVATE
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DLIGO_GDS
+#		-D_TP_DAQD
+#		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
+#		-DDAQD_BUILD_DC)
+#target_include_directories(dc_mx_gds PUBLIC
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		)
+#target_compile_options(dc_mx_gds PUBLIC
+#		-fno-common
+#		-Wno-deprecated
+#		-Wno-write-strings
+#		)
+#target_link_libraries(dc_mx_gds PRIVATE
+#		gds::daqd
+#		ldastools::framecpp
+#		mx::myriexpress)
+#
+#add_executable(daqd_dc_mx ${DAQD_DC_MAIN_SRC} producer.cc mx_rcvr.cc)
+#target_compile_definitions(daqd_dc_mx PUBLIC
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DDAQD_BUILD_DC
+#		)
+#target_include_directories(daqd_dc_mx PUBLIC
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		)
+#target_link_libraries(daqd_dc_mx PUBLIC
+#		gds::daqd
+#		dc_mx_gds
+#		run_number::run_number
+#		ca Com cas gdd epics::ca epics::cas
+#		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
+#		ldastools::framecpp
+#		${CMAKE_THREAD_LIBS_INIT}
+#		mx::myriexpress
+#		)
+#
+############
+## mx-symm Build with mx support
+#####
+#set (DAQD_MXSYMM_MAIN_SRC
+#		archive.cc
+#		profiler.cc
+#		filesys.cc
+#		epics_pvs.cc
+#		trend.cc
+#		net_writer.cc
+#		circ.cc
+#		#framesend.cc
+#		#gdsmutex.cc
+#		edcu.cc
+#		epicsServer.cc
+#		exServer.cc
+#		exScalarPV.cc
+#		exVectorPV.cc
+#		exPV.cc
+#		exChannel.cc
+#		framerecv.cc
+#		listener.cc
+#		daqd.cc
+#		comm_impl.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
+#
+#add_library(dc_mxsymm_gds STATIC gds.cc)
+#target_compile_definitions(dc_mxsymm_gds PRIVATE
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DLIGO_GDS
+#		-D_TP_DAQD
+#		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_MXSYMM)
+#target_include_directories(dc_mxsymm_gds PUBLIC
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		)
+#target_compile_options(dc_mxsymm_gds PUBLIC
+#		-fno-common
+#		-Wno-deprecated
+#		-Wno-write-strings
+#		)
+#target_link_libraries(dc_mxsymm_gds PRIVATE
+#		gds::daqd
+#		ldastools::framecpp
+#		mx::myriexpress)
+#
+#add_executable(daqd_mxsymm ${DAQD_MXSYMM_MAIN_SRC} producer.cc mx_rcvr.cc)
+#target_compile_definitions(daqd_mxsymm PUBLIC
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_MXSYMM
+#		)
+#target_include_directories(daqd_mxsymm PUBLIC
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		)
+#target_link_libraries(daqd_mxsymm PUBLIC
+#		gds::daqd
+#		dc_mxsymm_gds
+#		run_number::run_number
+#		ca Com cas gdd epics::ca epics::cas
+#		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
+#		ldastools::framecpp
+#		${CMAKE_THREAD_LIBS_INIT}
+#		mx::myriexpress
+#		)
+#
+#
+#install(TARGETS daqd_mxsymm daqd_dc_mx DESTINATION bin)
 endif(${MX_FOUND})
 
 if (${DAQD_CAN_BUILD_DAQD_SHMEM})
@@ -432,13 +432,17 @@ target_link_libraries(daqd_shmem PUBLIC
 		gds::daqd
 		dc_gds_shmem
 		run_number::run_number
-		ca Com cas gdd epics::ca epics::cas
-		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
+		# ca Com cas gdd
+		epics::gdd
+		epics::ca epics::cas
+		#${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
 		ldastools::framecpp
 		driver::shmem
 		${CMAKE_THREAD_LIBS_INIT}
 		)
 
+install(TARGETS daqd_shmem DESTINATION bin)
+
 ##########
 ## DC with ZMQ
 ####
@@ -520,226 +524,226 @@ endif(${DAQD_CAN_BUILD_DAQD_SHMEM})
 ###########
 # daqd_rcv A receiver daqd
 ####
-set (DAQD_RCV_MAIN_SRC
-		archive.cc
-		profiler.cc
-		filesys.cc
-		epics_pvs.cc
-		trend.cc
-		net_writer.cc
-		circ.cc
-		edcu.cc
-		epicsServer.cc
-		exServer.cc
-		exPV.cc
-		exChannel.cc
-		framerecv.cc
-		listener.cc
-		daqd.cc
-		exScalarPV.cc
-		exVectorPV.cc
-		comm_impl.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
-
-add_library(dc_rcv_gds STATIC gds.cc)
-target_compile_definitions(dc_rcv_gds PRIVATE
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DLIGO_GDS
-		-D_TP_DAQD
-		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_RCV
-		-D_GNU_SOURCE -D_DEFAULT_SOURCE
-		)
-target_include_directories(dc_rcv_gds PUBLIC
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}
-		)
-target_compile_options(dc_rcv_gds PUBLIC
-		-fno-common
-		-Wno-deprecated
-		-Wno-write-strings
-		)
-target_link_libraries(dc_rcv_gds PRIVATE
-		gds::daqd
-		ldastools::framecpp
-		)
-
-add_executable(daqd_rcv ${DAQD_RCV_MAIN_SRC} producer_rcv.cc)
-target_compile_definitions(daqd_rcv PUBLIC
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_RCV
-		-D_GNU_SOURCE -D_DEFAULT_SOURCE
-		)
-target_include_directories(daqd_rcv PUBLIC
-		${CMAKE_CURRENT_BINARY_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		)
-target_link_libraries(daqd_rcv PUBLIC
-		gds::daqd
-		dc_rcv_gds
-		run_number::run_number
-		ca Com cas gdd epics::ca epics::cas
-		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
-		ldastools::framecpp
-		${CMAKE_THREAD_LIBS_INIT}
-		)
+#set (DAQD_RCV_MAIN_SRC
+#		archive.cc
+#		profiler.cc
+#		filesys.cc
+#		epics_pvs.cc
+#		trend.cc
+#		net_writer.cc
+#		circ.cc
+#		edcu.cc
+#		epicsServer.cc
+#		exServer.cc
+#		exPV.cc
+#		exChannel.cc
+#		framerecv.cc
+#		listener.cc
+#		daqd.cc
+#		exScalarPV.cc
+#		exVectorPV.cc
+#		comm_impl.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
+#
+#add_library(dc_rcv_gds STATIC gds.cc)
+#target_compile_definitions(dc_rcv_gds PRIVATE
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DLIGO_GDS
+#		-D_TP_DAQD
+#		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_RCV
+#		-D_GNU_SOURCE -D_DEFAULT_SOURCE
+#		)
+#target_include_directories(dc_rcv_gds PUBLIC
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		)
+#target_compile_options(dc_rcv_gds PUBLIC
+#		-fno-common
+#		-Wno-deprecated
+#		-Wno-write-strings
+#		)
+#target_link_libraries(dc_rcv_gds PRIVATE
+#		gds::daqd
+#		ldastools::framecpp
+#		)
+#
+#add_executable(daqd_rcv ${DAQD_RCV_MAIN_SRC} producer_rcv.cc)
+#target_compile_definitions(daqd_rcv PUBLIC
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_RCV
+#		-D_GNU_SOURCE -D_DEFAULT_SOURCE
+#		)
+#target_include_directories(daqd_rcv PUBLIC
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		)
+#target_link_libraries(daqd_rcv PUBLIC
+#		gds::daqd
+#		dc_rcv_gds
+#		run_number::run_number
+#		ca Com cas gdd epics::ca epics::cas
+#		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
+#		ldastools::framecpp
+#		${CMAKE_THREAD_LIBS_INIT}
+#		)
 
 ###########
 # daqd_bcst A gds broadcaster daqd
 ####
-set (DAQD_BCST_MAIN_SRC
-		archive.cc
-		profiler.cc
-		filesys.cc
-		epics_pvs.cc
-		trend.cc
-		net_writer.cc
-		circ.cc
-		framesend.cc
-		gdsmutex.cc
-		edcu.cc
-		epicsServer.cc
-		exServer.cc
-		exPV.cc
-		exChannel.cc
-		framerecv.cc
-		listener.cc
-		daqd.cc
-		exScalarPV.cc
-		exVectorPV.cc
-		comm_impl.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
-
-add_library(dc_bcst_gds STATIC gds.cc)
-target_compile_definitions(dc_bcst_gds PRIVATE
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DLIGO_GDS
-		-D_TP_DAQD
-		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_BCST
-		-D_GNU_SOURCE -D_DEFAULT_SOURCE
-		)
-target_include_directories(dc_bcst_gds PUBLIC
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}
-		)
-target_compile_options(dc_bcst_gds PUBLIC
-		-fno-common
-		-Wno-deprecated
-		-Wno-write-strings
-		)
-target_link_libraries(dc_bcst_gds PRIVATE
-		gds::daqd
-		ldastools::framecpp
-		)
-
-add_executable(daqd_bcst ${DAQD_BCST_MAIN_SRC} producer.cc)
-target_compile_definitions(daqd_bcst PUBLIC
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_BCST
-		-D_GNU_SOURCE -D_DEFAULT_SOURCE
-		)
-target_include_directories(daqd_bcst PUBLIC
-		${CMAKE_CURRENT_BINARY_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		)
-target_link_libraries(daqd_bcst PUBLIC
-		gds::daqd
-		dc_bcst_gds
-		run_number::run_number
-		ca Com cas gdd epics::ca epics::cas
-		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
-		ldastools::framecpp
-		${CMAKE_THREAD_LIBS_INIT}
-		)
+#set (DAQD_BCST_MAIN_SRC
+#		archive.cc
+#		profiler.cc
+#		filesys.cc
+#		epics_pvs.cc
+#		trend.cc
+#		net_writer.cc
+#		circ.cc
+#		framesend.cc
+#		gdsmutex.cc
+#		edcu.cc
+#		epicsServer.cc
+#		exServer.cc
+#		exPV.cc
+#		exChannel.cc
+#		framerecv.cc
+#		listener.cc
+#		daqd.cc
+#		exScalarPV.cc
+#		exVectorPV.cc
+#		comm_impl.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
+#
+#add_library(dc_bcst_gds STATIC gds.cc)
+#target_compile_definitions(dc_bcst_gds PRIVATE
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DLIGO_GDS
+#		-D_TP_DAQD
+#		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_BCST
+#		-D_GNU_SOURCE -D_DEFAULT_SOURCE
+#		)
+#target_include_directories(dc_bcst_gds PUBLIC
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		)
+#target_compile_options(dc_bcst_gds PUBLIC
+#		-fno-common
+#		-Wno-deprecated
+#		-Wno-write-strings
+#		)
+#target_link_libraries(dc_bcst_gds PRIVATE
+#		gds::daqd
+#		ldastools::framecpp
+#		)
+#
+#add_executable(daqd_bcst ${DAQD_BCST_MAIN_SRC} producer.cc)
+#target_compile_definitions(daqd_bcst PUBLIC
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_BCST
+#		-D_GNU_SOURCE -D_DEFAULT_SOURCE
+#		)
+#target_include_directories(daqd_bcst PUBLIC
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		)
+#target_link_libraries(daqd_bcst PUBLIC
+#		gds::daqd
+#		dc_bcst_gds
+#		run_number::run_number
+#		ca Com cas gdd epics::ca epics::cas
+#		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
+#		ldastools::framecpp
+#		${CMAKE_THREAD_LIBS_INIT}
+#		)
 
 ###########
 # daqd_standiop A standalone system with iop
 ####
-set (DAQD_STANDIOP_MAIN_SRC
-		archive.cc
-		profiler.cc
-		filesys.cc
-		epics_pvs.cc
-		trend.cc
-		net_writer.cc
-		circ.cc
-		edcu.cc
-		epicsServer.cc
-		exServer.cc
-		exPV.cc
-		exChannel.cc
-		framerecv.cc
-		listener.cc
-		daqd.cc
-		exScalarPV.cc
-		exVectorPV.cc
-		comm_impl.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
-		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
-
-add_library(dc_standiop_gds STATIC gds.cc)
-target_compile_definitions(dc_standiop_gds PRIVATE
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DLIGO_GDS
-		-D_TP_DAQD
-		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_STANDIOP
-		-D_GNU_SOURCE -D_DEFAULT_SOURCE
-		)
-target_include_directories(dc_standiop_gds PUBLIC
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}
-		)
-target_compile_options(dc_standiop_gds PUBLIC
-		-fno-common
-		-Wno-deprecated
-		-Wno-write-strings
-		)
-target_link_libraries(dc_standiop_gds PRIVATE
-		gds::daqd
-		ldastools::framecpp
-		)
-
-add_executable(daqd_standiop ${DAQD_STANDIOP_MAIN_SRC} producer.cc)
-target_compile_definitions(daqd_standiop PUBLIC
-		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
-		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
-		-DGDS_TESTPOINT_SUPPORT
-		-DDAQD_BUILD_STANDIOP
-		-D_GNU_SOURCE -D_DEFAULT_SOURCE
-		)
-target_include_directories(daqd_standiop PUBLIC
-		${CMAKE_CURRENT_BINARY_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		)
-target_link_libraries(daqd_standiop PUBLIC
-		gds::daqd
-		dc_standiop_gds
-		run_number::run_number
-		ca Com cas gdd epics::ca epics::cas
-		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
-		ldastools::framecpp
-		${CMAKE_THREAD_LIBS_INIT}
-		)
-
-
-install(TARGETS daqd_fw daqd_rcv daqd_bcst daqd_standiop DESTINATION bin)
+#set (DAQD_STANDIOP_MAIN_SRC
+#		archive.cc
+#		profiler.cc
+#		filesys.cc
+#		epics_pvs.cc
+#		trend.cc
+#		net_writer.cc
+#		circ.cc
+#		edcu.cc
+#		epicsServer.cc
+#		exServer.cc
+#		exPV.cc
+#		exChannel.cc
+#		framerecv.cc
+#		listener.cc
+#		daqd.cc
+#		exScalarPV.cc
+#		exVectorPV.cc
+#		comm_impl.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm.cc
+#		${CMAKE_CURRENT_BINARY_DIR}/comm-lex.cc)
+#
+#add_library(dc_standiop_gds STATIC gds.cc)
+#target_compile_definitions(dc_standiop_gds PRIVATE
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DLIGO_GDS
+#		-D_TP_DAQD
+#		-DARCHIVE=\"${CMAKE_CURRENT_SOURCE_DIR}/../gds\"
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_STANDIOP
+#		-D_GNU_SOURCE -D_DEFAULT_SOURCE
+#		)
+#target_include_directories(dc_standiop_gds PUBLIC
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		)
+#target_compile_options(dc_standiop_gds PUBLIC
+#		-fno-common
+#		-Wno-deprecated
+#		-Wno-write-strings
+#		)
+#target_link_libraries(dc_standiop_gds PRIVATE
+#		gds::daqd
+#		ldastools::framecpp
+#		)
+#
+#add_executable(daqd_standiop ${DAQD_STANDIOP_MAIN_SRC} producer.cc)
+#target_compile_definitions(daqd_standiop PUBLIC
+#		${DAQD_BUILD_INFO_DEFINES} -DUNIX -Dlinux
+#		-D_REENTRANT -DNO_RTL=1 -DDAQD_CPP11 -DUSE_FRAMECPP_VERSION
+#		-DGDS_TESTPOINT_SUPPORT
+#		-DDAQD_BUILD_STANDIOP
+#		-D_GNU_SOURCE -D_DEFAULT_SOURCE
+#		)
+#target_include_directories(daqd_standiop PUBLIC
+#		${CMAKE_CURRENT_BINARY_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}
+#		${CMAKE_CURRENT_SOURCE_DIR}/../include
+#		)
+#target_link_libraries(daqd_standiop PUBLIC
+#		gds::daqd
+#		dc_standiop_gds
+#		run_number::run_number
+#		ca Com cas gdd epics::ca epics::cas
+#		${EPICS_BASE_CA_LIBS} ${EPICS_BASE_CAS_LIBS}
+#		ldastools::framecpp
+#		${CMAKE_THREAD_LIBS_INIT}
+#		)
+#
+#
+#install(TARGETS daqd_fw daqd_rcv daqd_bcst daqd_standiop DESTINATION bin)