From 72b451423c510b83c4e6111c711fd88fb6b8089b Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Mon, 26 Nov 2007 08:38:29 +0000
Subject: [PATCH] Bug 596: Removed the nobase_ prefix, and other unused lines.
---
.../include/CS1_BGLProc/Makefile.am | 14 -------------
.../include/CS1_Generator/Makefile.am | 15 --------------
.../include/CS1_IONProc/Makefile.am | 10 ----------
.../include/CS1_InputSection/Makefile.am | 14 -------------
.../include/CS1_Storage/Makefile.am | 14 -------------
CEP/CPA/PSS3/CAL/src/Makefile.am | 12 +----------
CEP/CPA/PSS3/MNS/src/Makefile.am | 20 +------------------
.../Generator/include/Generator/Makefile.am | 17 ++--------------
.../include/jParmFacade/Makefile.am | 14 -------------
JAVA/MAC/jRSP/include/jRSP/Makefile.am | 14 -------------
LCS/databases/TransportPL/src/Makefile.am | 13 +-----------
.../include/TransportPostgres/Makefile.am | 16 +--------------
.../include/APL/APLCommon/Makefile.am | 12 -----------
.../include/APL/BS_Protocol/Makefile.am | 17 ++--------------
.../include/APL/CAL_Protocol/Makefile.am | 17 ++--------------
MAC/APL/PAC/_StationOperations/configure.in | 12 +++++------
.../include/APL/StationOperations/Makefile.am | 12 -----------
.../PAC/_StationReceptorGroup/configure.in | 12 +++++------
.../APL/StationReceptorGroup/Makefile.am | 12 -----------
MAC/APL/PAC/_StationStartDaemon/configure.in | 18 ++++++++---------
MAC/APL/PAC/_VirtualBackend/configure.in | 16 +++++++--------
MAC/APL/PAC/_VirtualTelescope/configure.in | 18 ++++++++---------
.../include/APL/VirtualTelescope/Makefile.am | 12 -----------
MAC/APL/PIC/RSPCtlFE/configure.in | 12 +++++------
.../TBBDriver/include/TBBDriver/Makefile.am | 16 ---------------
MAC/APL/PIC/_NodeManager/configure.in | 8 ++++----
MAC/APL/_GSO/MACScheduler/configure.in | 14 ++++++-------
MAC/APL/_VIC/ArrayOperations/configure.in | 10 +++++-----
.../include/APL/ArrayOperations/Makefile.am | 12 -----------
MAC/APL/_VIC/ArrayReceptorGroup/configure.in | 10 +++++-----
.../APL/ArrayReceptorGroup/Makefile.am | 12 -----------
MAC/APL/_VIC/VirtualInstrument/configure.in | 16 +++++++--------
MAC/APL/_VIC/VirtualRoute/configure.in | 10 +++++-----
.../include/APL/VirtualRoute/Makefile.am | 12 -----------
MAC/Deployment/include/Deployment/Makefile.am | 8 --------
MAC/GCF/GCFCommon/include/GCF/Makefile.am | 12 -----------
MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am | 12 -----------
MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am | 12 -----------
MAC/GCF/TM/include/GCF/TM/Makefile.am | 12 -----------
MAC/GCF/_PAL/include/GCF/PAL/Makefile.am | 12 -----------
MAC/GCF/_PALlight/configure.in | 12 +++++------
.../include/GCF/PALlight/Makefile.am | 12 -----------
MAC/Test/GCF/CEP/configure.in | 2 +-
MAC/Test/GCF/MAC/configure.in | 6 +++---
MAC/Test/GCF/RTC/configure.in | 2 +-
MAC/Test/Suite/include/Suite/Makefile.am | 10 ----------
MAC/Test/TestHarness/THEcho/configure.in | 6 +++---
.../TestHarness/THPVSSBridge/configure.in | 10 +++++-----
SAS/OTDB/include/OTDB/Makefile.am | 8 --------
49 files changed, 107 insertions(+), 492 deletions(-)
diff --git a/Appl/CEP/CS1/CS1_BGLProc/include/CS1_BGLProc/Makefile.am b/Appl/CEP/CS1/CS1_BGLProc/include/CS1_BGLProc/Makefile.am
index cc59db7d99d..e2822dd7b85 100644
--- a/Appl/CEP/CS1/CS1_BGLProc/include/CS1_BGLProc/Makefile.am
+++ b/Appl/CEP/CS1/CS1_BGLProc/include/CS1_BGLProc/Makefile.am
@@ -1,17 +1,3 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
INSTHDRS =
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/Appl/CEP/CS1/CS1_Generator/include/CS1_Generator/Makefile.am b/Appl/CEP/CS1/CS1_Generator/include/CS1_Generator/Makefile.am
index 2ecb04d72f4..f9e663e64c0 100644
--- a/Appl/CEP/CS1/CS1_Generator/include/CS1_Generator/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Generator/include/CS1_Generator/Makefile.am
@@ -1,7 +1,3 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
INSTHDRS = StationData.h \
DH_RSP.h \
AH_FakeStation.h \
@@ -11,15 +7,4 @@ INSTHDRS = StationData.h \
WH_Strip.h \
WH_Wrap.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/Appl/CEP/CS1/CS1_IONProc/include/CS1_IONProc/Makefile.am b/Appl/CEP/CS1/CS1_IONProc/include/CS1_IONProc/Makefile.am
index 70620fc35a8..e2822dd7b85 100644
--- a/Appl/CEP/CS1/CS1_IONProc/include/CS1_IONProc/Makefile.am
+++ b/Appl/CEP/CS1/CS1_IONProc/include/CS1_IONProc/Makefile.am
@@ -1,13 +1,3 @@
INSTHDRS =
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/Appl/CEP/CS1/CS1_InputSection/include/CS1_InputSection/Makefile.am b/Appl/CEP/CS1/CS1_InputSection/include/CS1_InputSection/Makefile.am
index f518179b721..a130668deb2 100644
--- a/Appl/CEP/CS1/CS1_InputSection/include/CS1_InputSection/Makefile.am
+++ b/Appl/CEP/CS1/CS1_InputSection/include/CS1_InputSection/Makefile.am
@@ -1,7 +1,3 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
INSTHDRS = Connector.h \
InputThread.h \
LockedRange.h \
@@ -10,14 +6,4 @@ INSTHDRS = Connector.h \
AH_InputSection.h \
WH_InputSection.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/Appl/CEP/CS1/CS1_Storage/include/CS1_Storage/Makefile.am b/Appl/CEP/CS1/CS1_Storage/include/CS1_Storage/Makefile.am
index 607889cd4de..0cef4659d89 100644
--- a/Appl/CEP/CS1/CS1_Storage/include/CS1_Storage/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Storage/include/CS1_Storage/Makefile.am
@@ -1,21 +1,7 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
INSTHDRS = \
AH_Storage.h \
WH_SubbandWriter.h \
MSWriter.h \
MSWriterImpl.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/CEP/CPA/PSS3/CAL/src/Makefile.am b/CEP/CPA/PSS3/CAL/src/Makefile.am
index 6b7ede8bc4c..c27ddca0387 100644
--- a/CEP/CPA/PSS3/CAL/src/Makefile.am
+++ b/CEP/CPA/PSS3/CAL/src/Makefile.am
@@ -1,14 +1,4 @@
-INSTHDRS = MeqCalibraterImpl.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
+pkginclude_HEADERS = MeqCalibraterImpl.h
lib_LTLIBRARIES = libcal.la
diff --git a/CEP/CPA/PSS3/MNS/src/Makefile.am b/CEP/CPA/PSS3/MNS/src/Makefile.am
index 96bc21de229..cf63d2e04e2 100644
--- a/CEP/CPA/PSS3/MNS/src/Makefile.am
+++ b/CEP/CPA/PSS3/MNS/src/Makefile.am
@@ -1,4 +1,4 @@
-INSTHDRS = \
+pkginclude_HEADERS = \
MeqDomain.h \
MeqExpr.h \
MeqHist.h \
@@ -37,18 +37,6 @@ INSTHDRS = \
ParmTableAIPS.h \
MeqParmHolder.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = \
- $(INSTHDRS) \
- $(NOINSTHDRS)
-
lib_LTLIBRARIES = libmns.la
libmns_la_SOURCES = \
@@ -92,10 +80,4 @@ AM_YFLAGS = -d -p KeyParse
AM_LFLAGS = -PKeyTokenize
LEX_OUTPUT_ROOT = lex.KeyTokenize
-#bin_PROGRAMS = parmdb
-
-#parmdb_SOURCES = parmdb.cc
-#parmdb_LDADD = ./libmns.la
-#parmdb_DEPENDENCIES = ./libmns.la $(LOFAR_DEPEND)
-
include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/Generator/include/Generator/Makefile.am b/CEP/Tools/Generator/include/Generator/Makefile.am
index 052f7e090fe..14125907503 100644
--- a/CEP/Tools/Generator/include/Generator/Makefile.am
+++ b/CEP/Tools/Generator/include/Generator/Makefile.am
@@ -1,8 +1,5 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
-INSTHDRS = Flaggers.h \
+pkginclude_HEADERS = \
+ Flaggers.h \
Signals.h \
RSPTimeStamp.h \
WH_FakeStation.h \
@@ -13,14 +10,4 @@ INSTHDRS = Flaggers.h \
RSPEthFrame.h \
Connector.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am b/JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am
index feddac6188a..d3de1480cbe 100644
--- a/JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am
+++ b/JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am
@@ -1,18 +1,4 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
INSTHDRS = nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h \
nl_astron_lofar_java_cep_jparmfacade_jCommon.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/JAVA/MAC/jRSP/include/jRSP/Makefile.am b/JAVA/MAC/jRSP/include/jRSP/Makefile.am
index 703d5527caf..f1d450baf7f 100644
--- a/JAVA/MAC/jRSP/include/jRSP/Makefile.am
+++ b/JAVA/MAC/jRSP/include/jRSP/Makefile.am
@@ -1,17 +1,3 @@
-# if HAVE_SHMEN
-# SUBDIRS = shmem .
-# endif
-
INSTHDRS = nl_astron_lofar_mac_apl_gui_jrsp_Board.h
-NOINSTHIRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = ${INSTHDRS} ${TCCHDRS}
-
-noinst_HEADERS = ${NOINSTHDRS}
-
-DOCHDRS = ${INSTHDRS} ${NOINSTHDRS}
-
include ${top_srcdir}/Makefile.common
diff --git a/LCS/databases/TransportPL/src/Makefile.am b/LCS/databases/TransportPL/src/Makefile.am
index 0583d2d3fec..09c6a563b27 100644
--- a/LCS/databases/TransportPL/src/Makefile.am
+++ b/LCS/databases/TransportPL/src/Makefile.am
@@ -1,18 +1,8 @@
-INSTHDRS = \
+pkginclude_HEADERS = \
DH_PL.h \
PO_DH_PL.h \
TH_PL.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
lib_LTLIBRARIES = libtransportpl.la
libtransportpl_la_DEPENDENCIES = $(LOFAR_DEPEND)
@@ -22,6 +12,5 @@ DH_PL.cc \
PO_DH_PL.cc \
TH_PL.cc
-
include $(top_srcdir)/Makefile.common
diff --git a/LCS/databases/TransportPostgres/include/TransportPostgres/Makefile.am b/LCS/databases/TransportPostgres/include/TransportPostgres/Makefile.am
index fd4e6d13b66..a9d8df85c17 100644
--- a/LCS/databases/TransportPostgres/include/TransportPostgres/Makefile.am
+++ b/LCS/databases/TransportPostgres/include/TransportPostgres/Makefile.am
@@ -1,20 +1,6 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
-INSTHDRS = \
+pkginclude_HEADERS = \
DH_DB.h \
TH_DB.h \
TH_Postgresql.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am b/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
index 0ddce11f6b1..41281b83200 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
@@ -1,5 +1,3 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/APL/APLCommon
pkginclude_HEADERS = \
APLCommonExceptions.h \
@@ -14,14 +12,4 @@ pkginclude_HEADERS = \
ParentControl.h \
Observation.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Makefile.am b/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Makefile.am
index b1165620f0c..49f90e1c624 100644
--- a/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Makefile.am
+++ b/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Makefile.am
@@ -1,19 +1,6 @@
-
-INSTHDRS = \
+apldir = $(includedir)/APL/BS_Protocol
+apl_HEADERS = \
Beamlet2SubbandMap.h \
Pointing.h
-apldir = $(includedir)/APL/BS_Protocol
-apl_HEADERS = $(INSTHDRS)
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/Makefile.am b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/Makefile.am
index c54e49cfb65..53180cb10cf 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/Makefile.am
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/Makefile.am
@@ -1,5 +1,5 @@
-
-INSTHDRS = \
+apldir = $(includedir)/APL/CAL_Protocol
+apl_HEADERS = \
AntennaArray.h \
AntennaArrayData.h \
AntennaGains.h \
@@ -9,17 +9,4 @@ INSTHDRS = \
CalibrationInterface.h \
ACC.h
-apldir = $(includedir)/APL/CAL_Protocol
-apl_HEADERS = $(INSTHDRS)
-
-# nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/_StationOperations/configure.in b/MAC/APL/PAC/_StationOperations/configure.in
index 9a901160335..5305b65232a 100644
--- a/MAC/APL/PAC/_StationOperations/configure.in
+++ b/MAC/APL/PAC/_StationOperations/configure.in
@@ -53,12 +53,12 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, HEAD,1, APL/RSP_Protocol/RSP_Protocol.ph,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, , 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, ,1, APL/RSP_Protocol/RSP_Protocol.ph,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/PAC/_StationOperations/include/APL/StationOperations/Makefile.am b/MAC/APL/PAC/_StationOperations/include/APL/StationOperations/Makefile.am
index 146618685cb..5ff243d3b4c 100644
--- a/MAC/APL/PAC/_StationOperations/include/APL/StationOperations/Makefile.am
+++ b/MAC/APL/PAC/_StationOperations/include/APL/StationOperations/Makefile.am
@@ -1,18 +1,6 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/APL/StationOperations
pkginclude_HEADERS = \
StationOperations.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/_StationReceptorGroup/configure.in b/MAC/APL/PAC/_StationReceptorGroup/configure.in
index 4c2a8b032bb..d114876d7ca 100644
--- a/MAC/APL/PAC/_StationReceptorGroup/configure.in
+++ b/MAC/APL/PAC/_StationReceptorGroup/configure.in
@@ -53,12 +53,12 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, HEAD,1, APL/CAL_Protocol/CAL_Protocol.ph,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, , 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, ,1, APL/CAL_Protocol/CAL_Protocol.ph,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/PAC/_StationReceptorGroup/include/APL/StationReceptorGroup/Makefile.am b/MAC/APL/PAC/_StationReceptorGroup/include/APL/StationReceptorGroup/Makefile.am
index 2f7d681e406..91c6fed6ab3 100644
--- a/MAC/APL/PAC/_StationReceptorGroup/include/APL/StationReceptorGroup/Makefile.am
+++ b/MAC/APL/PAC/_StationReceptorGroup/include/APL/StationReceptorGroup/Makefile.am
@@ -1,18 +1,6 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/APL/StationReceptorGroup
pkginclude_HEADERS = \
StationReceptorGroup.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/_StationStartDaemon/configure.in b/MAC/APL/PAC/_StationStartDaemon/configure.in
index 188d7bb08f3..5dbf523f9e0 100644
--- a/MAC/APL/PAC/_StationStartDaemon/configure.in
+++ b/MAC/APL/PAC/_StationStartDaemon/configure.in
@@ -54,15 +54,15 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, MAC-APL-3_1, 1, APL/StationOperations/StationOperations.h,,)
-lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, MAC-APL-3_1, 1, APL/StationReceptorGroup/StationReceptorGroup.h,,)
-lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, MAC-APL-3_1, 1, APL/VirtualTelescope/VirtualTelescope.h,,)
-lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, , 1, APL/StationOperations/StationOperations.h,,)
+lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, , 1, APL/StationReceptorGroup/StationReceptorGroup.h,,)
+lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, , 1, APL/VirtualTelescope/VirtualTelescope.h,,)
+lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, , 1, AMCBase/EarthCoord.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/PAC/_VirtualBackend/configure.in b/MAC/APL/PAC/_VirtualBackend/configure.in
index 5d627b45b5a..ce99ee8f379 100644
--- a/MAC/APL/PAC/_VirtualBackend/configure.in
+++ b/MAC/APL/PAC/_VirtualBackend/configure.in
@@ -37,15 +37,15 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_PVSS
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_EXTERNAL(boost, 1, boost/shared_ptr.hpp, "")
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PIC/NodeManager, nm, MAC-APL-3_1, 1, APL/NodeManager/NodeManager.h,,)
-lofar_INTERNAL(LCS/ACC/ALC, alc, LCS-ACC-2_0, 1, ALC/ACAsyncClient.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps, LCS-ACC-2_0, 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PIC/NodeManager, nm, , 1, APL/NodeManager/NodeManager.h,,)
+lofar_INTERNAL(LCS/ACC/ALC, alc, , 1, ALC/ACAsyncClient.h,,)
+lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/_VirtualTelescope/configure.in b/MAC/APL/PAC/_VirtualTelescope/configure.in
index a0711efe694..b8f40250e1b 100644
--- a/MAC/APL/PAC/_VirtualTelescope/configure.in
+++ b/MAC/APL/PAC/_VirtualTelescope/configure.in
@@ -12,14 +12,14 @@ lofar_INIT
dnl Checks for programs.
AC_PROG_AWK
-AC_PROG_YACC
AC_PROG_CC
AC_PROG_CXX
-AM_PROG_LEX
AC_PROG_INSTALL
AC_PROG_LN_S
AC_DISABLE_SHARED
AC_PROG_LIBTOOL
+AC_PROG_YACC
+AM_PROG_LEX
dnl Checks for libraries.
@@ -53,13 +53,13 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, HEAD,1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/BS_Protocol, BS_Protocol, HEAD,1, APL/BS_Protocol/BS_Protocol.ph,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, ,1, APL/RSP_Protocol/RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/BS_Protocol, BS_Protocol, ,1, APL/BS_Protocol/BS_Protocol.ph,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
diff --git a/MAC/APL/PAC/_VirtualTelescope/include/APL/VirtualTelescope/Makefile.am b/MAC/APL/PAC/_VirtualTelescope/include/APL/VirtualTelescope/Makefile.am
index 860157d8d12..57afa7fb452 100644
--- a/MAC/APL/PAC/_VirtualTelescope/include/APL/VirtualTelescope/Makefile.am
+++ b/MAC/APL/PAC/_VirtualTelescope/include/APL/VirtualTelescope/Makefile.am
@@ -1,18 +1,6 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/APL/VirtualTelescope
pkginclude_HEADERS = \
VirtualTelescope.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSPCtlFE/configure.in b/MAC/APL/PIC/RSPCtlFE/configure.in
index 07749f08d04..46a8ea86d6b 100755
--- a/MAC/APL/PIC/RSPCtlFE/configure.in
+++ b/MAC/APL/PIC/RSPCtlFE/configure.in
@@ -54,12 +54,12 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-3_0, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_1rc2, 1, GCF/PAL/GCF_Answer.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-6_0devel1, 1, APL/RTCCommon/Marshalling.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, MAC-RTC-6_0devel1,1, APL/RSP_Protocol/RSP_Protocol.ph,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, rc2, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, rc2, 1, GCF/PAL/GCF_Answer.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, rc2, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, devel1, 1, APL/RTCCommon/Marshalling.h,,)
+lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, devel1,1, APL/RSP_Protocol/RSP_Protocol.ph,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/PIC/TBBDriver/include/TBBDriver/Makefile.am b/MAC/APL/PIC/TBBDriver/include/TBBDriver/Makefile.am
index cc59db7d99d..db5d3ab761c 100644
--- a/MAC/APL/PIC/TBBDriver/include/TBBDriver/Makefile.am
+++ b/MAC/APL/PIC/TBBDriver/include/TBBDriver/Makefile.am
@@ -1,17 +1 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
-INSTHDRS =
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/_NodeManager/configure.in b/MAC/APL/PIC/_NodeManager/configure.in
index 46528b490d6..915df48d0b6 100644
--- a/MAC/APL/PIC/_NodeManager/configure.in
+++ b/MAC/APL/PIC/_NodeManager/configure.in
@@ -37,10 +37,10 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_PVSS
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/_GSO/MACScheduler/configure.in b/MAC/APL/_GSO/MACScheduler/configure.in
index 3ac7396a1d6..4778aa50c6b 100644
--- a/MAC/APL/_GSO/MACScheduler/configure.in
+++ b/MAC/APL/_GSO/MACScheduler/configure.in
@@ -55,13 +55,13 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps, LCS-ACC-2_0, 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(SAS/OTDB, otdb, HEAD, 1, OTDB/OTDBconnection.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(SAS/OTDB, otdb, , 1, OTDB/OTDBconnection.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/_VIC/ArrayOperations/configure.in b/MAC/APL/_VIC/ArrayOperations/configure.in
index 62770734180..fb1928fd464 100644
--- a/MAC/APL/_VIC/ArrayOperations/configure.in
+++ b/MAC/APL/_VIC/ArrayOperations/configure.in
@@ -53,11 +53,11 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, , 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/_VIC/ArrayOperations/include/APL/ArrayOperations/Makefile.am b/MAC/APL/_VIC/ArrayOperations/include/APL/ArrayOperations/Makefile.am
index 26a8522d17b..2d1cb71c5a4 100644
--- a/MAC/APL/_VIC/ArrayOperations/include/APL/ArrayOperations/Makefile.am
+++ b/MAC/APL/_VIC/ArrayOperations/include/APL/ArrayOperations/Makefile.am
@@ -1,18 +1,6 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/APL/ArrayOperations
pkginclude_HEADERS = \
ArrayOperations.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/_VIC/ArrayReceptorGroup/configure.in b/MAC/APL/_VIC/ArrayReceptorGroup/configure.in
index 52e94243681..d49d8dcf116 100644
--- a/MAC/APL/_VIC/ArrayReceptorGroup/configure.in
+++ b/MAC/APL/_VIC/ArrayReceptorGroup/configure.in
@@ -54,11 +54,11 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, , 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/_VIC/ArrayReceptorGroup/include/APL/ArrayReceptorGroup/Makefile.am b/MAC/APL/_VIC/ArrayReceptorGroup/include/APL/ArrayReceptorGroup/Makefile.am
index a7863bf74af..f868518b96d 100644
--- a/MAC/APL/_VIC/ArrayReceptorGroup/include/APL/ArrayReceptorGroup/Makefile.am
+++ b/MAC/APL/_VIC/ArrayReceptorGroup/include/APL/ArrayReceptorGroup/Makefile.am
@@ -1,18 +1,6 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/APL/ArrayReceptorGroup
pkginclude_HEADERS = \
ArrayReceptorGroup.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/_VIC/VirtualInstrument/configure.in b/MAC/APL/_VIC/VirtualInstrument/configure.in
index 26208e15d24..2c885fcac79 100644
--- a/MAC/APL/_VIC/VirtualInstrument/configure.in
+++ b/MAC/APL/_VIC/VirtualInstrument/configure.in
@@ -53,14 +53,14 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
-dnl lofar_INTERNAL(MAC/APL/VIC/ArrayOperations, arrayoperations, MAC-APL-3_1, 1, APL/ArrayOperations/ArrayOperations.h,,)
-dnl lofar_INTERNAL(MAC/APL/VIC/ArrayReceptorGroup, arrayreceptorgroup, MAC-APL-3_1, 1, APL/ArrayReceptorGroup/ArrayReceptorGroup.h,,)
-dnl lofar_INTERNAL(MAC/APL/VIC/VirtualRoute, virtualroute, MAC-APL-4_0, 1, APL/VirtualRoute/VirtualRoute.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
+dnl lofar_INTERNAL(MAC/APL/VIC/ArrayOperations, arrayoperations, , 1, APL/ArrayOperations/ArrayOperations.h,,)
+dnl lofar_INTERNAL(MAC/APL/VIC/ArrayReceptorGroup, arrayreceptorgroup, , 1, APL/ArrayReceptorGroup/ArrayReceptorGroup.h,,)
+dnl lofar_INTERNAL(MAC/APL/VIC/VirtualRoute, virtualroute, , 1, APL/VirtualRoute/VirtualRoute.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/_VIC/VirtualRoute/configure.in b/MAC/APL/_VIC/VirtualRoute/configure.in
index caee23833aa..6fc372d4dbb 100644
--- a/MAC/APL/_VIC/VirtualRoute/configure.in
+++ b/MAC/APL/_VIC/VirtualRoute/configure.in
@@ -53,11 +53,11 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, , 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
diff --git a/MAC/APL/_VIC/VirtualRoute/include/APL/VirtualRoute/Makefile.am b/MAC/APL/_VIC/VirtualRoute/include/APL/VirtualRoute/Makefile.am
index f07d3786608..0020adfda40 100644
--- a/MAC/APL/_VIC/VirtualRoute/include/APL/VirtualRoute/Makefile.am
+++ b/MAC/APL/_VIC/VirtualRoute/include/APL/VirtualRoute/Makefile.am
@@ -1,18 +1,6 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/APL/VirtualRoute
pkginclude_HEADERS = \
VirtualRoute.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/Deployment/include/Deployment/Makefile.am b/MAC/Deployment/include/Deployment/Makefile.am
index e13bd5280b1..b74a5654ec0 100644
--- a/MAC/Deployment/include/Deployment/Makefile.am
+++ b/MAC/Deployment/include/Deployment/Makefile.am
@@ -1,11 +1,3 @@
INSTHDRS = StationInfo.h
-NOINSTHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/GCFCommon/include/GCF/Makefile.am b/MAC/GCF/GCFCommon/include/GCF/Makefile.am
index 27ac7c371cd..9b11ef2b00e 100644
--- a/MAC/GCF/GCFCommon/include/GCF/Makefile.am
+++ b/MAC/GCF/GCFCommon/include/GCF/Makefile.am
@@ -1,5 +1,3 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/GCF
pkginclude_HEADERS = \
GCF_PValue.h \
@@ -19,15 +17,5 @@ pkginclude_HEADERS = \
Thread.h \
Mutex.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am b/MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am
index 764c9fcbbb5..e1a99ad1717 100644
--- a/MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am
+++ b/MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am
@@ -1,17 +1,5 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/GCF/LogSys
pkginclude_HEADERS = GCF_KeyValueLogger.h \
CEPKeyValueLogger.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am b/MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am
index 6333a940dfd..1b9b1a7d534 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am
@@ -1,19 +1,7 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/GCF/PVSS
pkginclude_HEADERS = PVSSinfo.h \
PVSSresponse.h \
PVSSresult.h \
PVSSservice.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/TM/include/GCF/TM/Makefile.am b/MAC/GCF/TM/include/GCF/TM/Makefile.am
index 0bb34a6e9e5..16ebbb4aa25 100644
--- a/MAC/GCF/TM/include/GCF/TM/Makefile.am
+++ b/MAC/GCF/TM/include/GCF/TM/Makefile.am
@@ -1,5 +1,3 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/GCF/TM
pkginclude_HEADERS = \
GCF_Control.h \
@@ -18,15 +16,5 @@ pkginclude_HEADERS = \
GCF_TimerPort.h \
EventPort.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/Makefile.am b/MAC/GCF/_PAL/include/GCF/PAL/Makefile.am
index 2892237934d..151f5fc5be3 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/Makefile.am
+++ b/MAC/GCF/_PAL/include/GCF/PAL/Makefile.am
@@ -1,5 +1,3 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/GCF/PAL
pkginclude_HEADERS = \
GCF_Property.h \
@@ -15,15 +13,5 @@ pkginclude_HEADERS = \
GCF_PVSSPort.h \
GCF_PVSSInfo.h \
GCF_SysConnGuard.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PALlight/configure.in b/MAC/GCF/_PALlight/configure.in
index 05dfcedab14..1540956d6b2 100644
--- a/MAC/GCF/_PALlight/configure.in
+++ b/MAC/GCF/_PALlight/configure.in
@@ -37,12 +37,12 @@ dnl
dnl Check for LOFAR specific things
dnl
lofar_GENERAL
-lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_1, 1, Transport/DataHolder.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_2, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_2, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, MAC-GCF-6_2, 1, GCF/Protocols/PI_Protocol.ph,,)
-lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-6_2, 1, GCF/Protocols/DH_PIProtocol.h,,)
+lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Transport, transport, , 1, Transport/DataHolder.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, , 1, GCF/Protocols/PI_Protocol.ph,,)
+lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, , 1, GCF/Protocols/DH_PIProtocol.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/Makefile.am b/MAC/GCF/_PALlight/include/GCF/PALlight/Makefile.am
index f99ed69bc2b..aa7142faebb 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/Makefile.am
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/Makefile.am
@@ -1,5 +1,3 @@
-INSTHDRS =
-
pkgincludedir = $(includedir)/GCF/PALlight
pkginclude_HEADERS = \
GCF_RTMyProperty.h \
@@ -7,15 +5,5 @@ pkginclude_HEADERS = \
GCF_RTAnswer.h \
CEPProperty.h \
CEPPropertySet.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/GCF/CEP/configure.in b/MAC/Test/GCF/CEP/configure.in
index 506b9aeb3bc..a3fef47f43c 100644
--- a/MAC/Test/GCF/CEP/configure.in
+++ b/MAC/Test/GCF/CEP/configure.in
@@ -52,7 +52,7 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
#lofar_QT
-lofar_INTERNAL(MAC/GCF/PALlight, gcfceppallight, MAC-GCF-6_2, 1, GCF/PALlight/CEPProperty.h,,)
+lofar_INTERNAL(MAC/GCF/PALlight, gcfceppallight, , 1, GCF/PALlight/CEPProperty.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/Test/GCF/MAC/configure.in b/MAC/Test/GCF/MAC/configure.in
index e875164afba..db49bbde68f 100644
--- a/MAC/Test/GCF/MAC/configure.in
+++ b/MAC/Test/GCF/MAC/configure.in
@@ -53,9 +53,9 @@ dnl
lofar_GENERAL
#lofar_QT
lofar_PVSS(1)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_2, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, MAC-GCF-6_2, 1, GCF/PALlight/GCF_RTMyProperty.h,,)
-lofar_INTERNAL(MAC/GCF/LogSys, GCFKvlc, MAC-GCF-6_2, 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, , 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, , 1, GCF/PALlight/GCF_RTMyProperty.h,,)
+lofar_INTERNAL(MAC/GCF/LogSys, GCFKvlc, , 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
lofar_PACKAGE(MAC/Test/Suite)
lofar_PACKAGE(MAC/Test/GCF/RTC)
diff --git a/MAC/Test/GCF/RTC/configure.in b/MAC/Test/GCF/RTC/configure.in
index 31ff82bcb51..37c4e056732 100644
--- a/MAC/Test/GCF/RTC/configure.in
+++ b/MAC/Test/GCF/RTC/configure.in
@@ -52,7 +52,7 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
#lofar_QT
-lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, MAC-GCF-6_2, 1, GCF/PALlight/GCF_RTMyProperty.h,,)
+lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, , 1, GCF/PALlight/GCF_RTMyProperty.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/Test/Suite/include/Suite/Makefile.am b/MAC/Test/Suite/include/Suite/Makefile.am
index 4c748ce2155..15d391c2d2b 100644
--- a/MAC/Test/Suite/include/Suite/Makefile.am
+++ b/MAC/Test/Suite/include/Suite/Makefile.am
@@ -2,15 +2,5 @@ INSTHDRS = \
test.h \
suite.h
-NOINSTHDRS =
-
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/THEcho/configure.in b/MAC/Test/TestHarness/THEcho/configure.in
index 617dee47d14..2d5a9b9c56d 100644
--- a/MAC/Test/TestHarness/THEcho/configure.in
+++ b/MAC/Test/TestHarness/THEcho/configure.in
@@ -36,9 +36,9 @@ dnl
dnl Check for LOFAR specific things
dnl
lofar_GENERAL
-lofar_INTERNAL(LCS/Common, Common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_2, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_2, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
lofar_PACKAGE(MAC/Test/Suite)
diff --git a/MAC/Test/TestHarness/THPVSSBridge/configure.in b/MAC/Test/TestHarness/THPVSSBridge/configure.in
index 6b4c31a9bf9..cd9401085a4 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/configure.in
+++ b/MAC/Test/TestHarness/THPVSSBridge/configure.in
@@ -37,11 +37,11 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, Common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_2, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_2, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_2, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_3, 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
diff --git a/SAS/OTDB/include/OTDB/Makefile.am b/SAS/OTDB/include/OTDB/Makefile.am
index 9a296f1cde8..44d7b4f08b0 100644
--- a/SAS/OTDB/include/OTDB/Makefile.am
+++ b/SAS/OTDB/include/OTDB/Makefile.am
@@ -24,12 +24,4 @@ NOINSTHDRS = wSpaceSplit.h\
OTDBevent.h \
OTDBeventList.h
-TCCHDRS =
-
-nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
include $(top_srcdir)/Makefile.common
--
GitLab