Bug 1310: Renamed package RSPDriver to RSP_Driver and TBBDriver to TBB_Driver...

Bug 1310: Renamed package RSPDriver to RSP_Driver and TBBDriver to TBB_Driver to avoid name clashes with binary target when building with CMake

MAC/APL/PIC/RSPDriver/configure.in

@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT(src/RSPDriver.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(RSPDriver, 6.0, no-define)
+AM_INIT_AUTOMAKE(RSP_Driver, 6.0, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT

MAC/APL/PIC/RSPDriver/src/Makefile.am

@@ -26,7 +26,7 @@ lib_LTLIBRARIES		= libepa.la
 libepa_la_SOURCES	= Package__Version.cc RawEvent.h RawEvent.cc
 
 sbin_PROGRAMS 		= geni2c
-bin_PROGRAMS 		= RSPDriver rspctl versionrspdriver
+bin_PROGRAMS 		= RSPDriver rspctl versionrsp_driver
 
 RSPDriver_SOURCES	= \
 	RSPDriver.cc \
@@ -220,8 +220,8 @@ rspctl_LDADD					= -lgnuplot_i
 
 geni2c_SOURCES					= geni2c.cc
 
-versionrspdriver_SOURCES		= versionrspdriver.cc
-versionrspdriver_LDADD			= libepa.la
-versionrspdriver_DEPENDENCIES	= libepa.la $(LOFAR_DEPEND)
+versionrsp_driver_SOURCES		= versionrsp_driver.cc
+versionrsp_driver_LDADD			= libepa.la
+versionrsp_driver_DEPENDENCIES	= libepa.la $(LOFAR_DEPEND)
 
 include $(top_srcdir)/Makefile.common

MAC/APL/PIC/TBBDriver/configure.in

@@ -5,7 +5,7 @@ AC_INIT
 dnl AC_CONFIG_AUX_DIR(config)
 dnl AM_CONFIG_HEADER(config/config.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(TBBDriver, 1.0, no-define)
+AM_INIT_AUTOMAKE(TBB_Driver, 1.0, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT

MAC/APL/PIC/TBBDriver/src/Makefile.am

@@ -127,7 +127,7 @@ noinst_HEADERS = \
 # libtbbdriver_la_LIBADD     = shmem/libshmem.la
 # endif
 
-bin_PROGRAMS = versiontbbdriver \
+bin_PROGRAMS = versiontbb_driver \
 	TBBDriver \
 	tbbctl
 
@@ -142,9 +142,9 @@ TBBDriver_SOURCES 		= TBBDriver.h TBBDriver.cc
 TBBDriver_LDADD 		= libtbbdriver.la libtp_protocol.la
 TBBDriver_DEPENDENCIES  = libtbbdriver.la libtp_protocol.la $(LOFAR_DEPEND)
 
-versiontbbdriver_SOURCES      = versiontbbdriver.cc
-versiontbbdriver_LDADD        = libtbbdriver.la
-versiontbbdriver_DEPENDENCIES = libtbbdriver.la $(LOFAR_DEPEND)
+versiontbb_driver_SOURCES      = versiontbb_driver.cc
+versiontbb_driver_LDADD        = libtbbdriver.la
+versiontbb_driver_DEPENDENCIES = libtbbdriver.la $(LOFAR_DEPEND)
 
 
 glishdir = $(libexecdir)/glish