BugID: 368

CAL_Protocol and BS_Protocol relocated

MAC/APL/PAC/_StationReceptorGroup/configure.in

@@ -58,7 +58,7 @@ 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/CalServer, cal, MAC-RTC-4_0, 1, CAL_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, HEAD,1, APL/CAL_Protocol/CAL_Protocol.ph,,)
 lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
 
 dnl

MAC/APL/PAC/_StationReceptorGroup/src/StationReceptorGroup.cc

@@ -32,7 +32,7 @@
 #include <APL/APLCommon/APLUtilities.h>
 #include <APL/StationReceptorGroup/StationReceptorGroup.h>
 #include <GCF/ParameterSet.h>
-#include "CAL_Protocol.ph"
+#include <APL/CAL_Protocol/CAL_Protocol.ph>
 
 using namespace LOFAR::GCF::Common;
 using namespace LOFAR::GCF::TM;

MAC/APL/PAC/_StationStartDaemon/configure.in

@@ -62,6 +62,7 @@ lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APL/APLCommon/APL_D
 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,,)
 
 dnl
 dnl Output Makefiles

MAC/APL/PAC/_VirtualTelescope/configure.in

@@ -59,7 +59,7 @@ 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/BeamServer, absdevel, MAC-RTC-4_0, 1, BS_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/BS_Protocol, BS_Protocol, HEAD,1, APL/BS_Protocol/BS_Protocol.ph,,)
 
 dnl
 dnl Output Makefiles

MAC/APL/PAC/_VirtualTelescope/src/VirtualTelescope.cc

@@ -31,7 +31,7 @@
 #include <GCF/ParameterSet.h>
 #include <APL/APLCommon/APLUtilities.h>
 #include <APL/VirtualTelescope/VirtualTelescope.h>
-#include "BS_Protocol.ph"
+#include <APL/BS_Protocol/BS_Protocol.ph>
 
 using namespace LOFAR::GCF::Common;
 using namespace LOFAR::GCF::TM;