From 4efb50e270c1c4793a22b986e838ab0a6421dbb9 Mon Sep 17 00:00:00 2001 From: wierenga <sdos@astron.nl> Date: Thu, 9 Mar 2006 15:03:33 +0000 Subject: [PATCH] BugID: 668 Used MAC-RTC-6_0devel1 version of RTCCommon --- MAC/APL/PAC/BS_Protocol/configure.in | 2 +- MAC/APL/PAC/BeamServer/configure.in | 2 +- MAC/APL/PAC/CAL_Protocol/configure.in | 2 +- MAC/APL/PAC/CalServer/configure.in | 2 +- MAC/APL/PIC/RSPCtlFE/configure.in | 2 +- MAC/APL/PIC/RSPDriver/configure.in | 2 +- MAC/APL/PIC/RSP_Protocol/configure.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MAC/APL/PAC/BS_Protocol/configure.in b/MAC/APL/PAC/BS_Protocol/configure.in index f5399656ad0..c26d42ca980 100644 --- a/MAC/APL/PAC/BS_Protocol/configure.in +++ b/MAC/APL/PAC/BS_Protocol/configure.in @@ -57,7 +57,7 @@ lofar_INTERNAL(LCS/Common, common, LCS-Common-3_0, 1, Common/LofarTypes.h,,) lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, , 1, AMCBase/EarthCoord.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.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, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) diff --git a/MAC/APL/PAC/BeamServer/configure.in b/MAC/APL/PAC/BeamServer/configure.in index 5a434114708..ad2fe42980a 100644 --- a/MAC/APL/PAC/BeamServer/configure.in +++ b/MAC/APL/PAC/BeamServer/configure.in @@ -70,7 +70,7 @@ lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,) dnl lofar_INTERNAL(LCS/AMC/AMCImpl,AMCImpl, LCS-AMC-1_0, 1, AMCImpl/ConverterImpl.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, HEAD, 1, APL/RTCCommon/Marshalling.h,,) +lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-6_0devel1, 1, APL/RTCCommon/Marshalling.h,,) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) dnl diff --git a/MAC/APL/PAC/CAL_Protocol/configure.in b/MAC/APL/PAC/CAL_Protocol/configure.in index 8dae0a1e73b..f47e6200507 100644 --- a/MAC/APL/PAC/CAL_Protocol/configure.in +++ b/MAC/APL/PAC/CAL_Protocol/configure.in @@ -54,7 +54,7 @@ lofar_GENERAL 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/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.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, , 1, APL/RSP_Protocol/RCUSettings.h,,) lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm) diff --git a/MAC/APL/PAC/CalServer/configure.in b/MAC/APL/PAC/CalServer/configure.in index ae5240021af..7f159736261 100644 --- a/MAC/APL/PAC/CalServer/configure.in +++ b/MAC/APL/PAC/CalServer/configure.in @@ -60,7 +60,7 @@ lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_1rc2, 1, Suite/suite.h,,) lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,) +lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-6_0devel1, 1, APL/RTCCommon/Marshalling.h,,) lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/SubArray.h,,) lofar_EXTERNAL(g2c, 1,, "", "/usr/local/g2c",,,, "-lg2c") lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm") diff --git a/MAC/APL/PIC/RSPCtlFE/configure.in b/MAC/APL/PIC/RSPCtlFE/configure.in index 25751f1ae18..f9dd11e2269 100755 --- a/MAC/APL/PIC/RSPCtlFE/configure.in +++ b/MAC/APL/PIC/RSPCtlFE/configure.in @@ -58,7 +58,7 @@ 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, HEAD, 1, APL/RTCCommon/Marshalling.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,HEAD,1, APL/RSP_Protocol/RSP_Protocol.ph,,) dnl diff --git a/MAC/APL/PIC/RSPDriver/configure.in b/MAC/APL/PIC/RSPDriver/configure.in index 2477240b063..be3e219571d 100644 --- a/MAC/APL/PIC/RSPDriver/configure.in +++ b/MAC/APL/PIC/RSPDriver/configure.in @@ -91,7 +91,7 @@ lofar_INTERNAL(LCS/Common, common, LCS-Common-3_0, 1, Common/LofarTypes.h,,) lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_1rc2, 1, Suite/test.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.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, ,1, APL/RSP_Protocol/RSP_Protocol.ph,,) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) diff --git a/MAC/APL/PIC/RSP_Protocol/configure.in b/MAC/APL/PIC/RSP_Protocol/configure.in index 0c93443bbb1..33ef59f9c40 100644 --- a/MAC/APL/PIC/RSP_Protocol/configure.in +++ b/MAC/APL/PIC/RSP_Protocol/configure.in @@ -55,7 +55,7 @@ lofar_BLITZ dnl lofar_MPI 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/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,) +lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-6_0devel1, 1, APL/RTCCommon/Marshalling.h,,) dnl dnl Output Makefiles -- GitLab