Bug 835: Fixing the last loose ends w.r.t. the code reorganization (rf. bug

#1296, #1297, #1298, #1300).

.gitignore

@@ -230,6 +230,24 @@ MAC/Test/TestHarness/THPVSSBridge/lofarconf
 MAC/Test/TestHarness/TSE/Makefile.common
 MAC/Test/TestHarness/TSE/autoconf_share
 MAC/Test/TestHarness/TSE/lofarconf
+RTCP/CNProc/Makefile.common
+RTCP/CNProc/autoconf_share
+RTCP/CNProc/lofarconf
+RTCP/IONProc/Makefile.common
+RTCP/IONProc/autoconf_share
+RTCP/IONProc/lofarconf
+RTCP/Interface/Makefile.common
+RTCP/Interface/autoconf_share
+RTCP/Interface/lofarconf
+RTCP/RTCPTools/Makefile.common
+RTCP/RTCPTools/autoconf_share
+RTCP/RTCPTools/lofarconf
+RTCP/Run/Makefile.common
+RTCP/Run/autoconf_share
+RTCP/Run/lofarconf
+RTCP/Storage/Makefile.common
+RTCP/Storage/autoconf_share
+RTCP/Storage/lofarconf
 SAS/OTB/MoM-OTDB-adapter/bin
 SAS/OTB/MoM-OTDB-adapter/dist/tasks
 SAS/OTB/MoM-OTDB-adapter/tasks

CEP/Imager/MWControl/configure.in

@@ -52,7 +52,7 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 lofar_INTERNAL(CEP/Imager/MWCommon,MWCommon,,1,MWCommon/MWConnection.h,,)
-lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Prediffer.h,,)
+lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Types.h,,)
 lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
 
 dnl

MAC/APL/CEPCU/configure.in

@@ -57,7 +57,7 @@ lofar_COMPILETOOLS
 lofar_PVSS(1)
 lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(Appl/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
+lofar_INTERNAL(LCS/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
 lofar_INTERNAL(LCS/ACC/ALC, ALC,, 1, ALC/ApplControl.h,,)
 lofar_INTERNAL(LCS/ACC/PLC, PLC,, 1, PLC/PCCmd.h,,)
 dnl lofar_INTERNAL(SAS/OTDB, OTDB, , 1, OTDB/OTDBconnection.h,,)

MAC/APL/MainCU/configure.in

@@ -63,7 +63,7 @@ lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
 lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
 lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
 lofar_INTERNAL(MAC/APL/RTDBCommon, RTDBCommon, , 1, APL/RTDBCommon/RTDButilities.h,,)
-lofar_INTERNAL(Appl/ApplCommon, ApplCommon, , 1, ApplCommon/Observation.h,,)
+lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/Observation.h,,)
 lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
 lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
 lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)

MAC/APL/StationCU/configure.in

@@ -58,7 +58,7 @@ lofar_PVSS(1)
 lofar_BLITZ
 lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(Appl/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
+lofar_INTERNAL(LCS/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
 dnl lofar_INTERNAL(SAS/OTDB, OTDB,, 1, OTDB/OTDBconnection.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
 lofar_INTERNAL(MAC/GCF/TM, GCFTM,, 1, GCF/TM/GCF_Task.h,,)

RTCP/Run/bootstrap

 #!/bin/sh
 
-../autoconf_share/bootstrap ../autoconf_share
+../../autoconf_share/bootstrap ../../autoconf_share

RTCP/Run/src/Makefile.am

@@ -34,7 +34,7 @@ dist_python_SCRIPTS = 	\
 			LOFAR_Jobs.py \
 			CS1_RSPCtl.py \
 			CS1_Run.py \
-			CS1_Sections.py \
+			CS1_Sections.py
 
 scriptdir = $(bindir)
 dist_script_SCRIPTS = 

SAS/lofarconf.in

+OTDB

SubSystems/Offline/lofarconf.in

-/CEP/BB/BBSControl
-/CEP/BB/pyparmdb
-/CEP/BB/MWImager
-/Appl/CEP/CS1/CS1_pp_lib
+/CEP/Calibration/BBSControl
+/CEP/pyparmdb
+/CEP/Imager/MWImager
+/CEP/DP3/CS1_pp_lib

SubSystems/lofarconf.in

+CEPCU_MAC
+LCU_MAC
+MCU_MAC
+Offline