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 cc59db7d99da37e776105e699b48a84c78e9a01c..e2822dd7b85a3637a51b3cb4781e25486667710e 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 2ecb04d72f41b4811c617a8add5bb75e8493f5cd..f9e663e64c05a9761ed378b00ef3835ca768680f 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 70620fc35a87e60380cd12da79bf5293c15936b3..e2822dd7b85a3637a51b3cb4781e25486667710e 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 f518179b7212f2e00214cc5bf72f4b2424ac73fb..a130668deb2abce242ac76df3c320f6c9a9e1e0b 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 607889cd4de7d446c16e1fa20156df02a3b67741..0cef4659d8938ef02eaa5c381b3f3a7c3fc4d026 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 6b7ede8bc4c3a1b5ce48de783c19c5c01802ee11..c27ddca03876633859d96e1af6ea02a6170fe4f3 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 96bc21de2291545055968848da1607e590cf9bfe..cf63d2e04e2436e4148183df795f4653a46968b3 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 052f7e090fe053f9b2afe1cc3ccc26aee130fa0e..1412590750326d5e13a308891b7a9497f0745e22 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 feddac6188a137eb1ef1ef058d609e148d2d50c0..d3de1480cbed7e448c66f8d1ebb6ad57dd702a3c 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 703d5527caf2ec4d2bd43188abf820a46b1abd27..f1d450baf7f09fabaa27e98d7e8bae76acdf9aec 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 0583d2d3fec6b821c7aa1920ca9b35b90548cefd..09c6a563b27f065acbb4546beb93683e37d90c01 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 fd4e6d13b66c4ec4f9105e28fba7929d3eef21b1..a9d8df85c170abfbf043a41bfac5416b0e79625a 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 0ddce11f6b1704069fc835db36bd8a3ef8d4b263..41281b83200ffbefaae133bbfecf3d7579716e4a 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 b1165620f0c73739b248ee15d42da2c7b47cbeb5..49f90e1c6246b0126cc444d4d69c89465ba15d6e 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 c54e49cfb6565d3db11ce6bb09d5af6bf8feae79..53180cb10cf26e5b259c9e20817c42426e281d75 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 9a901160335ea5a1903e26a8c13a15c6b6ed8fd9..5305b65232aeadf33aca2221f6b87390f0889533 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 146618685cb6fb2a09927281669bc443f4222194..5ff243d3b4c1b9b9354ec5748f5f911d3955ce9a 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 4c2a8b032bbf415cad5565b719469221660c4c05..d114876d7caa946381a3baf46f75d0fa011bc7c5 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 2f7d681e406d815e5fb2c78e6f126fb73a01d084..91c6fed6ab399d3b0a09d1204a5261263fd46fb7 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 188d7bb08f37f106572d461099a0426f68c842da..5dbf523f9e0b8e7d3a7c4ef552c509bd5d839231 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 5d627b45b5af62495718a0b6a216cd5349fcb44a..ce99ee8f3790ec4d946cfdfb1eee94338d3dcc3b 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 a0711efe694e1d930072cc5656e31c36a5232994..b8f40250e1bc1f2eb76d57f2bec5e8eb1b74af8a 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 860157d8d1206e62642aca2dc0ceefd8e5dab21c..57afa7fb4526e03879f2f5477d3c973c8185e9a6 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 07749f08d04accb1ef75fb64a9c4d4d1e2fbd476..46a8ea86d6bf85a8a17a0b87e0fd114d086330b4 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 cc59db7d99da37e776105e699b48a84c78e9a01c..db5d3ab761c008b979ba8c4852251938b45f42a1 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 46528b490d6ea4642c7695a92493b4c6294fd0f5..915df48d0b63169a75f71ff9e32a7e9b18446111 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 3ac7396a1d68abd3f61f8dfaac4a565c2f892ba5..4778aa50c6b138f0a5ca95c7dc27384f27cb3890 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 627707341804dca40fbe7c5334eed1a0390ea03f..fb1928fd4643ad80cc336f85c0d6877ab6847c2c 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 26a8522d17b209471884502382453f6c8dee4abd..2d1cb71c5a4dab46b752c27ec658dce4b08d19d0 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 52e94243681af38c908edae78ec5ab615cf6d7f8..d49d8dcf116a6f0b391b7609d344eede868a11df 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 a7863bf74af80c928e4140bc2acc506c9a3eead2..f868518b96d8eb10aa5ee3bf1e01a081280681bd 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 26208e15d24113f5019b29f3c5771ee646289dd4..2c885fcac79711bfe6798a1f7f3ab682dd3e7b78 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 caee23833aac59b67e35b0740abc991c89aaeb1a..6fc372d4dbb6823bcc6544c7578c45ef5ca28bb5 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 f07d37866085f993da89afcfd65f5f06dfd68ae6..0020adfda40a6f29d9aa5072bf96e7cc7aaf28a8 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 e13bd5280b19c401ebe8273c0952e01cb8c3bca2..b74a5654ec0aebe2105bd28f8c42aef18143fd86 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 27ac7c371cde22db90ea5b25469ec3cd9fd5536c..9b11ef2b00e14c4a67db4fb974a58178b88e40cb 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 764c9fcbbb5724b85f7e5426ab5a43b1d7417cdd..e1a99ad17176631a310ce3d1400a46c03b4e929b 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 6333a940dfdf7755686323830e99bc043adf901c..1b9b1a7d5345d6d2f5bebf458b9902fd7da770e8 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 0bb34a6e9e5c4667e37b0af176d9404dc5639cfb..16ebbb4aa25a9409a22e297c027c4e6dd62d3dea 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 2892237934d060278c9adf8deb4a147c73766343..151f5fc5be388c48acade453f3a44709d557ff11 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 05dfcedab1446ff0828c9f340215585d80a20991..1540956d6b2d7c421d9d984c2f69e14e5f3daa30 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 f99ed69bc2bb9bc90a3ea9461b7ea62898059fc5..aa7142faebbf88e7f257755d70989679eb5fe1de 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 506b9aeb3bcf7b5c27ab38717a8bab3dd10fbdeb..a3fef47f43c47f32bda84cc113366a67ef63bf97 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 e875164afba9356c00099e08dfeadd330ce99fe2..db49bbde68f792203210d03d944c2b9aebbb9cb2 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 31ff82bcb5111c92c1f1bf06c8f2d15b3cd2587b..37c4e05673284e29abf31da05c04ada4d8e94434 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 4c748ce2155c844692fb05779fb3b32e8e0aed24..15d391c2d2bf08956826b0f8591bedddbc8988f8 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 617dee47d14bcf87199abb7d6fb69578328ec84f..2d5a9b9c56d52b4a179e7fc92daee9fd53488180 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 6b4c31a9bf946d6890c271b0fe654764e3be3d29..cd9401085a41a61c9a0c1fd26bae58adacc82082 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 9a296f1cde8951992b6c0eddca15027529c67273..44d7b4f08b080055a6379e1e0a7daa0718b793a8 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