Bug 1167: Modifications for makeVersion.

MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc

@@ -401,9 +401,9 @@ GCFEvent::TResult ObservationControl::starting_state(GCFEvent& event,
 		itsPropertySet->setValue(PN_OBSCTRL_STATION_LIST, GCFPVString(
 						compactedArrayString(globalParameterSet()->
 						getString("Observation.VirtualInstrument.stationList"))));
-		itsPropertySet->setValue(PN_OBSCTRL_INPUT_NODE_LIST, GCFPVString(
-						compactedArrayString(globalParameterSet()->
-						getString("Observation.VirtualInstrument.inputNodeList"))));
+//		itsPropertySet->setValue(PN_OBSCTRL_INPUT_NODE_LIST, GCFPVString(
+//						compactedArrayString(globalParameterSet()->
+//						getString("Observation.VirtualInstrument.inputNodeList"))));
 		itsPropertySet->setValue(PN_OBSCTRL_BGL_NODE_LIST, GCFPVString(
 						compactedArrayString(globalParameterSet()->
 						getString("Observation.VirtualInstrument.BGLNodeList"))));

MAC/APL/MainCU/src/ObservationControl/ObservationControlDefines.h

@@ -43,7 +43,6 @@ namespace LOFAR {
 #define PN_OBSCTRL_SAMPLE_CLOCK			"sampleClock"
 #define PN_OBSCTRL_MEASUREMENT_SET		"measurementSet"
 #define PN_OBSCTRL_STATION_LIST			"stationList"
-#define PN_OBSCTRL_INPUT_NODE_LIST		"inputNodeList"
 #define PN_OBSCTRL_BGL_NODE_LIST		"BGLNodeList"
 #define PN_OBSCTRL_STORAGE_NODE_LIST	"storageNodeList"
 #define PN_OBSCTRL_BEAMS_ANGLE1			"Beams.angle1"

MAC/GCF/TM/include/GCF/TM/Makefile.am

 pkgincludedir = $(includedir)/GCF/TM
-pkginclude_HEADERS = \
+pkginclude_HEADERS = Package__Version.h  \
 	GCF_Control.h \
 	GCF_DevicePort.h \
 	GCF_ETHRawPort.h \

MAC/GCF/TM/src/Makefile.am

@@ -16,7 +16,7 @@ DOCHDRS = \
     
 lib_LTLIBRARIES 	= libgcftm.la
 
-libgcftm_la_SOURCES= $(DOCHDRS) \
+libgcftm_la_SOURCES= Package__Version.cc  $(DOCHDRS) \
   GCF_Fsm.cc \
   GCF_Protocols.cc \
   GCF_Task.cc \
@@ -48,5 +48,11 @@ EXTRA_DIST 			= $(sysconf_DATA)
 	
 sysconf_DATA 		= mac.log_prop
 
+bin_PROGRAMS = versiongcftm
+
+versiongcftm_SOURCES      = versiongcftm.cc
+versiongcftm_LDADD        = libgcftm.la
+versiongcftm_DEPENDENCIES = libgcftm.la $(LOFAR_DEPEND)
+
 include $(top_srcdir)/Makefile.common