From ca20a7abd712099c82de2c71fe1488b0f8a7bc48 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Thu, 27 Mar 2008 09:53:31 +0000
Subject: [PATCH] Bug 1167: Modifications for makeVersion.
---
.../MainCU/src/ObservationControl/ObservationControl.cc | 6 +++---
.../src/ObservationControl/ObservationControlDefines.h | 1 -
MAC/GCF/TM/include/GCF/TM/Makefile.am | 2 +-
MAC/GCF/TM/src/Makefile.am | 8 +++++++-
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index b90cbffa21e..59bfc456613 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/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"))));
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControlDefines.h b/MAC/APL/MainCU/src/ObservationControl/ObservationControlDefines.h
index d815c4cf7c6..00f7b2125ac 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControlDefines.h
+++ b/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"
diff --git a/MAC/GCF/TM/include/GCF/TM/Makefile.am b/MAC/GCF/TM/include/GCF/TM/Makefile.am
index 0eb896c63d1..360d4adea89 100644
--- a/MAC/GCF/TM/include/GCF/TM/Makefile.am
+++ b/MAC/GCF/TM/include/GCF/TM/Makefile.am
@@ -1,5 +1,5 @@
pkgincludedir = $(includedir)/GCF/TM
-pkginclude_HEADERS = \
+pkginclude_HEADERS = Package__Version.h \
GCF_Control.h \
GCF_DevicePort.h \
GCF_ETHRawPort.h \
diff --git a/MAC/GCF/TM/src/Makefile.am b/MAC/GCF/TM/src/Makefile.am
index 516f46840e4..513b4ee1701 100644
--- a/MAC/GCF/TM/src/Makefile.am
+++ b/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
--
GitLab