Skip to content
Snippets Groups Projects
Commit 083af4cc authored by Alexander Mueller's avatar Alexander Mueller
Browse files

BugID: 330 

Make alle configure.in and lofarconf.in files 'rub' proof.
parent ce7fcd35
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 111 additions and 131 deletions
MAC/APL/APLCommon/configure.in
+ 7
− 8
View file @ 083af4cc
...@@ -55,15 +55,14 @@ lofar_CHECK_PRETTY_FUNCTION ...@@ -55,15 +55,14 @@ lofar_CHECK_PRETTY_FUNCTION
lofar_QATOOLS lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
#lofar_MPI(0)
lofar_PVSS(1) lofar_PVSS(1)
lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(LCS/ACC/APS,ACC/APS,,1,APS/ParameterSet.h,,) lofar_INTERNAL(LCS/ACC/APS, APS, LCS-ACC-2_0, 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(LCS/Common,GCFCommon,,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/GCF/PAL,GCFPAL,,1,GCF/PAL/GCF_Property.h,,) lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_LOG4CPLUS
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"") lofar_EXTERNAL(boost, 1, boost/shared_ptr.hpp, "")
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/BeamServer/configure.in
+ 8
− 8
View file @ 083af4cc
...@@ -63,14 +63,14 @@ lofar_QATOOLS ...@@ -63,14 +63,14 @@ lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/suite.h,,) lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/suite.h,,)
lofar_INTERNAL(MAC/APL/PAC/RSPDriver,rsp,,1,RSP_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_INTERNAL(MAC/APL/PAC/Calibration, cal,,1,CAL_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/Calibration, cal, MAC-RTC-4_0, 1, CAL_Protocol.ph,,)
lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/EarthCoord.h,,) lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,)
lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_LOG4CPLUS
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl dnl
......
MAC/APL/PAC/CalServer/configure.in
+ 11
− 13
View file @ 083af4cc
...@@ -55,20 +55,18 @@ lofar_QATOOLS ...@@ -55,20 +55,18 @@ lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
dnl lofar_AIPSPP(1) lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,)
lofar_EXTERNAL(AMCBase,1,AMCBase/EarthCoord.h,,)
dnl lofar_EXTERNAL(AMCImpl,1,AMCImpl/ConverterImpl.h,,)
lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/suite.h,,) lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/suite.h,,)
lofar_INTERNAL(MAC/APL/PAC/RSPDriver,rsp,,1,RSP_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
lofar_EXTERNAL(g2c,1,,"","/usr/lib",,,,"-lg2c") lofar_EXTERNAL(g2c, 1,, "", "/usr/lib",,,, "-lg2c")
lofar_EXTERNAL(cpplapack,1,cpplapack.h,"","/usr/local/lib/+pkg",,,,"-llapack -lblas -lm") lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm")
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_LOG4CPLUS
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/Calibration/configure.in
+ 11
− 13
View file @ 083af4cc
...@@ -55,20 +55,18 @@ lofar_QATOOLS ...@@ -55,20 +55,18 @@ lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
dnl lofar_AIPSPP(1) lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,)
lofar_EXTERNAL(AMCBase,1,AMCBase/EarthCoord.h,,)
dnl lofar_EXTERNAL(AMCImpl,1,AMCImpl/ConverterImpl.h,,)
lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/suite.h,,) lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/suite.h,,)
lofar_INTERNAL(MAC/APL/PAC/RSPDriver,rsp,,1,RSP_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
lofar_EXTERNAL(g2c,1,,"","/usr/lib",,,,"-lg2c") lofar_EXTERNAL(g2c, 1,, "", "/usr/lib",,,, "-lg2c")
lofar_EXTERNAL(cpplapack,1,cpplapack.h,"","/usr/local/lib/+pkg",,,,"-llapack -lblas -lm") lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm")
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_LOG4CPLUS
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/RSPDriver/configure.in
+ 6
− 8
View file @ 083af4cc
...@@ -94,14 +94,12 @@ AC_PROG_RANLIB ...@@ -94,14 +94,12 @@ AC_PROG_RANLIB
dnl wanted by: src/CaptureStats.cc:874 dnl wanted by: src/CaptureStats.cc:874
AC_STRUCT_TM AC_STRUCT_TM
dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,) lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/test.h,,)
lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/test.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/GCF/TM,GCFTM,,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/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,) lofar_LOG4CPLUS
lofar_INTERNAL(MAC/APL/PAC/RSPDriver/src/rspctlfe,rspfe,,1,RSPFE_Protocol.ph,,)
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl PPS_API needed by RSPDriver dnl PPS_API needed by RSPDriver
......
MAC/APL/PAC/RSPDriver/src/rspctlfe/configure.in
+ 6
− 7
View file @ 083af4cc
...@@ -70,13 +70,12 @@ lofar_DOCXX ...@@ -70,13 +70,12 @@ lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
lofar_PVSS(1) lofar_PVSS(1)
dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,) lofar_LOG4CPLUS
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_EXTERNAL(common,1,Common/LofarTypes.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Answer.h,,)
lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Answer.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
lofar_EXTERNAL(RTCCommon,1,Marshalling.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/_StationOperations/configure.in
+ 7
− 9
View file @ 083af4cc
...@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things ...@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things
dnl dnl
lofar_DEBUG_OPTIMIZE lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION lofar_CHECK_PRETTY_FUNCTION
#lofar_QT
lofar_QATOOLS lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
#lofar_MPI(0)
lofar_PVSS(1) lofar_PVSS(1)
lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_LOG4CPLUS
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"") lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,) lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
#lofar_EXTERNAL(GCFPALlight,1,GCF/PALlight/GCF_RTMyProperty.h,,) lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/_StationReceptorGroup/configure.in
+ 7
− 9
View file @ 083af4cc
...@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things ...@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things
dnl dnl
lofar_DEBUG_OPTIMIZE lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION lofar_CHECK_PRETTY_FUNCTION
#lofar_QT
lofar_QATOOLS lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
#lofar_MPI(0)
lofar_PVSS(1) lofar_PVSS(1)
lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_LOG4CPLUS
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"") lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,) lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
#lofar_EXTERNAL(GCFPALlight,1,GCF/PALlight/GCF_RTMyProperty.h,,) lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/_StationStartDaemon/configure.in
+ 8
− 9
View file @ 083af4cc
...@@ -52,24 +52,23 @@ dnl Check for LOFAR specific things ...@@ -52,24 +52,23 @@ dnl Check for LOFAR specific things
dnl dnl
lofar_DEBUG_OPTIMIZE lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION lofar_CHECK_PRETTY_FUNCTION
#lofar_QT
lofar_QATOOLS lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
#lofar_MPI(0)
lofar_LOG4CPLUS lofar_LOG4CPLUS
lofar_PVSS(1) lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,) 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/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/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/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,) lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0, 1, RSP_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0, 1, BS_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-RTC-4_0, 1, BS_Protocol.ph,,)
lofar_INTERNAL(MAC/APL/PAC/Calibration, caldevel, MAC-APL-3_0, 1, CAL_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/Calibration, caldevel, MAC-RTC-4_0, 1, CAL_Protocol.ph,,)
lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, MAC-APL-3_0, 1, StationOperations/StationOperations.h,,) lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, MAC-APL-3_1, 1, StationOperations/StationOperations.h,,)
lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, MAC-APL-3_0, 1, StationReceptorGroup/StationReceptorGroup.h,,) lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, MAC-APL-3_1, 1, StationReceptorGroup/StationReceptorGroup.h,,)
lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, MAC-APL-3_0, 1, VirtualTelescope/VirtualTelescope.h,,) lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, MAC-APL-3_1, 1, VirtualTelescope/VirtualTelescope.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/_VirtualBackend/configure.in
+ 3
− 3
View file @ 083af4cc
...@@ -38,7 +38,7 @@ dnl ...@@ -38,7 +38,7 @@ dnl
dnl Check for LOFAR specific things dnl Check for LOFAR specific things
dnl dnl
lofar_DEBUG_OPTIMIZE lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION lofar_CHECK_PRETTY_FUNCTIOND
lofar_QATOOLS lofar_QATOOLS
lofar_LOG4CPLUS lofar_LOG4CPLUS
lofar_DOCXX lofar_DOCXX
...@@ -48,8 +48,8 @@ lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,, ...@@ -48,8 +48,8 @@ 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/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/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_EXTERNAL(boost, 1, boost/shared_ptr.hpp, "") lofar_EXTERNAL(boost, 1, boost/shared_ptr.hpp, "")
lofar_INTERNAL(MAC/APL/APLCommon,aplcommon, MAC-APL-3_1devel1, 1, APLCommon/APL_Defines.h,,) lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_INTERNAL(MAC/APL/PIC/NodeManager, nm, MAC-APL-3_1devel1, 1, APL/NodeManager.h,,) lofar_INTERNAL(MAC/APL/PIC/NodeManager, nm, MAC-APL-3_1, 1, APL/NodeManager.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/_VirtualTelescope/configure.in
+ 4
− 4
View file @ 083af4cc
...@@ -61,10 +61,10 @@ lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,) ...@@ -61,10 +61,10 @@ 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/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/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/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,) lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0, 1, RSP_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_INTERNAL(MAC/APL/PAC/RSPDriver, epa, MAC-APL-3_0, 1, EPA_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/RSPDriver, epa, MAC-RTC-4_0, 1, EPA_Protocol.ph,,)
lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0, 1, BS_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-RTC-4_0, 1, BS_Protocol.ph,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PAC/lofarconf.in
+ 1
− 1
View file @ 083af4cc
...@@ -5,5 +5,5 @@ BeamServer ...@@ -5,5 +5,5 @@ BeamServer
StationOperations StationOperations
StationReceptorGroup StationReceptorGroup
VirtualTelescope VirtualTelescope
VirtualBackend
StationStartDaemon StationStartDaemon
VirtualBackend
MAC/APL/PIC/MIS/configure.in
+ 1
− 2
View file @ 083af4cc
...@@ -38,7 +38,6 @@ dnl ...@@ -38,7 +38,6 @@ dnl
dnl Check for LOFAR specific things dnl Check for LOFAR specific things
dnl dnl
lofar_DEBUG_OPTIMIZE lofar_DEBUG_OPTIMIZE
#lofar_QT
lofar_QATOOLS lofar_QATOOLS
lofar_LOG4CPLUS lofar_LOG4CPLUS
lofar_DOCXX lofar_DOCXX
...@@ -49,7 +48,7 @@ lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,) ...@@ -49,7 +48,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/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_INTERNAL(MAC/GCF/LogSys, gcfkvlc, MAC-GCF-6_0, 1, GCF/LogSys/GCF_KeyValueLogger.h,,) lofar_INTERNAL(MAC/GCF/LogSys, gcfkvlc, MAC-GCF-6_0, 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
lofar_INTERNAL(MAC/APL/RTCCommon, rtccommon, MAC-RTC-4_0, 1, Timestamp.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, rtccommon, MAC-RTC-4_0, 1, Timestamp.h,,)
lofar_INTERNAL(MAC/APL/PAC/RSP, rsp, HEAD, 1, RSP_Protocol.ph,,) lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl dnl
......
MAC/APL/PIC/MIS/src/MACInformationServer.conf.in
+ 3
− 3
View file @ 083af4cc
mac.ns.APL-MISD.server.type=TCP mac.ns.APL-MISD.server.type=TCP
mac.ns.APL-MISD.server.port=27010 mac.ns.APL-MISD.server.port=27009
mac.top.APL-MIS.client.remoteservice=APL-MISD:server mac.top.APL-MIS.client.remoteservice=APL-MISD:server
#mac.top.APL-MISS.rspclient.remoteservice=RSPDriver:acceptor mac.top.APL-MISS.rspclient.remoteservice=RSPDriver:acceptor_v2
mac.top.APL-MISS.rspclient.remoteservice=ARATestDriver:ARAtestRSPserver #mac.top.APL-MISS.rspclient.remoteservice=ARATestDriver:ARAtestRSPserver
\ No newline at end of file
MAC/APL/PIC/MIS/src/MISSession.cc
+ 1
− 1
View file @ 083af4cc
...@@ -326,7 +326,7 @@ GCFEvent::TResult MISSession::setDiagnosis_state(GCFEvent& e, GCFPortInterface& ...@@ -326,7 +326,7 @@ GCFEvent::TResult MISSession::setDiagnosis_state(GCFEvent& e, GCFPortInterface&
_propertyProxy.setPropValue(resourceStatusPropName, resourceState); _propertyProxy.setPropValue(resourceStatusPropName, resourceState);
if (resourceStatusPropName.find(":") == string::npos) if (resourceStatusPropName.find(":") == string::npos)
{ {
resourceStatusPropName = GCFPVSSInfo::getLocalSystemName() + resourceStatusPropName; resourceStatusPropName = GCFPVSSInfo::getLocalSystemName() + string(":") + resourceStatusPropName;
} }
timeval ts = {pIn->timestamp_sec, pIn->timestamp_nsec / 1000}; timeval ts = {pIn->timestamp_sec, pIn->timestamp_nsec / 1000};
string descr(formatString ( string descr(formatString (
......
MAC/APL/PIC/RSPCtlFE/configure.in
+ 6
− 7
View file @ 083af4cc
...@@ -70,13 +70,12 @@ lofar_DOCXX ...@@ -70,13 +70,12 @@ lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
lofar_PVSS(1) lofar_PVSS(1)
dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,) lofar_LOG4CPLUS
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_EXTERNAL(common,1,Common/LofarTypes.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Answer.h,,)
lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Answer.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
lofar_EXTERNAL(RTCCommon,1,Marshalling.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PIC/RSPDriver/configure.in
+ 6
− 8
View file @ 083af4cc
...@@ -94,14 +94,12 @@ AC_PROG_RANLIB ...@@ -94,14 +94,12 @@ AC_PROG_RANLIB
dnl wanted by: src/CaptureStats.cc:874 dnl wanted by: src/CaptureStats.cc:874
AC_STRUCT_TM AC_STRUCT_TM
dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,) lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/test.h,,)
lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/test.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/GCF/TM,GCFTM,,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/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,) lofar_LOG4CPLUS
lofar_INTERNAL(MAC/APL/PAC/RSPDriver/src/rspctlfe,rspfe,,1,RSPFE_Protocol.ph,,)
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl PPS_API needed by RSPDriver dnl PPS_API needed by RSPDriver
......
MAC/APL/PIC/RSPDriver/src/rspctlfe/configure.in
+ 6
− 7
View file @ 083af4cc
...@@ -70,13 +70,12 @@ lofar_DOCXX ...@@ -70,13 +70,12 @@ lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
lofar_PVSS(1) lofar_PVSS(1)
dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,) lofar_LOG4CPLUS
lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_EXTERNAL(common,1,Common/LofarTypes.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,) lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Answer.h,,)
lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Answer.h,,) lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,) lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
lofar_EXTERNAL(RTCCommon,1,Marshalling.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
MAC/APL/PIC/_NodeManager/configure.in
+ 0
− 1
View file @ 083af4cc
...@@ -38,7 +38,6 @@ dnl ...@@ -38,7 +38,6 @@ dnl
dnl Check for LOFAR specific things dnl Check for LOFAR specific things
dnl dnl
lofar_DEBUG_OPTIMIZE lofar_DEBUG_OPTIMIZE
#lofar_QT
lofar_QATOOLS lofar_QATOOLS
lofar_LOG4CPLUS lofar_LOG4CPLUS
lofar_DOCXX lofar_DOCXX
......
MAC/APL/PIC/_RegisterAccess/configure.in
+ 9
− 10
View file @ 083af4cc
...@@ -52,22 +52,21 @@ dnl Check for LOFAR specific things ...@@ -52,22 +52,21 @@ dnl Check for LOFAR specific things
dnl dnl
lofar_DEBUG_OPTIMIZE lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION lofar_CHECK_PRETTY_FUNCTION
#lofar_QT
lofar_QATOOLS lofar_QATOOLS
lofar_DOCXX lofar_DOCXX
lofar_COMPILETOOLS lofar_COMPILETOOLS
#lofar_MPI(0)
lofar_PVSS(1) lofar_PVSS(1)
lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
lofar_LOG4CPLUS lofar_LOG4CPLUS
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/test.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, APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm) lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
lofar_EXTERNAL(rsp,1,RSP_Protocol.ph,,) lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
lofar_EXTERNAL(suite,1,Suite/test.h,,)
lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,)
lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
dnl dnl
dnl Output Makefiles dnl Output Makefiles
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment