diff --git a/.gitattributes b/.gitattributes
index 2f6e8cd9c0eb51b54f74df792db95bd44c1a121f..c8cd4eafe0936251b5383bd8298894d07fc50332 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -313,10 +313,6 @@ CEP/DP3/AOFlagger/src/util/rng.cpp -text
 CEP/DP3/AOFlagger/src/util/roctree.cpp -text
 CEP/DP3/AOFlagger/src/util/statwriter.cpp -text
 CEP/DP3/AOFlagger/src/util/stopwatch.cpp -text
-CEP/DP3/DPPP/DPPP.spec.in -text
-CEP/DP3/DPPP/Makefile.am -text
-CEP/DP3/DPPP/bootstrap -text
-CEP/DP3/DPPP/configure.in -text
 CEP/DP3/DPPP/include/DPPP/BandpassCorrector.h -text
 CEP/DP3/DPPP/include/DPPP/ComplexMedianFlagger.h -text
 CEP/DP3/DPPP/include/DPPP/ComplexMedianFlagger2.h -text
@@ -325,12 +321,10 @@ CEP/DP3/DPPP/include/DPPP/DataSquasher.h -text
 CEP/DP3/DPPP/include/DPPP/Flagger.h -text
 CEP/DP3/DPPP/include/DPPP/FrequencyFlagger.h -text
 CEP/DP3/DPPP/include/DPPP/MADFlagger.h -text
-CEP/DP3/DPPP/include/DPPP/Makefile.am -text
 CEP/DP3/DPPP/include/DPPP/MsFile.h -text
 CEP/DP3/DPPP/include/DPPP/Pipeline.h -text
 CEP/DP3/DPPP/include/DPPP/PipelineProcessControl.h -text
 CEP/DP3/DPPP/include/DPPP/RunDetails.h -text
-CEP/DP3/DPPP/include/Makefile.am -text
 CEP/DP3/DPPP/package.dox -text
 CEP/DP3/DPPP/src/BandpassCorrector.cc -text
 CEP/DP3/DPPP/src/ComplexMedianFlagger.cc -text
@@ -340,7 +334,6 @@ CEP/DP3/DPPP/src/DataSquasher.cc -text
 CEP/DP3/DPPP/src/FrequencyFlagger.cc -text
 CEP/DP3/DPPP/src/IDPPP.cc -text
 CEP/DP3/DPPP/src/MADFlagger.cc -text
-CEP/DP3/DPPP/src/Makefile.am -text
 CEP/DP3/DPPP/src/MsFile.cc -text
 CEP/DP3/DPPP/src/Pipeline.cc -text
 CEP/DP3/DPPP/src/PipelineProcessControl.cc -text
@@ -350,15 +343,12 @@ CEP/DP3/DPPP/src/mwflagger-part -text
 CEP/DP3/DPPP/src/taqlflagger -text
 CEP/DP3/DPPP/test/CS1_IDPPP.log_prop -text
 CEP/DP3/DPPP/test/CS1_IDPPP.parset -text
-CEP/DP3/DPPP/test/Makefile.am -text
 CEP/DP3/DPPP/test/tNDPPP.in_MS.tgz -text svneol=unset#application/x-compressed-tar
 CEP/DP3/DPPP/test/tmwflagger.in_cd -text
 CEP/DP3/DPPP/test/tmwflagger.in_vd -text
-CEP/Imager/MWControl/bootstrap -text
 CEP/Imager/MWControl/test/tMWControl.in_mpi_out3 -text
 CEP/Imager/MWControl/test/tMWControl.in_mpi_out4 -text
 CEP/Imager/MWControl/test/tMWControl.in_ms -text
-CEP/Imager/MWImager/bootstrap -text
 CEP/Imager/MWImager/src/makeCombinedImage-part -text
 CEP/Imager/MWImager/src/mwimager -text
 CEP/Imager/MWImager/src/mwimager-askap -text
@@ -382,7 +372,6 @@ CEP/MS/src/makemsdistr-part -text
 CEP/MS/test/tcombinevds.in_vds1 -text
 CEP/MS/test/tcombinevds.in_vds2 -text
 CEP/MS/test/tmakems.in_antenna.tgz -text svneol=unset#application/x-compressed-tar
-CEP/MWCommon/bootstrap -text
 CEP/MWCommon/src/rundist -text
 CEP/MWCommon/src/rundist-part -text
 CEP/MWCommon/src/runlogpid -text
@@ -414,7 +403,6 @@ CEP/ParmDB/test/tsetupsourcedb.in_gds -text
 CEP/ParmDB/test/tsetupsourcedb.in_ms0.vds -text
 CEP/ParmDB/test/tsetupsourcedb.in_ms1.vds -text
 CEP/ParmDB/test/tsetupsourcedb.in_ms2.vds -text
-CEP/Pipeline/bootstrap -text
 CEP/Pipeline/library/lioff.clusterdesc -text
 CEP/Pipeline/library/makevds.bash -text
 CMake/FindAskapSoft.cmake -text
@@ -425,7 +413,8 @@ CMake/FindValgrind.cmake -text
 CMake/FindWCSLIB.cmake -text
 CMake/LofarMatlab.cmake -text
 CMake/TODO -text
-CMake/makeCMakeCache -text
+CMake/testscripts/assay -text
+CMake/testscripts/checkfloat -text
 CMake/variants/variants.RS005 -text
 CMake/variants/variants.bgfen0 -text
 CMake/variants/variants.kis001 -text
@@ -521,7 +510,6 @@ JAVA/MAC/jRSP/nbproject/.cvsignore -text
 LCS/AMC/AMCImpl/src/AMCServer.cc -text
 LCS/AMC/amc_main_classes.png -text
 LCS/AMC/amc_package.png -text
-LCS/ApplCommon/bootstrap -text
 LCS/ApplCommon/test/tObservation.in_conflict1 -text
 LCS/ApplCommon/test/tObservation.in_conflict2 -text
 LCS/ApplCommon/test/tObservation.in_conflict3 -text
@@ -532,11 +520,8 @@ LCS/Blob/test/tBlobField.in_be -text svneol=unset#unset
 LCS/Blob/test/tBlobField.in_le -text svneol=unset#unset
 LCS/Blob/test/tBlobStream.in_be -text svneol=unset#unset
 LCS/Blob/test/tBlobStream.in_le -text svneol=unset#unset
-LCS/Common/config.h.cmake -text
 LCS/Common/src/Common-Model.cat -text
 LCS/LACE/bootstrap -text
-LCS/Stream/bootstrap -text
-LCS/Tools/config.h.cmake -text
 LCS/Tools/src/countalllines -text
 LCS/Tools/src/countlines -text
 LCS/Tools/src/countpurecode -text
@@ -545,8 +530,6 @@ LCS/Tools/src/fillreview -text
 LCS/Tools/src/makecov -text
 LCS/Tools/src/processgcov -text
 LCS/lofar_config.h.cmake -text
-LCS/pyparameterset/bootstrap -text
-LCS/pytools/bootstrap -text
 LCU/Firmware/images/ap3b_v6_0.hex -text
 LCU/Firmware/images/ap3b_v6_2.hex -text
 LCU/Firmware/images/bp3b_v6_0.hex -text
@@ -556,7 +539,6 @@ LCU/Firmware/images/mp12_8.hex -text
 LCU/Firmware/images/mp_lp2_2.hex -text
 LCU/Firmware/images/tp12_8.hex -text
 LCU/Firmware/images/tp18_11.hex -text
-LCU/Firmware/tools/bootstrap -text
 LCU/Firmware/tools/src/flash_images.sh -text
 LCU/Firmware/tools/src/restart_images.sh -text
 LCU/Firmware/tools/src/rsuctl3 -text
@@ -564,7 +546,6 @@ LCU/Firmware/tools/src/rsuctl3.pl -text
 LCU/Firmware/tools/src/rsuctl3_reset -text
 LCU/Firmware/tools/src/view_images.sh -text
 LCU/StationTest/README.txt -text
-LCU/StationTest/bootstrap -text
 LCU/StationTest/crc_dir_test.py -text
 LCU/StationTest/gold/prbs_dir_test.gold -text
 LCU/StationTest/gold/rsp_version.gold -text
@@ -630,8 +611,6 @@ LCU/StationTest/tc/spustat.py -text
 LCU/StationTest/tc/status.py -text
 LCU/StationTest/tc/sync_delay.py -text
 LCU/StationTest/tc/tdstat.py -text
-LCU/StationTest/test/Makefile.am -text
-LCU/StationTest/test/beamformertest/Makefile.am -text
 LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU192.sh -text
 LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU96.sh -text
 LCU/StationTest/test/beamformertest/beamformertest_LBA_RCU192.sh -text
@@ -639,14 +618,11 @@ LCU/StationTest/test/beamformertest/beamformertest_LBHLBL_RCU96.sh -text
 LCU/StationTest/test/beamformertest/beamformertest_LBH_RCU96.sh -text
 LCU/StationTest/test/beamformertest/beamformertest_LBL_RCU96.sh -text
 LCU/StationTest/test/beamformertest/beamformertest_splitter.sh -text
-LCU/StationTest/test/envcontroltest/Makefile.am -text
 LCU/StationTest/test/envcontroltest/ec_ctrl.py -text
 LCU/StationTest/test/envcontroltest/ec_ctrl_man.py -text
 LCU/StationTest/test/envcontroltest/power.py -text
 LCU/StationTest/test/envcontroltest/power_ctrl.py -text
-LCU/StationTest/test/hbatest/Makefile.am -text
 LCU/StationTest/test/hbatest/determinepeak.py -text
-LCU/StationTest/test/hbatest/gold/Makefile.am -text
 LCU/StationTest/test/hbatest/gold/hba_modem1.gold -text
 LCU/StationTest/test/hbatest/gold/hba_modem2.gold -text
 LCU/StationTest/test/hbatest/gold/hba_modem3.gold -text
@@ -656,7 +632,6 @@ LCU/StationTest/test/hbatest/hba_save_power.sh -text
 LCU/StationTest/test/hbatest/hbaelementtest.py -text
 LCU/StationTest/test/hbatest/hbaquicktest.py -text
 LCU/StationTest/test/hbatest/modemtest.sh -text
-LCU/StationTest/test/subbandstatistics/Makefile.am -text
 LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-5.sh -text
 LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-6.sh -text
 LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-7.sh -text
@@ -664,21 +639,17 @@ LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-3.sh -text
 LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-4.sh -text
 LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-1.sh -text
 LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-2.sh -text
-LCU/StationTest/test/subracktest/Makefile.am -text
 LCU/StationTest/test/subracktest/flash_tbb.sh -text
 LCU/StationTest/test/subracktest/flashsubrack.sh -text
 LCU/StationTest/test/subracktest/startonly.sh -text
 LCU/StationTest/test/subracktest/subrack_production.py -text
 LCU/StationTest/test/subracktest/testonly.sh -text
-LCU/StationTest/test/systemnoise/Makefile.am -text
 LCU/StationTest/test/systemnoise/systemnoise_hba.sh -text
 LCU/StationTest/test/systemnoise/systemnoise_lbh.sh -text
-LCU/StationTest/test/timing/Makefile.am -text
 LCU/StationTest/test/timing/gps.sh -text
 LCU/StationTest/test/timing/ntpd.sh -text
 LCU/StationTest/test/timing/ntpd_restart.sh -text
 LCU/StationTest/test/timing/pps.sh -text
-LCU/StationTest/test/xcstatistics/Makefile.am -text
 LCU/StationTest/test/xcstatistics/waveform-generator-test.sh -text
 LCU/StationTest/test/xcstatistics/xcstatistics_hba.sh -text
 LCU/StationTest/test/xcstatistics/xcstatistics_lbh.sh -text
@@ -689,7 +660,6 @@ LCU/StationTest/xc_160_setup.sh -text
 LCU/StationTest/xc_160_verify.sh -text
 LCU/StationTest/xc_200_setup.sh -text
 LCU/StationTest/xc_200_verify.sh -text
-MAC/APL/APLCommon/bootstrap -text svneol=native#application/octet-stream
 MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream
 MAC/APL/CEPCU/src/ApplController/CMakeLists.txt -text
 MAC/APL/CEPCU/src/BGPlogProcessor/CEPDatapoints.dpl -text
@@ -697,45 +667,31 @@ MAC/APL/CEPCU/src/BGPlogProcessor/CEPDatapointtypes.dpl -text
 MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.conf -text
 MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop -text
 MAC/APL/DEPENDENCIES -text svneol=native#application/octet-stream
-MAC/APL/MD_Protocol/bootstrap -text
 MAC/APL/MD_Protocol/src/MD_Protocol.prot -text
 MAC/APL/PAC/Beam_Server/test/weights.dat -text svneol=unset#unset
 MAC/APL/PAC/Cal_Server/src/CS010C_HALF_positions.dat -text
 MAC/APL/PAC/Cal_Server/src/CS010C_positions.dat -text
-MAC/APL/PAC/IBS_Protocol/bootstrap -text
 MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot -text
 MAC/APL/PAC/ICAL_Protocol/CMakeLists.txt -text
-MAC/APL/PAC/ICAL_Protocol/ICAL_Protocol.spec.in -text
-MAC/APL/PAC/ICAL_Protocol/Makefile.am -text
-MAC/APL/PAC/ICAL_Protocol/bootstrap -text
-MAC/APL/PAC/ICAL_Protocol/configure.in -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/ACC.h -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaArray.h -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaArrayData.h -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/CMakeLists.txt -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/CalibrationInterface.h -text
-MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/Makefile.am -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SharedResource.h -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h -text
-MAC/APL/PAC/ICAL_Protocol/include/Makefile.am -text
 MAC/APL/PAC/ICAL_Protocol/src/ACC.cc -text
 MAC/APL/PAC/ICAL_Protocol/src/AntennaArray.cc -text
 MAC/APL/PAC/ICAL_Protocol/src/AntennaArrayData.cc -text
 MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc -text
 MAC/APL/PAC/ICAL_Protocol/src/CMakeLists.txt -text
 MAC/APL/PAC/ICAL_Protocol/src/ICAL_Protocol.prot -text
-MAC/APL/PAC/ICAL_Protocol/src/Makefile.am -text
 MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc -text
 MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc -text
-MAC/APL/PAC/ITRFBeamServer/bootstrap -text
 MAC/APL/PAC/ITRFCalServer/CMakeLists.txt -text
-MAC/APL/PAC/ITRFCalServer/CalServer.spec.in -text
-MAC/APL/PAC/ITRFCalServer/Makefile.am -text
-MAC/APL/PAC/ITRFCalServer/bootstrap -text
 MAC/APL/PAC/ITRFCalServer/configure -text
-MAC/APL/PAC/ITRFCalServer/configure.in -text
 MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc -text
 MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h -text
 MAC/APL/PAC/ITRFCalServer/src/CMakeLists.txt -text
@@ -755,7 +711,6 @@ MAC/APL/PAC/ITRFCalServer/src/Documentation.h -text
 MAC/APL/PAC/ITRFCalServer/src/LBACalSources.conf -text
 MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc -text
 MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h -text
-MAC/APL/PAC/ITRFCalServer/src/Makefile.am -text
 MAC/APL/PAC/ITRFCalServer/src/Source.cc -text
 MAC/APL/PAC/ITRFCalServer/src/Source.h -text
 MAC/APL/PAC/ITRFCalServer/src/SourceCatalog.conf.in -text
@@ -772,9 +727,6 @@ MAC/APL/PAC/ITRFCalServer/test/CMakeLists.txt -text
 MAC/APL/PAC/ITRFCalServer/test/CalTest.cc -text
 MAC/APL/PAC/ITRFCalServer/test/CalTest.conf.in -text
 MAC/APL/PAC/ITRFCalServer/test/CalTest.h -text
-MAC/APL/PAC/ITRFCalServer/test/Makefile.am -text
-MAC/APL/PAC/ITRFCalServer/test/Makefile.in -text
-MAC/APL/PAC/LBA_Calibration/bootstrap -text
 MAC/APL/PAC/LBA_Calibration/src/CMakeLists.txt -text
 MAC/APL/PAC/LBA_Calibration/test/20080118_083229_acc_512x96x96.dat.gz -text svneol=unset#application/x-gzip
 MAC/APL/PAC/LBA_Calibration/test/antpos.dat -text
@@ -782,7 +734,6 @@ MAC/APL/PAC/LBA_Calibration/test/calresult.dat -text
 MAC/APL/PAC/LBA_Calibration/test/flags.dat -text
 MAC/APL/PAC/LBA_Calibration/test/frequencies.dat -text
 MAC/APL/PAC/LBA_Calibration/test/srcpos.dat -text
-MAC/APL/PAC/SHMInfo_Server/bootstrap -text svneol=native#application/octet-stream
 MAC/APL/PAC/SHMInfo_Server/src/SHM_Protocol.prot -text
 MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot -text svneol=native#application/octet-stream
 MAC/APL/PAC/SHMInfo_Server/test/mis.btsw -text svneol=native#application/octet-stream
@@ -805,20 +756,11 @@ MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_6 -text
 MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_CableAtts -text
 MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc -text
 MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h -text
-MAC/APL/PIC/TBB_Protocol/include/Makefile.am -text
 MAC/APL/PIC/rsuctl/lofar.jpg -text svneol=unset#unset
 MAC/APL/PIC/rsuctl/ndump.tgz -text svneol=unset#unset
-MAC/APL/RTDBCommon/Makefile.am -text
-MAC/APL/RTDBCommon/RTDBCommon.spec.in -text
-MAC/APL/RTDBCommon/bootstrap -text
-MAC/APL/RTDBCommon/configure.in -text
-MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am -text
 MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h -text
-MAC/APL/RTDBCommon/include/Makefile.am -text
 MAC/APL/RTDBCommon/src/CM_Protocol.prot -text
-MAC/APL/RTDBCommon/src/Makefile.am -text
 MAC/APL/RTDBCommon/src/RTDButilities.cc -text
-MAC/APL/RTDBCommon/test/Makefile.am -text
 MAC/APL/RTDBCommon/test/tRTDButilities.cc -text
 MAC/APL/RTDBCommon/test/tRTDButilities.h -text
 MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot -text
@@ -830,8 +772,6 @@ MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc -text
 MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h -text
 MAC/APL/StationCU/src/TBBControl/TBBObservation.cc -text
 MAC/APL/StationCU/src/TBBControl/TBBObservation.h -text
-MAC/APL/TestSuite/bootstrap -text svneol=native#application/octet-stream
-MAC/APL/VHECR/bootstrap -text
 MAC/APL/VHECR/test/2008-01-24_TRIGGER.dat -text
 MAC/Config/Apc/b1.apc -text svneol=native#application/octet-stream
 MAC/Config/Apc/b2.apc -text svneol=native#application/octet-stream
@@ -919,7 +859,6 @@ MAC/Deployment/data/PVSS/BGPConnectionInfo.dpdef -text
 MAC/Deployment/data/PVSS/CEPObservation.dpdef -text
 MAC/Deployment/data/PVSS/InputBuffer.dpdef -text
 MAC/Deployment/data/PVSS/MCUbase.dpdef -text
-MAC/Deployment/data/PVSS/Makefile.am -text
 MAC/Deployment/data/PVSS/OSRack.dpdef -text
 MAC/Deployment/data/PVSS/Observation.dpdef -text
 MAC/Deployment/data/PVSS/PVSSbase.dpdef -text
@@ -963,7 +902,6 @@ MAC/Deployment/data/StaticMetaData/HBADeltas/RS503-HBADeltas.conf -text
 MAC/Deployment/data/StaticMetaData/HardwareMonitor.conf.test -text
 MAC/Deployment/data/StaticMetaData/HardwareMonitor.conf.tmpl -text
 MAC/Deployment/data/StaticMetaData/MAC+IP.dat -text
-MAC/Deployment/data/StaticMetaData/Makefile.am -text
 MAC/Deployment/data/StaticMetaData/PVSSnumbers.dat -text
 MAC/Deployment/data/StaticMetaData/RSP+IP.dat -text
 MAC/Deployment/data/StaticMetaData/RSPConnections.dat -text
@@ -977,24 +915,15 @@ MAC/Deployment/data/StaticMetaData/createFiles -text
 MAC/Docs/LOFAR-MAC-Development-environment.doc -text svneol=unset#unset
 MAC/Docs/PVSS-Readme.doc -text
 MAC/Drivers/spid/tools/Makefile -text svneol=native#application/octet-stream
-MAC/Drivers/spid/tools/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/DEPENDENCIES -text svneol=native#application/octet-stream
-MAC/GCF/LogSys/CLP/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.log_prop.in -text svneol=native#application/octet-stream
-MAC/GCF/LogSys/CLP/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/LogSys/KVLogSys/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/LogSys/KVLogSys/src/KVL_Protocol.prot -text svneol=native#application/octet-stream
 MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerSys.conf.in -text svneol=native#application/octet-stream
 MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerSys.log_prop.in -text svneol=native#application/octet-stream
-MAC/GCF/LogSys/KVLogSys/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/LogSys/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/LogSys/bootstrap -text svneol=native#application/octet-stream
-MAC/GCF/LogSys/configure.in -text svneol=native#application/octet-stream
 MAC/GCF/PVSS/test/tPVSSservice.dpl -text
 MAC/GCF/README -text svneol=native#application/octet-stream
 MAC/GCF/RTDB/test/readScript.ctl -text
 MAC/GCF/RTDB/test/writeScript.ctl -text
-MAC/GCF/TM/bootstrap -text svneol=native#application/octet-stream
 MAC/GCF/TM/test/Echo_Protocol.prot -text svneol=native#application/octet-stream
 MAC/GCF/TM/test/tGCFTask1.cc -text
 MAC/GCF/TM/test/tGCFTask2.cc -text
@@ -1003,37 +932,18 @@ MAC/GCF/TM/test/tGCFTask4.cc -text
 MAC/GCF/TM/test/tGCFTask5.cc -text
 MAC/GCF/TM/test/testTask.cc -text
 MAC/GCF/TM/test/testTask.h -text
-MAC/GCF/_PAL/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/PA/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/pvss/panels/GCFPATest.pnl -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/pvss/panels/GCFPropSetLoader.pnl -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/PA/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/src/gcf-pa.conf.in -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/src/loadAPC -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/PA/src/preparePVSS-DB -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/PI/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/PI/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/PML/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/PML/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/SAL/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/SAL/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/SAL/test/Echo_Protocol.prot -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/SAL/test/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/_PAL/SAL/test/sal-test.conf.in -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/bootstrap -text svneol=native#application/octet-stream
-MAC/GCF/_PALlight/CEP-PMLlight/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PALlight/CEP-PMLlight/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PALlight/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PALlight/PMLlight/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/_PALlight/PMLlight/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/_PALlight/PMLlight/src/gcf-pmllight.conf.in -text svneol=native#application/octet-stream
 MAC/GCF/_PALlight/PMLlight/src/genTypeInfo -text svneol=native#application/octet-stream
-MAC/GCF/_PALlight/bootstrap -text svneol=native#application/octet-stream
-MAC/GCF/_PALlight/configure.in -text svneol=native#application/octet-stream
-MAC/MACIO/bootstrap -text
 MAC/MACIO/include/MACIO/KVTLogger.h -text
 MAC/MACIO/src/KVTLogger.cc -text
 MAC/MACIO/src/KVT_Protocol.prot -text
@@ -1044,17 +954,13 @@ MAC/MACIO/test/Echo_Protocol.prot -text
 MAC/MACIO/test/tClone.stdout -text
 MAC/Navigator2/Lofar[!!-~]stations.kml -text
 MAC/Navigator2/Lofar2002.vsd -text
-MAC/Navigator2/Makefile.am -text
-MAC/Navigator2/bootstrap -text
 MAC/Navigator2/colorDB/Lofar[!!-~]colors -text
-MAC/Navigator2/config/Makefile.am -text
 MAC/Navigator2/config/config.ccu -text
 MAC/Navigator2/config/config.maincu -text
 MAC/Navigator2/config/config.station -text
 MAC/Navigator2/config/progs.ccu -text
 MAC/Navigator2/config/progs.maincu -text
 MAC/Navigator2/config/progs.station -text
-MAC/Navigator2/configure.in -text
 MAC/Navigator2/data/PVSS[!!-~]performance[!!-~]results.xls -text
 MAC/Navigator2/dplist/maincu_system.dpl -text
 MAC/Navigator2/dplist/station_system.dpl -text
@@ -1251,7 +1157,6 @@ MAC/Navigator2/pictures/up_en.gif -text svneol=unset#image/gif
 MAC/Navigator2/pictures/ventilation_static.gif -text svneol=unset#image/gif
 MAC/Navigator2/pictures/ventilator_ani.gif -text svneol=unset#image/gif
 MAC/Navigator2/scripts/LofarSpeedTest/LofarSpeedTest.ctl -text
-MAC/Navigator2/scripts/Makefile.am -text
 MAC/Navigator2/scripts/claim.ctl -text
 MAC/Navigator2/scripts/emptyDatabase.ctl -text
 MAC/Navigator2/scripts/gcf_cwd.ctl -text
@@ -1263,7 +1168,6 @@ MAC/Navigator2/scripts/libs/GCFCommon.ctl -text
 MAC/Navigator2/scripts/libs/GCFLogging.ctl -text
 MAC/Navigator2/scripts/libs/LofarSpeedTest/lofarSpeedTestCommon.ctl -text
 MAC/Navigator2/scripts/libs/MainCU_Processes.ctl -text
-MAC/Navigator2/scripts/libs/Makefile.am -text
 MAC/Navigator2/scripts/libs/Station_Processes.ctl -text
 MAC/Navigator2/scripts/libs/claimManager.ctl -text
 MAC/Navigator2/scripts/libs/login.ctl -text
@@ -1384,31 +1288,19 @@ MAC/Test/APL/macAlerts -text svneol=native#application/octet-stream
 MAC/Test/APL/startLofarSystem -text svneol=native#application/octet-stream
 MAC/Test/APL/stopLofarSystem -text svneol=native#application/octet-stream
 MAC/Test/GCF/CEP/DEPENDENCIES -text svneol=native#application/octet-stream
-MAC/Test/GCF/CEP/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/GCF/CEP/README -text svneol=native#application/octet-stream
-MAC/Test/GCF/CEP/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/GCF/CEP/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/GCF/CEP/src/typeStruct_TTypeF.dpl.in -text svneol=native#application/octet-stream
 MAC/Test/GCF/MAC/DEPENDENCIES -text svneol=native#application/octet-stream
-MAC/Test/GCF/MAC/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/GCF/MAC/README -text svneol=native#application/octet-stream
-MAC/Test/GCF/MAC/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/GCF/MAC/configure.in -text svneol=native#application/octet-stream
 MAC/Test/GCF/MAC/src/Echo_Protocol.prot -text svneol=native#application/octet-stream
-MAC/Test/GCF/MAC/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/GCF/MAC/src/TST_Protocol.prot -text svneol=native#application/octet-stream
 MAC/Test/GCF/MAC/src/customPrepPVSSDB.ctl -text svneol=native#application/octet-stream
 MAC/Test/GCF/MAC/src/gcf-test.conf.in -text svneol=native#application/octet-stream
 MAC/Test/GCF/MAC/src/gcftesttypes.dpl -text svneol=native#application/octet-stream
 MAC/Test/GCF/RTC/DEPENDENCIES -text svneol=native#application/octet-stream
-MAC/Test/GCF/RTC/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/GCF/RTC/README -text svneol=native#application/octet-stream
-MAC/Test/GCF/RTC/bootstrap -text svneol=native#application/octet-stream
 MAC/Test/GCF/RTC/src/Echo_Protocol.prot -text svneol=native#application/octet-stream
-MAC/Test/GCF/RTC/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/GCF/RTC/src/gcf-test.conf.in -text svneol=native#application/octet-stream
-MAC/Test/GCF/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/GCF/lofarconf.in -text svneol=native#application/octet-stream
 MAC/Test/PROTO/Event/MY_Protocol.prot -text svneol=native#application/octet-stream
 MAC/Test/PROTO/Event/Makefile -text svneol=native#application/octet-stream
 MAC/Test/PROTO/Event/protocol.tpl -text svneol=native#application/octet-stream
@@ -1416,27 +1308,13 @@ MAC/Test/PROTO/Event/protocol.tpl.ph-only -text svneol=native#application/octet-
 MAC/Test/PROTO/EventExt/MY_Protocol.prot -text svneol=native#application/octet-stream
 MAC/Test/PROTO/EventExt/Makefile -text svneol=native#application/octet-stream
 MAC/Test/PROTO/EventExt/protocol.tpl -text svneol=native#application/octet-stream
-MAC/Test/PROTO/GPI/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/GPI/configure.in -text svneol=native#application/octet-stream
 MAC/Test/PROTO/GPI/src/GCF_Port.hxx -text svneol=native#application/octet-stream
 MAC/Test/PROTO/GPI/src/GCF_PortManager.hxx -text svneol=native#application/octet-stream
-MAC/Test/PROTO/GPI/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PI/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/PROTO/PI/autogen/protocol.tpl -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PI/configure.in -text svneol=native#application/octet-stream
 MAC/Test/PROTO/PI/src/F_Supervisory_Protocol.prot -text svneol=native#application/octet-stream
 MAC/Test/PROTO/PI/src/GPI_Controller.hxx -text svneol=native#application/octet-stream
 MAC/Test/PROTO/PI/src/GPI_Resources.hxx -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PI/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PROP/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PROP/configure.in -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PROP/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PVSSAPI/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PVSSAPI/configure.in -text svneol=native#application/octet-stream
 MAC/Test/PROTO/PVSSAPI/src/GCF_PVSSAPI.hxx -text svneol=native#application/octet-stream
-MAC/Test/PROTO/PVSSAPI/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/TASK/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/TASK/configure.in -text svneol=native#application/octet-stream
 MAC/Test/PROTO/TASK/src/GCF_Defines.hxx -text svneol=native#application/octet-stream
 MAC/Test/PROTO/TASK/src/GCF_Event.hxx -text svneol=native#application/octet-stream
 MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx -text svneol=native#application/octet-stream
@@ -1444,45 +1322,21 @@ MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx -text svneol=native#application/oc
 MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx -text svneol=native#application/octet-stream
 MAC/Test/PROTO/TASK/src/GCF_SCADAAPI.hxx -text svneol=native#application/octet-stream
 MAC/Test/PROTO/TASK/src/GCF_Task.hxx -text svneol=native#application/octet-stream
-MAC/Test/PROTO/TASK/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/PROTO/lofarconf.in -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/THEcho/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THEcho/README -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/THEcho/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/THEcho/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THEcho/src/THEcho.conf.in -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THEcho/src/THEcho.log_prop.in -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THEcho/src/THEchoRouting_Protocol.prot -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THEcho/src/THEcho_Protocol.prot -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/THEcho/test/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THEcho/test/THEchoTest.conf.in -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THEcho/test/THEchoTest.log_prop.in -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/THPVSSBridge/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/THPVSSBridge/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/THPVSSBridge/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.conf.in -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.log_prop.in -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge_Protocol.prot -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/TSE/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/TSE/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/TSE/configure.in -text svneol=native#application/octet-stream
 MAC/Test/TestHarness/TSE/doc/OTSE-UserManual.doc -text
 MAC/Test/TestHarness/TSE/doc/OTSE-UserManual.pdf -text
 MAC/Test/TestHarness/TSE/scripts/demo.tar.bz2 -text
-MAC/Test/TestHarness/TSE/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/TSE/src/dbg/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/TSE/src/tsed/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/TSE/src/tseg/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/TSE/src/tsek/Makefile.am -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/TestHarness/lofarconf.in -text svneol=native#application/octet-stream
-MAC/Test/bootstrap -text svneol=native#application/octet-stream
-MAC/Test/lofarconf.in -text svneol=native#application/octet-stream
-MAC/Tools/Clock/Makefile.am -text
 MAC/Tools/Clock/plotclock -text
 MAC/Tools/Clock/ppsctl.c -text
-MAC/Tools/Makefile.am -text
-MAC/Tools/NTP/Makefile.am -text
 MAC/Tools/NTP/PPSkit-light-alpha-3932m-2.6.17.8.diff -text
 MAC/Tools/NTP/kernel-2.6.18-NANO.config -text
 MAC/Tools/NTP/ntp-4.2.4p5.lofar/Makefile -text
@@ -1495,15 +1349,12 @@ MAC/Tools/NTP/ntp-4.2.4p5.lofar/ntpd.init -text
 MAC/Tools/NTP/ntp-4.2.4p5.lofar/ntpd.sysconfig -text
 MAC/Tools/NTP/ntp-4.2.4p5.lofar/patch-ntp-4.2.4p5 -text
 MAC/Tools/NTP/ntp-4.2.4p5.lofar/step-tickers -text
-MAC/Tools/NTP/src/Makefile.am -text
 MAC/Tools/NTP/src/resetNTPcoords -text
 MAC/Tools/NTP/time.c -text
 MAC/Tools/NTP/timepps.h -text
 MAC/Tools/NTP/timer.c -text
 MAC/Tools/NTP/timer.c.patch -text
 MAC/Tools/NTP/timex.h -text
-MAC/Tools/bootstrap -text svneol=native#application/octet-stream
-MAC/Tools/configure.in -text
 MAC/Tools/ethereal-0.9.8.tar.gz -text svneol=unset#unset
 MAC/Tools/jtagctl/fts2_2h.genGen.Bin -text svneol=unset#unset
 MAC/Tools/jtagctl/fts2_q34Gen.Bin -text svneol=unset#unset
@@ -1524,8 +1375,6 @@ MAC/_System/lofar29.journal -text svneol=native#application/octet-stream
 MAC/_System/lofar29.sysconf -text svneol=native#application/octet-stream
 MAC/_System/lofar30.journal -text svneol=native#application/octet-stream
 MAC/_System/lofar30.sysconf -text svneol=native#application/octet-stream
-MAC/bootstrap -text svneol=native#application/octet-stream
-RTCP/CNProc/bootstrap -text
 RTCP/CNProc/src/ArenaMapping.h -text
 RTCP/CNProc/src/BeamFormerAsm3St6Bm.inc -text
 RTCP/CNProc/src/BeamFormerAsm6St3Bm.inc -text
@@ -1540,17 +1389,13 @@ RTCP/CNProc/test/tPencilBeamFormer.cc -text
 RTCP/CNProc/test/tPencilBeamFormer.sh -text
 RTCP/CNProc/test/tStokes.cc -text
 RTCP/CNProc/test/tStokes.sh -text
-RTCP/FCNP/bootstrap -text
-RTCP/IONProc/bootstrap -text
 RTCP/IONProc/src/IONProc.supp -text
 RTCP/IONProc/src/StreamMultiplexer.cc -text
 RTCP/IONProc/src/StreamMultiplexer.h -text
 RTCP/IONProc/test/CMakeLists.txt -text
-RTCP/IONProc/test/Makefile.am -text
 RTCP/IONProc/test/tDelayCompensation.cc -text
 RTCP/IONProc/test/tDelayCompensation.parset -text
 RTCP/IONProc/test/tDelayCompensation.sh -text
-RTCP/Interface/bootstrap -text
 RTCP/Interface/include/Interface/BFRawFormat.h -text
 RTCP/Interface/include/Interface/CN_ProcessingPlan.h -text
 RTCP/Interface/include/Interface/InverseFilteredData.h -text
@@ -1563,14 +1408,11 @@ RTCP/Interface/include/Interface/TransposedBeamFormedData.h -text
 RTCP/Interface/src/CN_ProcessingPlan.cc -text
 RTCP/Interface/src/PencilCoordinates.cc -text
 RTCP/LofarStMan/CMakeLists.txt -text
-RTCP/LofarStMan/bootstrap -text
 RTCP/LofarStMan/include/LofarStMan/CMakeLists.txt -text
 RTCP/LofarStMan/src/CMakeLists.txt -text
 RTCP/LofarStMan/src/makeFLAGwritable -text
 RTCP/LofarStMan/test/CMakeLists.txt -text
-RTCP/RTCPTools/bootstrap -text
 RTCP/RTCPTools/src/cexec-udp-copy -text
-RTCP/Run/bootstrap -text
 RTCP/Run/src/LOFAR/BGcontrol.py -text
 RTCP/Run/src/LOFAR/Locations.py -text
 RTCP/Run/src/LOFAR/Logger.py -text
@@ -1593,7 +1435,6 @@ RTCP/Run/src/util/__init__.py -text
 RTCP/Run/src/util/dateutil.py -text
 RTCP/Run/src/util/shlex.py -text
 RTCP/Run/src/util/tee.py -text
-RTCP/Storage/bootstrap -text
 RTCP/Storage/include/Storage/Format.h -text
 RTCP/Storage/include/Storage/MSWriterFile.h -text
 RTCP/Storage/include/Storage/MSWriterNull.h -text
@@ -1702,10 +1543,6 @@ SAS/OTB/jOTDB2/src/nl/astron/lofar/sas/otb/jotdb2/jCampaignInterface.java -text
 SAS/OTB/jOTDB2/src/nl_astron_lofar_sas_otb_jotdb2_jCampaign.cc -text
 SAS/OTB/jOTDB2/test/tCampaign.java -text
 SAS/OTB/jOTDB2/test/testStates.java -text
-SAS/OTB/scripts/Makefile.am -text
-SAS/OTB/scripts/bootstrap -text
-SAS/OTB/scripts/configure.in -text
-SAS/OTB/scripts/src/Makefile.am -text
 SAS/OTB/scripts/src/checkOTDBServer -text
 SAS/OTB/scripts/src/startOTB -text
 SAS/OTDB/sql/campaignAPI.sql -text
@@ -1731,11 +1568,6 @@ SDP/SPP/VHDL/FFT/aukfft_selone.tdf -text svneol=unset#unset
 SDP/SPP/VHDL/FFT/aukfft_twaa.tdf -text svneol=unset#unset
 SDP/SPP/VHDL/FFT/aukfft_twidrom.tdf -text
 SDP/SPP/VHDL/FFT/aukfft_twidrom_4k.tdf -text
-SubSystems/CCU_MAC/lofarconf.in -text
-SubSystems/LCU_MAC/lofarconf.in -text
-SubSystems/MCU_MAC/lofarconf.in -text
-SubSystems/Offline/lofarconf.in -text
-SubSystems/SAS_OTDB/lofarconf.in -text
 autoconf_share/makeversion -text
 autoconf_share/variants.CS099T -text
 autoconf_share/variants.RS005T -text
diff --git a/CEP/Calibration/BBSControl/BBSControl.spec.in b/CEP/Calibration/BBSControl/BBSControl.spec.in
deleted file mode 100644
index 71238f51d14d242345d708ae17bc1fc0ba538f8a..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/BBSControl.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# BBSControl.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Blob is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 3.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Blob ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/CEP/Calibration/BBSControl/Makefile.am b/CEP/Calibration/BBSControl/Makefile.am
deleted file mode 100644
index bd8bf6c996377c1a32008a43f4489a3ec3ea1dba..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-SUBDIRS = include src test scripts
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS = \
-      --with-common=$(prefix) \
-      --with-blob=$(prefix) \
-      --with-transport=$(prefix) \
-      --with-transportpostgres=$(prefix) \
-      --with-tinycep=$(prefix) \
-      --with-cepframe=$(prefix) \
-      --with-aps=$(prefix) \
-      --with-bbs=$(prefix) \
-      --with-parmdb=$(prefix) \
-      --with-ms=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      BBSControl.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSControl/bootstrap b/CEP/Calibration/BBSControl/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/Calibration/BBSControl/configure.in b/CEP/Calibration/BBSControl/configure.in
deleted file mode 100644
index 1562dfaf80ea5635e9196ab7f0eeea1df5f260ad..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl Do not define VERSION, etc. in config.h.
-dnl
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(BBSControl, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for header files.
-AC_HEADER_STDC
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl
-dnl Python is only needed for the utility scripts in scripts/
-dnl
-lofar_PYTHON
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_MPI
-
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h)
-lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h)
-lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h)
-lofar_INTERNAL(CEP/MWCommon,MWCommon,,1,MWCommon/VdsDesc.h)
-lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Evaluator.h)
-
-dnl
-dnl LCS/pytools is only needed for the utility scripts in scripts/
-dnl
-lofar_INTERNAL(LCS/pytools,pytools,,,,"")
-
-lofar_EXTERNAL(boost,1,boost/logic/tribool.hpp,"")
-lofar_EXTERNAL(pgsql,1,pgsql/libpq-fe.h,pq)
-lofar_EXTERNAL(pqxx,1,pqxx/pqxx, pqxx)
-
-lofar_AIPSPP(1,"-lmeasures -ltables -lscimath -lscimath_f -lcasa")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/BBSControl/Makefile
-src/Makefile
-test/Makefile
-scripts/Makefile
-Makefile
-BBSControl.spec
-)
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/Makefile.am b/CEP/Calibration/BBSControl/include/BBSControl/Makefile.am
deleted file mode 100644
index 90267d7be1603a32716bd9fe488f22245ed594b4..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/include/BBSControl/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	AddStep.h \
-	BlobStreamableConnection.h \
-	CalSession.h \
-	CalSessionTransactors.h \
-	Command.h \
-	CommandResult.h \
-	CommandVisitor.h \
-	CorrectStep.h \
-	Exceptions.h \
-	FinalizeCommand.h \
-	GlobalProcessControl.h \
-	GlobalSolveController.h \
-	InitializeCommand.h \
-	KernelProcessControl.h \
-	LocalSolveController.h \
-	Messages.h \
-	MessageHandlers.h \
-	MultiStep.h \
-	NextChunkCommand.h \
-	PredictStep.h \
-	RecoverCommand.h \
-	RefitStep.h \
-	ShiftStep.h \
-	SingleStep.h \
-	SolverProcessControl.h \
-	SolveStep.h \
-	SolveTask.h \
-	Step.h \
-	Strategy.h \
-	SubtractStep.h \
-	SynchronizeCommand.h \
-	Types.h
-
-noinst_HEADERS = \
-	StreamUtil.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSControl/include/Makefile.am b/CEP/Calibration/BBSControl/include/Makefile.am
deleted file mode 100644
index 0dc8ec470896025a50af9dd05dd341db764d0dd1..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= BBSControl
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSControl/scripts/Makefile.am b/CEP/Calibration/BBSControl/scripts/Makefile.am
deleted file mode 100644
index 93e0925d8f2ad6871d30178e442b517346d5641d..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/scripts/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-lofarpython_PYTHON	= __init__.py solfetch.py solplot.py solflag.py
-lofarpythondir		= $(pythondir)/lofar/solutions
-libdir			= $(lofarpythondir)
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = parmdbplot.py
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSControl/src/Makefile.am b/CEP/Calibration/BBSControl/src/Makefile.am
deleted file mode 100644
index 1cbd76fbc7de536a00266e1fc55889a3ee2cbbb2..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/src/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-lib_LTLIBRARIES			= libbbscontrol.la
-
-libbbscontrol_la_SOURCES	= Package__Version.cc  \
-	AddStep.cc \
-	BlobStreamableConnection.cc \
-	CalSession.cc \
-	CalSessionTransactors.cc \
-	Command.cc \
-	CommandResult.cc \
-	CorrectStep.cc \
-	FinalizeCommand.cc \
-	GlobalProcessControl.cc \
-	GlobalSolveController.cc \
-	InitializeCommand.cc \
-	KernelConnection.cc \
-	KernelProcessControl.cc \
-	LocalSolveController.cc \
-	Messages.cc \
-	MultiStep.cc \
-	NextChunkCommand.cc \
-	PredictStep.cc \
-	RecoverCommand.cc \
-	RefitStep.cc \
-	ShiftStep.cc \
-	SingleStep.cc \
-	SolverProcessControl.cc \
-	SolveStep.cc \
-	SolveTask.cc \
-	Step.cc \
-	Strategy.cc \
-	StreamUtil.cc \
-	SubtractStep.cc \
-	SynchronizeCommand.cc \
-	Types.cc
-
-bin_PROGRAMS			= versionbbscontrol GlobalControl KernelControl SolverControl
-
-GlobalControl_SOURCES		= GlobalControl.cc
-GlobalControl_LDADD		= libbbscontrol.la
-GlobalControl_DEPENDENCIES	= libbbscontrol.la $(LOFAR_DEPEND)
-
-KernelControl_SOURCES		= KernelControl.cc
-KernelControl_LDADD		= libbbscontrol.la
-KernelControl_DEPENDENCIES 	= libbbscontrol.la $(LOFAR_DEPEND)
-
-SolverControl_SOURCES		= SolverControl.cc
-SolverControl_LDADD		= libbbscontrol.la
-SolverControl_DEPENDENCIES 	= libbbscontrol.la $(LOFAR_DEPEND)
-
-versionbbscontrol_SOURCES      = versionbbscontrol.cc
-versionbbscontrol_LDADD        = libbbscontrol.la
-versionbbscontrol_DEPENDENCIES = libbbscontrol.la $(LOFAR_DEPEND)
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = calibrate calibrate-part
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSControl/test/Makefile.am b/CEP/Calibration/BBSControl/test/Makefile.am
deleted file mode 100644
index d903501aca75b9f344a21b5afe09e64bdad5b815..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSControl/test/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-check_PROGRAMS			= tStrategy \
-				  tCommandQueue
-
-check_SCRIPTS			= tStrategy.sh \
-				  tCommandQueue.sh
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS			= tStrategy \
-				  tCommandQueue
-#ENDCHECKTOOLPROGS
-
-tStrategy_SOURCES		= tStrategy.cc
-tStrategy_LDADD			= ../src/libbbscontrol.la
-tStrategy_DEPENDENCIES		= ../src/libbbscontrol.la $(LOFAR_DEPEND)
-
-tCommandQueue_SOURCES		= tCommandQueue.cc
-tCommandQueue_LDADD		= ../src/libbbscontrol.la
-tCommandQueue_DEPENDENCIES	= ../src/libbbscontrol.la $(LOFAR_DEPEND)
-
-TESTS				= $(check_SCRIPTS)
-
-EXTRA_DIST			= $(check_SCRIPTS) \
-				  tStrategy.run tStrategy.stdout \
-				  tBBSControl.parset
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSKernel/BBSKernel.spec.in b/CEP/Calibration/BBSKernel/BBSKernel.spec.in
deleted file mode 100644
index f78c2c2c7f2dbe7a53b350d595f7ee1c4fbb21e7..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/BBSKernel.spec.in
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# BBSKernel.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: BBSKernel contains the kernel of the BlackBoard Selfcal system.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 3.0
-Requires: Blob >= 1.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-BBSKernel contains the kernel of the BlackBoard Selfcal system. The kernel
-consists of classes to perform predict, differentiate (Prediff), and solve
-operations.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/CEP/Calibration/BBSKernel/Makefile.am b/CEP/Calibration/BBSKernel/Makefile.am
deleted file mode 100644
index da57568af3ccea6ca05c98f4e9b0e6c40956c58d..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS       = src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--with-parmdb=$(prefix) \
-	--with-ms=$(prefix)
-
-EXTRA_DIST = \
-	Makefile.common \
-	BBSKernel.spec \
-	package.dox \
-	autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSKernel/bootstrap b/CEP/Calibration/BBSKernel/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/Calibration/BBSKernel/configure.in b/CEP/Calibration/BBSKernel/configure.in
deleted file mode 100644
index fb970a0e35b74e5c350b0275e757db81d06f41f1..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/configure.in
+++ /dev/null
@@ -1,76 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl Do not define VERSION, etc. in config.h.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(BBSKernel, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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_ENABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(dlfcn.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_MPI
-
-lofar_INTERNAL(CEP/ParmDB,ParmDB,,1,ParmDB/ParmDB.h)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h)
-
-lofar_AIPSPP(1,"-lms -lmeasures -ltables -lscimath -lscimath_f -lcasa")
-lofar_LAPACK(1)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/BBSKernel/Makefile
-src/Makefile
-test/Makefile
-Makefile
-BBSKernel.spec
-)
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Makefile.am b/CEP/Calibration/BBSKernel/include/BBSKernel/Makefile.am
deleted file mode 100644
index c5b4f4a5dc8b23a6736c03f959b85d431d86953d..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-pkginclude_Exprdir = $(pkgincludedir)/Expr
-
-pkginclude_HEADERS = Package__Version.h \
-	ElementBeamExpr.h \
-	Equator.h \
-	Evaluator.h \
-	Exceptions.h \
-	ExprSet.h \
-	Instrument.h \
-	IonosphereExpr.h \
-	Measurement.h \
-	MeasurementAIPS.h \
-	Model.h \
-	ModelConfig.h \
-	ParmManager.h \
-	ParmProxy.h \
-	Solver.h \
-	SolverInterfaceTypes.h \
-	Types.h \
-	VisData.h \
-	VisDimensions.h \
-	VisExpr.h \
-	VisSelection.h
-
-pkginclude_Expr_HEADERS	= 	\
-	Expr/ArrayFactor.h \
-	Expr/AzEl.h \
-	Expr/BasicExpr.h \
-	Expr/Cache.h \
-	Expr/ConditionNumber.h \
-	Expr/EquatorialCentroid.h \
-	Expr/Expr.h \
-	Expr/ExprId.h \
-	Expr/ExprAdaptors.h \
-	Expr/ExprParm.h \
-	Expr/ExprValue.h \
-	Expr/ExprValueView.h \
-	Expr/ExprValueIterator.h \
-	Expr/ExprVisData.h \
-	Expr/ExternalFunction.h \
-	Expr/FaradayRotation.h \
-	Expr/FlagArray.h \
-	Expr/FlagIf.h \
-	Expr/GaussianCoherence.h \
-	Expr/GaussianSource.h \
-	Expr/HamakerDipole.h \
-	Expr/Literal.h \
-	Expr/LMN.h \
-	Expr/Matrix.h \
-	Expr/MatrixComplexArr.h \
-	Expr/MatrixComplexSca.h \
-	Expr/MatrixInverse.h \
-	Expr/MatrixMul2.h \
-	Expr/MatrixMul3.h \
-	Expr/MatrixRealArr.h \
-	Expr/MatrixRealSca.h \
-	Expr/MatrixRep.h \
-	Expr/MatrixSum.h \
-	Expr/MatrixTmp.h \
-	Expr/MergeFlags.h \
-	Expr/PhaseShift.h \
-	Expr/PiercePoint.h \
-	Expr/PointCoherence.h \
-	Expr/PointSource.h \
-	Expr/PolynomialLayer.h \
-	Expr/RefCounting.h \
-	Expr/Request.h \
-	Expr/Resampler.h \
-	Expr/ScalarMatrixMul.h \
-	Expr/Scope.h \
-	Expr/Source.h \
-	Expr/SpectralIndex.h \
-	Expr/StationShift.h \
-	Expr/StationUVW.h \
-	Expr/TileArrayFactor.h \
-	Expr/ValueSet.h \
-	Expr/YatawattaDipole.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSKernel/include/Makefile.am b/CEP/Calibration/BBSKernel/include/Makefile.am
deleted file mode 100644
index d9f8b807ce3584073c5c6066c0cb4b805fdb2e2b..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= BBSKernel
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSKernel/src/Makefile.am b/CEP/Calibration/BBSKernel/src/Makefile.am
deleted file mode 100644
index a636e7e2db3f1b3df0b4230cc44c3e9d02ab6b01..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/src/Makefile.am
+++ /dev/null
@@ -1,92 +0,0 @@
-#AM_CXXFLAGS = -Wno-ignored-qualifiers -Wconversion -Werror
-lib_LTLIBRARIES = libbbskernel.la \
-	element_beam_YATAWATTA_LBA_phi.la \
-	element_beam_YATAWATTA_LBA_theta.la \
-	element_beam_YATAWATTA_HBA_phi.la \
-	element_beam_YATAWATTA_HBA_theta.la
-
-element_beam_YATAWATTA_LBA_phi_la_SOURCES = Contrib/SBY_DipoleBeam/beam_dr_phi.c
-element_beam_YATAWATTA_LBA_phi_la_LDFLAGS = -module
-element_beam_YATAWATTA_LBA_theta_la_SOURCES = Contrib/SBY_DipoleBeam/beam_dr_theta.c
-element_beam_YATAWATTA_LBA_theta_la_LDFLAGS = -module
-element_beam_YATAWATTA_HBA_phi_la_SOURCES = Contrib/SBY_DipoleBeam/hba_beam_phi.c
-element_beam_YATAWATTA_HBA_phi_la_LDFLAGS = -module
-element_beam_YATAWATTA_HBA_theta_la_SOURCES = Contrib/SBY_DipoleBeam/hba_beam_theta.c
-element_beam_YATAWATTA_HBA_theta_la_LDFLAGS = -module
-
-coeffdir = $(datadir)
-dist_coeff_DATA = Contrib/JPH_DipoleBeam/element_beam_HAMAKER_LBA.coeff \
-		  Contrib/JPH_DipoleBeam/element_beam_HAMAKER_HBA.coeff
-
-libbbskernel_la_SOURCES = Package__Version.cc \
-	ElementBeamExpr.cc \
-	Equator.cc \
-	Evaluator.cc \
-	IonosphereExpr.cc \
-	Instrument.cc \
-	MeasurementAIPS.cc \
-	Model.cc \
-	ModelConfig.cc \
-	ParmManager.cc \
-	ParmProxy.cc \
-	Solver.cc \
-	SolverInterfaceTypes.cc \
-	VisData.cc \
-	VisDimensions.cc \
-	VisExpr.cc \
-	VisSelection.cc \
-	Expr/EquatorialCentroid.cc \
-	Expr/ArrayFactor.cc \
-	Expr/AzEl.cc \
-	Expr/Cache.cc \
-	Expr/ConditionNumber.cc \
-	Expr/Expr.cc \
-	Expr/ExprAdaptors.cc \
-	Expr/ExprParm.cc \
-	Expr/ExprValue.cc \
-	Expr/ExprValueView.cc \
-	Expr/ExprValueIterator.cc \
-	Expr/ExprVisData.cc \
-	Expr/ExternalFunction.cc \
-	Expr/FaradayRotation.cc \
-	Expr/FlagArray.cc \
-	Expr/GaussianCoherence.cc \
-	Expr/GaussianSource.cc \
-	Expr/HamakerDipole.cc \
-	Expr/Literal.cc \
-	Expr/LMN.cc \
-	Expr/Matrix.cc \
-	Expr/MatrixComplexArr.cc \
-	Expr/MatrixComplexSca.cc \
-	Expr/MatrixInverse.cc \
-	Expr/MatrixMul2.cc \
-	Expr/MatrixMul3.cc \
-	Expr/MatrixRealArr.cc \
-	Expr/MatrixRealSca.cc \
-	Expr/MatrixRep.cc \
-	Expr/MatrixSum.cc \
-	Expr/MatrixTmp.cc \
-	Expr/PhaseShift.cc \
-	Expr/PiercePoint.cc \
-	Expr/PointCoherence.cc \
-	Expr/PointSource.cc \
-	Expr/PolynomialLayer.cc \
-	Expr/Request.cc \
-	Expr/Resampler.cc \
-	Expr/ScalarMatrixMul.cc \
-	Expr/Scope.cc \
-	Expr/Source.cc \
-	Expr/SpectralIndex.cc \
-	Expr/StationShift.cc \
-	Expr/StationUVW.cc \
-	Expr/TileArrayFactor.cc \
-	Expr/ValueSet.cc \
-	Expr/YatawattaDipole.cc
-
-bin_PROGRAMS = versionbbskernel
-
-versionbbskernel_SOURCES      = versionbbskernel.cc
-versionbbskernel_LDADD        = libbbskernel.la
-versionbbskernel_DEPENDENCIES = libbbskernel.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSKernel/test/Makefile.am b/CEP/Calibration/BBSKernel/test/Makefile.am
deleted file mode 100644
index 06234db07243fa791563c89fb1da0c8e30a2bb4a..0000000000000000000000000000000000000000
--- a/CEP/Calibration/BBSKernel/test/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#check_PROGRAMS = tFillRow tJonesCMul3
-check_PROGRAMS = tFillRow
-
-tFillRow_SOURCES = tFillRow.cc
-tFillRow_DEPENDENCIES = ../src/libbbskernel.la $(LOFAR_DEPEND)
-
-#tJonesCMul3_SOURCES = tJonesCMul3.cc utils.cc
-#tJonesCMul3_DEPENDENCIES = ../src/libbbskernel.la $(LOFAR_DEPEND)
-
-LDADD				= ../src/libbbskernel.la
-
-#TESTS = tFillRow.sh tJonesCMul3.sh
-TESTS = tFillRow.sh
-
-EXTRA_DIST = $(TESTS)
-
-# Programs to run through supplied checktools
-#CHECKTOOLPROGS = tFillRow tJonesCMul3
-CHECKTOOLPROGS = tFillRow
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/lofarconf.in b/CEP/Calibration/lofarconf.in
deleted file mode 100644
index 0b1d0742e632ca9b475ee0c947d8b271330150d9..0000000000000000000000000000000000000000
--- a/CEP/Calibration/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-BBSControl
-BBSKernel
diff --git a/CEP/DP3/DPPP/DPPP.spec.in b/CEP/DP3/DPPP/DPPP.spec.in
deleted file mode 100644
index e18cec0f0dc59a09c6f1cc954978e39fab45eb2f..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/DPPP.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# DPPP.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: DPPP is a program to do processing for the offline pipeline
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl/~renting
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-DPPP More detailed desciprion will follow.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/CEP/DP3/DPPP/Makefile.am b/CEP/DP3/DPPP/Makefile.am
deleted file mode 100644
index f704a376822f7ac0f091a69272cef036206c5209..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS= \
-      --with-common=$(prefix) \
-      --with-aips++ 
-
-EXTRA_DIST = \
-      Makefile.common \
-      CS1_IDPPP.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/DPPP/bootstrap b/CEP/DP3/DPPP/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/DP3/DPPP/configure.in b/CEP/DP3/DPPP/configure.in
deleted file mode 100644
index 7b32c1974733bca966a66214241f6c13bf67107e..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(DPPP, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL(1)
-lofar_AIPSPP(1)
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h,,)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
-lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/DataHolder.h,,)
-lofar_INTERNAL(CEP/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
-lofar_INTERNAL(CEP/MS,MS,,1,MS/VdsMaker.h,bbms,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/DPPP/Makefile
-src/Makefile
-test/Makefile
-Makefile
-DPPP.spec
-)
diff --git a/CEP/DP3/DPPP/include/DPPP/Makefile.am b/CEP/DP3/DPPP/include/DPPP/Makefile.am
deleted file mode 100644
index 772952fe1ddc6e4b874e0f58c78d79a20cc52f75..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/include/DPPP/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-INSTHDRS = \
-		DPRun.h DPStep.h DPInput.h DPBuffer.h AverageInfo.h \
-		ProgressMeter.h FlagCounter.h \
-		UVWCalculator.h \
-		MSReader.h MSWriter.h MSUpdater.h \
-		Averager.h MedFlagger.h PreFlagger.h UVWFlagger.h \
-		FlaggerStatistics.h \
-		MsInfo.h \
-		MsFile.h \
-		ComplexMedianFlagger.h \
-		FrequencyFlagger.h \
-		ComplexMedianFlagger2.h \
-		MADFlagger.h \
-		BandpassCorrector.h \
-		DataSquasher.h \
-		DataBuffer.h \
-		TimeBuffer.h \
-		RunDetails.h \
-		Pipeline.h 
-
-NOINSTHDRS = PipelineProcessControl.h 
-
-TCCHDRS =
-
-pkginclude_HEADERS = Package__Version.h $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/DPPP/include/Makefile.am b/CEP/DP3/DPPP/include/Makefile.am
deleted file mode 100644
index 015a688fc1ed9cc67c87eda139070e57313bef53..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= DPPP
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/DPPP/src/Makefile.am b/CEP/DP3/DPPP/src/Makefile.am
deleted file mode 100644
index 551d42fb2674e61f56a19be4db22e5fc6bab6d7b..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/src/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-lib_LTLIBRARIES         = libdppp.la
-
-libdppp_la_SOURCES = Package__Version.cc  \
-		DPRun.cc DPStep.cc DPInput.cc DPBuffer.cc AverageInfo.cc \
-		ProgressMeter.cc FlagCounter.cc \
-		UVWCalculator.cc \
-		MSReader.cc MSWriter.cc MSUpdater.cc \
-		Averager.cc MedFlagger.cc PreFlagger.cc UVWFlagger.cc \
-		FlaggerStatistics.cc \
-		MsInfo.cc \
-		MsFile.cc \
-		ComplexMedianFlagger.cc \
-		FrequencyFlagger.cc \
-		ComplexMedianFlagger2.cc \
-		MADFlagger.cc \
-		BandpassCorrector.cc \
-		DataSquasher.cc \
-		DataBuffer.cc \
-		TimeBuffer.cc \
-		RunDetails.cc \
-		Pipeline.cc
-
-
-bin_PROGRAMS = versiondppp NDPPP IDPPP
-
-versiondppp_SOURCES      = versiondppp.cc
-versiondppp_LDADD        = libdppp.la
-versiondppp_DEPENDENCIES = libdppp.la $(LOFAR_DEPEND)
-
-NDPPP_SOURCES		= NDPPP.cc
-NDPPP_LDADD		= libdppp.la
-NDPPP_DEPENDENCIES	= libdppp.la $(LOFAR_DEPEND)
-
-IDPPP_SOURCES		= IDPPP.cc PipelineProcessControl.cc
-IDPPP_LDADD		= libdppp.la
-IDPPP_DEPENDENCIES	= libdppp.la $(LOFAR_DEPEND)
-
-pythondir = $(bindir)
-dist_python_SCRIPTS =
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = mwflagger mwflagger-part taqlflagger
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/DPPP/test/Makefile.am b/CEP/DP3/DPPP/test/Makefile.am
deleted file mode 100644
index a90f19473e5c7f5089abb1b6195a1dda04176555..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/test/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-check_PROGRAMS        = tMedian tMirror tAverager tMedFlagger \
-			tPreFlagger tUVWFlagger tNDPPP \
-			test_flaggers
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        = $(CHECK_PROGRAMS)
-#ENDCHECKTOOLPROGS
-
-# scripts used to run tests
-TESTSCRIPTS           = tMedian.sh tMirror.sh tAverager.sh tMedFlagger.sh \
-			tPreFlagger.sh tUVWFlagger.sh tNDPPP.sh \
-			test_flaggers.sh tmwflagger.sh
-
-# scripts and possible programs to run tests
-TESTS                 = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS) \
-			tmwflagger.run \
-			tmwflagger.in_cd tmwflagger.in_vd \
-			tmwflagger.parset tmwflagger.stdout
-
-# Lines to build a test program testprg
-tMedian_SOURCES                = tMedian.cc
-tMedian_LDADD                  = ../src/libdppp.la
-tMedian_DEPENDENCIES           = ../src/libdppp.la $(LOFAR_DEPEND)
-
-tMirror_SOURCES                = tMirror.cc
-tMirror_LDADD                  = ../src/libdppp.la
-tMirror_DEPENDENCIES           = ../src/libdppp.la $(LOFAR_DEPEND)
-
-tAverager_SOURCES              = tAverager.cc
-tAverager_LDADD                = ../src/libdppp.la
-tAverager_DEPENDENCIES         = ../src/libdppp.la $(LOFAR_DEPEND)
-
-tMedFlagger_SOURCES            = tMedFlagger.cc
-tMedFlagger_LDADD              = ../src/libdppp.la
-tMedFlagger_DEPENDENCIES       = ../src/libdppp.la $(LOFAR_DEPEND)
-
-tPreFlagger_SOURCES            = tPreFlagger.cc
-tPreFlagger_LDADD              = ../src/libdppp.la
-tPreFlagger_DEPENDENCIES       = ../src/libdppp.la $(LOFAR_DEPEND)
-
-tUVWFlagger_SOURCES            = tUVWFlagger.cc
-tUVWFlagger_LDADD              = ../src/libdppp.la
-tUVWFlagger_DEPENDENCIES       = ../src/libdppp.la $(LOFAR_DEPEND)
-
-tNDPPP_SOURCES                 = tNDPPP.cc
-tNDPPP_LDADD                   = ../src/libdppp.la
-tNDPPP_DEPENDENCIES	       = ../src/libdppp.la $(LOFAR_DEPEND)
-
-test_flaggers_SOURCES                = test_flaggers.cc
-test_flaggers_LDADD                  = ../src/libdppp.la
-test_flaggers_DEPENDENCIES           = ../src/libdppp.la $(LOFAR_DEPEND)
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/Makefile.am b/CEP/DP3/SPWCombine/Makefile.am
deleted file mode 100644
index 373b32360e537fdb94ea708ad658b12757227d6d..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS= \
-      --with-common=$(prefix) \
-      --with-aips++ 
-
-EXTRA_DIST = \
-      Makefile.common \
-      SPWCombine.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/SPWCombine.spec.in b/CEP/DP3/SPWCombine/SPWCombine.spec.in
deleted file mode 100644
index 53741048b1bf649bcef30f44fe823a0a231906a5..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/SPWCombine.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# SPWCombine.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: SPWCombine
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl/~renting
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-SPWCombine More detailed desciption will follow.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/CEP/DP3/SPWCombine/bootstrap b/CEP/DP3/SPWCombine/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/DP3/SPWCombine/configure.in b/CEP/DP3/SPWCombine/configure.in
deleted file mode 100644
index 63c3531ca2877edf01b4e16c05b8ca7aec7622e2..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/configure.in
+++ /dev/null
@@ -1,62 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(SPWCombine, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_LANG_CPLUSPLUS
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL(1)
-lofar_AIPSPP(1)
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
-lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/SPWCombine/Makefile
-src/Makefile
-test/Makefile
-Makefile
-SPWCombine.spec
-)
diff --git a/CEP/DP3/SPWCombine/include/Makefile.am b/CEP/DP3/SPWCombine/include/Makefile.am
deleted file mode 100644
index fbd47ad31a38b7a7fbeb4e3bf879df49b2b85399..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= SPWCombine
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/include/SPWCombine/Makefile.am b/CEP/DP3/SPWCombine/include/SPWCombine/Makefile.am
deleted file mode 100644
index cbb184b20a4158149adc3b3f9f9dfde824641e46..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/include/SPWCombine/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-pkginclude_HEADERS = CombinerProcessControl.h  \
-			  SPWCombine.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/src/Makefile.am b/CEP/DP3/SPWCombine/src/Makefile.am
deleted file mode 100644
index 21d25a0d43caeedb08d8ca43e5bf579dc3a47d0f..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/src/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-bin_PROGRAMS		= SPWCombine
-
-SPWCombine_SOURCES	= Combiner.cc \
-			  SPWCombine.cc \
-			  CombinerProcessControl.cc
-SPWCombine_LDADD	=
-SPWCombine_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/test/Makefile.am b/CEP/DP3/SPWCombine/test/Makefile.am
deleted file mode 100644
index 0bc52c83cdf7f49e8abf4d4e79867b0bdab292d5..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/test/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-# scripts used to run tests
-TESTSCRIPTS           =
-
-# scripts and possible programs to run tests
-TESTS                 = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS) SPWCombine.parset
-
-# Lines to build a test program testprg
-#testprg_SOURCES                = testprg.cc
-#testprg_LDADD                  = ../src/libcs1_inputsection.la
-#testprg_DEPENDENCIES           = ../src/libcs1_inputsection.la $(LOFAR_DEPEND)
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/lofarconf.in b/CEP/DP3/lofarconf.in
deleted file mode 100644
index b5dbadad2da5b2522e69479f322be38e7f39d2a0..0000000000000000000000000000000000000000
--- a/CEP/DP3/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-DPPP
-SPWCombine
diff --git a/CEP/Imager/LofarGridder/configure.in b/CEP/Imager/LofarGridder/configure.in
deleted file mode 100644
index 3ff368017df7113d03f827164263ae6b3066f033..0000000000000000000000000000000000000000
--- a/CEP/Imager/LofarGridder/configure.in
+++ /dev/null
@@ -1,67 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT()
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MWImager, 0.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(CEP/Imager/MWImager,MWImager,,1,MWImager/ConvertParset.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/MWImager/Makefile
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/CEP/Imager/MWControl/Makefile.am b/CEP/Imager/MWControl/Makefile.am
deleted file mode 100644
index a198cfccd166281321ae4f80b8e3f8e8d2b17a39..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWControl/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS       = src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Imager/MWControl/bootstrap b/CEP/Imager/MWControl/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWControl/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/Imager/MWControl/configure.in b/CEP/Imager/MWControl/configure.in
deleted file mode 100644
index eb87b9213d10fe60ced338ca2a8839d3b3f188e2..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWControl/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT()
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MWControl, 0.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(CEP/MWCommon,MWCommon,,1,MWCommon/MWConnection.h,,)
-lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Measurement.h,,)
-lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/MWControl/Makefile
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/CEP/Imager/MWControl/include/MWControl/Makefile.am b/CEP/Imager/MWControl/include/MWControl/Makefile.am
deleted file mode 100644
index 2808b9fb8cc119feb4e1d6f51d0e1037dce9e9b4..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWControl/include/MWControl/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-pkginclude_HEADERS	= Package__Version.h \
-MWGlobalSpec.h \
-MWLocalSpec.h \
-MWMultiSpec.h \
-MWParameterHandler.h \
-MWSpec.h \
-MWStrategySpec.h \
-PredifferBBS.h \
-PredifferProxy.h \
-SolverBBS.h \
-SolverProxy.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Imager/MWControl/include/Makefile.am b/CEP/Imager/MWControl/include/Makefile.am
deleted file mode 100644
index a5753eb36940e8a9d12b4e1dcc2954a53390ab5d..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWControl/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= MWControl
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Imager/MWControl/src/Makefile.am b/CEP/Imager/MWControl/src/Makefile.am
deleted file mode 100644
index f4eefd2e408087409c7eeeef1fecf78fecac332b..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWControl/src/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-lib_LTLIBRARIES		= libmwcontrol.la
-
-libmwcontrol_la_SOURCES	= Package__Version.cc \
-MWGlobalSpec.cc \
-MWLocalSpec.cc \
-MWMultiSpec.cc \
-MWParameterHandler.cc \
-MWSpec.cc \
-MWStrategySpec.cc \
-PredifferBBS.cc \
-PredifferProxy.cc \
-SolverBBS.cc \
-SolverProxy.cc
-
-bin_PROGRAMS 		= versionmwcontrol
-
-versionmwcontrol_SOURCES      = versionmwcontrol.cc
-versionmwcontrol_LDADD        = libmwcontrol.la
-versionmwcontrol_DEPENDENCIES = libmwcontrol.la $(LOFAR_DEPEND)
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Imager/MWControl/test/Makefile.am b/CEP/Imager/MWControl/test/Makefile.am
deleted file mode 100644
index a0b484775751bdc9b7bea0a0f5e6514af8ce0c01..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWControl/test/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-check_PROGRAMS	= tMWControl tMWSpec
-
-CHECKTOOLPROGS	= $(CHECK_PROGRAMS)
-
-TESTS		= tMWControl.sh tMWSpec.sh
-
-LDADD		= ../src/libmwcontrol.la 
-
-tMWControl_SOURCES 	= tMWControl.cc \
-			PredifferTest.cc SolverTest.cc MWStepTester.cc
-tMWControl_DEPENDENCIES = ../src/libmwcontrol.la $(LOFAR_DEPEND)
-
-tMWSpec_SOURCES 	= tMWSpec.cc
-tMWSpec_DEPENDENCIES	= ../src/libmwcontrol.la $(LOFAR_DEPEND)
-
-EXTRA_DIST	= MWStepTester.h PredifferTest.h SolverTest.h \
-		tMWControl.in tMWControl.in_ms \
-		tMWControl.in_mpi_out3 tMWControl.in_mpi_out4 \
-		tMWControl.run tMWControl.stdout \
-		tMWSpec.in tMWSpec.stdout
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/CEP/Imager/MWImager/Makefile.am b/CEP/Imager/MWImager/Makefile.am
deleted file mode 100644
index a33392dc9aa3f781ac6c5656143ed295275fd425..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWImager/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS       = include src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Imager/MWImager/bootstrap b/CEP/Imager/MWImager/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWImager/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/Imager/MWImager/configure.in b/CEP/Imager/MWImager/configure.in
deleted file mode 100644
index 714e82aba8f64b9ea1fd130aeb154c468bb83177..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWImager/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT()
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MWImager, 0.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(CEP/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
-lofar_INTERNAL(CEP/ParmDB,ParmDB,,1,ParmDB/ParmDB.h)
-lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Equator.h)
-
-lofar_AIPSPP(1,"-limages -lcomponents -lcoordinates -llattices -lfits -lms -lmeasures -ltables -lscimath -lscimath_f -lcasa -lmirlib -lwcs -lcfitsio")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/MWImager/Makefile
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/CEP/Imager/MWImager/include/MWImager/Makefile.am b/CEP/Imager/MWImager/include/MWImager/Makefile.am
deleted file mode 100644
index 22a51496e01d48927071bcc3317a7f7aaf172bae..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWImager/include/MWImager/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-pkginclude_HEADERS	= Package__Version.h \
-			  ConvertParset.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Imager/MWImager/include/Makefile.am b/CEP/Imager/MWImager/include/Makefile.am
deleted file mode 100644
index 0a70cf401e7826994d680b0c5772f3735cef2705..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWImager/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= MWImager
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Imager/MWImager/src/Makefile.am b/CEP/Imager/MWImager/src/Makefile.am
deleted file mode 100644
index ebfac44bfc5e7f7b878a6c2ec8cabb1583aa4ee2..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWImager/src/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-lib_LTLIBRARIES		= libmwimager.la
-
-libmwimager_la_SOURCES	= Package__Version.cc \
-			  ConvertParset.cc
-
-bin_PROGRAMS 		= versionmwimager \
-			  convertimagerparset \
-			  combineFacets
-
-convertimagerparset_SOURCES		= convertimagerparset.cc
-convertimagerparset_LDADD		= libmwimager.la
-convertimagerparset_DEPENDENCIES	= libmwimager.la $(LOFAR_DEPEND)
-
-combineFacets_SOURCES		= combineFacets.cc
-combineFacets_LDADD		= libmwimager.la
-combineFacets_DEPENDENCIES	= libmwimager.la $(LOFAR_DEPEND)
-
-versionmwimager_SOURCES      = versionmwimager.cc
-versionmwimager_LDADD        = libmwimager.la
-versionmwimager_DEPENDENCIES = libmwimager.la $(LOFAR_DEPEND)
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = mwimager mwimager-dd mwimager-dd-dppp \
-			mwimager-part mwimager-askap mwimager-casa \
-			makeCombinedImage-part
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/CEP/Imager/MWImager/test/Makefile.am b/CEP/Imager/MWImager/test/Makefile.am
deleted file mode 100644
index ae9e43cc3d4c6c78a96dbac93bd15670f0367433..0000000000000000000000000000000000000000
--- a/CEP/Imager/MWImager/test/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-CHECKTOOLPROGS	= tconvertimagerparset
-
-TESTS		= tconvertimagerparset.sh \
-		  tmwimager.sh  
-#tmwimager-dd.sh
-
-EXTRA_DIST	= tconvertimagerparset.run \
-		  tconvertimagerparset.in \
-		  tconvertimagerparset.stdout \
-		  tmwimager.run \
-		  tmwimager.in_cd tmwimager.in_vd \
-		  tmwimager.stdout
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/CEP/Imager/lofarconf.in b/CEP/Imager/lofarconf.in
deleted file mode 100644
index 7a1879fba9e99c44ed05eca73e98548269820ac9..0000000000000000000000000000000000000000
--- a/CEP/Imager/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-MWControl
-MWImager
diff --git a/CEP/MS/Makefile.am b/CEP/MS/Makefile.am
deleted file mode 100644
index 062b0b91ab1e3a38db85ee18282098aceea7e58e..0000000000000000000000000000000000000000
--- a/CEP/MS/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS       = include src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DOC_SUBDIRS   = src
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MS/bootstrap b/CEP/MS/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/CEP/MS/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/CEP/MS/configure.in b/CEP/MS/configure.in
deleted file mode 100644
index 09ef4fbebca2f2b9580c701793cbe45ac20eac4e..0000000000000000000000000000000000000000
--- a/CEP/MS/configure.in
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT()
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MS, 0.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl Checks for Python
-lofar_PYTHON
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_MPI
-lofar_AIPSPP(1,"-lms -lmeasures -ltables -lscimath -lscimath_f -lcasa")
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(CEP/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/MS/Makefile
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/CEP/MS/include/MS/Makefile.am b/CEP/MS/include/MS/Makefile.am
deleted file mode 100644
index 3e824c8abdca073dc69878bec5553a00517fa8c1..0000000000000000000000000000000000000000
--- a/CEP/MS/include/MS/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pkginclude_HEADERS	= Package__Version.h \
-			  VdsMaker.h
-
-noinst_HEADERS		= MSCreate.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MS/include/Makefile.am b/CEP/MS/include/Makefile.am
deleted file mode 100644
index 9ee0b9711ea46a9acbaf4f9e9de1def92cf5d33e..0000000000000000000000000000000000000000
--- a/CEP/MS/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= MS
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MS/src/Makefile.am b/CEP/MS/src/Makefile.am
deleted file mode 100644
index b0d4feed6cad26397f8eb697e0f064c592c1c045..0000000000000000000000000000000000000000
--- a/CEP/MS/src/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-lib_LTLIBRARIES		= libbbms.la
-
-libbbms_la_SOURCES	= Package__Version.cc  \
-			  MSCreate.cc \
-			  VdsMaker.cc
-
-bin_PROGRAMS 		= versionms MSSplit \
-			  makevds \
-			  combinevds \
-			  makems \
-			  msplay
-
-MSSplit_SOURCES		= MSSplit.cc
-MSSplit_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-makevds_SOURCES		= makevds.cc
-makevds_LDADD		= libbbms.la
-makevds_DEPENDENCIES	= libbbms.la $(LOFAR_DEPEND)
-
-combinevds_SOURCES	= combinevds.cc
-combinevds_LDADD	= libbbms.la
-combinevds_DEPENDENCIES	= libbbms.la $(LOFAR_DEPEND)
-
-makems_SOURCES		= makems.cc
-makems_LDADD		= libbbms.la
-makems_DEPENDENCIES	= libbbms.la $(LOFAR_DEPEND)
-
-msplay_SOURCES		= msplay.cc
-msplay_LDADD		= libbbms.la
-msplay_DEPENDENCIES	= libbbms.la $(LOFAR_DEPEND)
-
-glishdir		= $(libexecdir)/glish
-dist_glish_SCRIPTS	= mssplit.g statconv.g
-
-scriptdir		= $(bindir)
-dist_script_SCRIPTS	= mssplit makemsdistr makemsdistr-part
-
-versionms_SOURCES      = versionms.cc
-versionms_LDADD        = libbbms.la
-versionms_DEPENDENCIES = libbbms.la $(LOFAR_DEPEND)
-
-#lofarpython_PYTHON	= flagger.py
-#lofarpythondir		= $(pythondir)/lofar
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MS/test/Makefile.am b/CEP/MS/test/Makefile.am
deleted file mode 100644
index f03f92518a61049801d594148dd980937fd79cc0..0000000000000000000000000000000000000000
--- a/CEP/MS/test/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-check_PROGRAMS		= tMSSplit
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS		= tMSSplit
-
-TESTS			= tMSSplit.sh tcombinevds.sh tmakems.sh
-
-tMSSplit_SOURCES	= tMSSplit.cc
-tMSSplit_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-EXTRA_DIST	= tcombinevds.run tcombinevds.stdout \
-		  tcombinevds.in_vds1 tcombinevds.in_vds2 \
-		  tmakems.run tmakems.parset tmakems.stdout \
-		  tmakems.in_antenna.tgz 
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/CEP/MWCommon/Makefile.am b/CEP/MWCommon/Makefile.am
deleted file mode 100644
index a198cfccd166281321ae4f80b8e3f8e8d2b17a39..0000000000000000000000000000000000000000
--- a/CEP/MWCommon/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS       = src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MWCommon/bootstrap b/CEP/MWCommon/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/CEP/MWCommon/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/CEP/MWCommon/configure.in b/CEP/MWCommon/configure.in
deleted file mode 100644
index 72d9f212dcf222c6a120bea2044d61bcc6ff9400..0000000000000000000000000000000000000000
--- a/CEP/MWCommon/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT()
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MWCommon, 0.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_AIPSPP(1,"-lcasa")
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/MWCommon/Makefile
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/CEP/MWCommon/include/MWCommon/Makefile.am b/CEP/MWCommon/include/MWCommon/Makefile.am
deleted file mode 100644
index 08390d105ce1c0d0256a7f2eef798d92bca8e597..0000000000000000000000000000000000000000
--- a/CEP/MWCommon/include/MWCommon/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-pkginclude_HEADERS	= Package__Version.h \
-ClusterDesc.h \
-ControllerBase.h \
-Controller.h \
-DomainShape.h \
-MPIConnection.h \
-MPIConnectionSet.h \
-MWBlobIO.h \
-MWConnection.h \
-MWConnectionSet.h \
-MWError.h \
-MWGlobalStep.h \
-MWIos.h \
-MWLocalStep.h \
-MWMultiStep.h \
-MWStep.h \
-MWStepFactory.h \
-MWStepVisitor.h \
-MasterControl.h \
-MemConnection.h \
-MemConnectionSet.h \
-NodeDesc.h \
-ObsDomain.h \
-ParameterHandler.h \
-SocketConnection.h \
-SocketConnectionSet.h \
-SocketListener.h \
-VdsDesc.h \
-VdsPartDesc.h \
-WorkDomainSpec.h \
-WorkerControl.h \
-WorkerFactory.h \
-WorkerInfo.h \
-WorkerProxy.h \
-WorkersDesc.h 
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MWCommon/include/Makefile.am b/CEP/MWCommon/include/Makefile.am
deleted file mode 100644
index baddbaf3fce5f3a5bde0263f3ebb611768493508..0000000000000000000000000000000000000000
--- a/CEP/MWCommon/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= MWCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MWCommon/src/Makefile.am b/CEP/MWCommon/src/Makefile.am
deleted file mode 100644
index 67a3be0e5e18fa9e35fc358071b491dc571056e4..0000000000000000000000000000000000000000
--- a/CEP/MWCommon/src/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-lib_LTLIBRARIES		= libmwcommon.la
-
-libmwcommon_la_SOURCES	= Package__Version.cc \
-ClusterDesc.cc \
-ControllerBase.cc \
-DomainShape.cc \
-MPIConnection.cc \
-MPIConnectionSet.cc \
-MWBlobIO.cc \
-MWConnection.cc \
-MWConnectionSet.cc \
-MWGlobalStep.cc \
-MWIos.cc \
-MWLocalStep.cc \
-MWMultiStep.cc \
-MWStep.cc \
-MWStepFactory.cc \
-MWStepVisitor.cc \
-MasterControl.cc \
-MemConnection.cc \
-MemConnectionSet.cc \
-NodeDesc.cc \
-ObsDomain.cc \
-ParameterHandler.cc \
-SocketConnection.cc \
-SocketConnectionSet.cc \
-SocketListener.cc \
-VdsDesc.cc \
-VdsPartDesc.cc \
-WorkDomainSpec.cc \
-WorkerControl.cc \
-WorkerFactory.cc \
-WorkerInfo.cc \
-WorkerProxy.cc \
-WorkersDesc.cc
-
-bin_PROGRAMS 		= versionmwcommon finddproc showclusterdesc
-
-versionmwcommon_SOURCES      = versionmwcommon.cc
-versionmwcommon_LDADD        = libmwcommon.la
-versionmwcommon_DEPENDENCIES = libmwcommon.la $(LOFAR_DEPEND)
-
-finddproc_SOURCES      = finddproc.cc
-finddproc_LDADD        = libmwcommon.la
-finddproc_DEPENDENCIES = libmwcommon.la $(LOFAR_DEPEND)
-
-showclusterdesc_SOURCES      = showclusterdesc.cc
-showclusterdesc_LDADD        = libmwcommon.la
-showclusterdesc_DEPENDENCIES = libmwcommon.la $(LOFAR_DEPEND)
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = rundist rundist-part startdistproc socketrun runlogpid
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/MWCommon/test/Makefile.am b/CEP/MWCommon/test/Makefile.am
deleted file mode 100644
index cc8b0309aa3f5a44c7de48dcc1112b535b531a4a..0000000000000000000000000000000000000000
--- a/CEP/MWCommon/test/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-check_PROGRAMS	= tClusterDesc tNodeDesc tVdsDesc tVdsPartDesc tWorkersDesc \
-		  tSocketConnection tSocketConnectionSet tstartdproc
-
-CHECKTOOLPROGS	= $(CHECK_PROGRAMS)
-
-TESTS		= tClusterDesc.sh tNodeDesc.sh tVdsDesc.sh tVdsPartDesc.sh \
-		  tWorkersDesc.sh \
-		  tSocketConnection.sh tSocketConnectionSet.sh \
-		  tfinddproc.sh tstartdproc.sh trundist.sh
-
-LDADD		= ../src/libmwcommon.la 
-
-tClusterDesc_SOURCES 	  = tClusterDesc.cc
-tClusterDesc_DEPENDENCIES = ../src/libmwcommon.la $(LOFAR_DEPEND)
-
-tNodeDesc_SOURCES 	  = tNodeDesc.cc
-tNodeDesc_DEPENDENCIES	  = ../src/libmwcommon.la $(LOFAR_DEPEND)
-
-tVdsDesc_SOURCES 	  = tVdsDesc.cc
-tVdsDesc_DEPENDENCIES	  = ../src/libmwcommon.la $(LOFAR_DEPEND)
-
-tVdsPartDesc_SOURCES 	  = tVdsPartDesc.cc
-tVdsPartDesc_DEPENDENCIES = ../src/libmwcommon.la $(LOFAR_DEPEND)
-
-tWorkersDesc_SOURCES 	  = tWorkersDesc.cc
-tWorkersDesc_DEPENDENCIES = ../src/libmwcommon.la $(LOFAR_DEPEND)
-
-tSocketConnection_SOURCES 	  = tSocketConnection.cc
-tSocketConnection_DEPENDENCIES	  = ../src/libmwcommon.la $(LOFAR_DEPEND)
-
-tSocketConnectionSet_SOURCES 	  = tSocketConnectionSet.cc
-tSocketConnectionSet_DEPENDENCIES = ../src/libmwcommon.la $(LOFAR_DEPEND)
-
-tstartdproc_SOURCES 	  = tstartdproc.cc
-
-EXTRA_DIST	= tSocketConnection.run tSocketConnection.stdout \
-		  tfinddproc.in_vd tfinddproc.in_cd \
-		  tfinddproc.run tfinddproc.stdout 
-		  tstartdproc.in_vd tstartdproc.in_cd tstartdproc.in_cd1 \
-		  tstartdproc.run tstartdproc.in_run tstartdproc.stdout 
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/CEP/ParmDB/Makefile.am b/CEP/ParmDB/Makefile.am
deleted file mode 100644
index bf84a6a7cfed07a3c0531c8148048f2522f75bb4..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      ParmDB.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/ParmDB/ParmDB.spec.in b/CEP/ParmDB/ParmDB.spec.in
deleted file mode 100644
index 1c71321dc94355cadcac40b8850df9888998e047..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/ParmDB.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# ParmDB.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: ParmDB is the Paramater Data Base
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-ParmDB is the module containing the classes and functions to handle the
-parameters in the Parameter Data Base. The data base type used is hidden
-from the user.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/CEP/ParmDB/bootstrap b/CEP/ParmDB/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/CEP/ParmDB/configure.in b/CEP/ParmDB/configure.in
deleted file mode 100644
index 98fb7267aab8984b89a9901fa9674b51129c405e..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/configure.in
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ParmDB, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(CEP/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h)
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_AIPSPP(1,"-ltables -lcasa")
-
-lofar_EXTERNAL(boost,1,boost/preprocessor/repetition.hpp,"")
-dnl lofar_EXTERNAL(pgsql,0,pgsql/libpq-fe.h,pq)
-dnl lofar_EXTERNAL(pqxx,0,pqxx/pqxx, pqxx)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/ParmDB/Makefile
-src/Makefile
-test/Makefile
-Makefile
-ParmDB.spec
-)
diff --git a/CEP/ParmDB/include/Makefile.am b/CEP/ParmDB/include/Makefile.am
deleted file mode 100644
index 9cfb0c42b1c32ede4382f29209843051a048a918..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= ParmDB
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/ParmDB/include/ParmDB/Makefile.am b/CEP/ParmDB/include/ParmDB/Makefile.am
deleted file mode 100644
index 6545e990c9454d20321ba389028dca289d77363d..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/include/ParmDB/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-INSTHDRS = \
-Axis.h AxisMapping.h Box.h Grid.h \
-ParmValue.h ParmSet.h ParmMap.h ParmCache.h \
-ParmDBMeta.h ParmDB.h ParmDBCasa.h ParmDBLocker.h \
-Parm.h \
-ParmFacadeRep.h ParmFacadeLocal.h ParmFacadeDistr.h ParmFacade.h \
-SourceInfo.h SourceDB.h SourceDBCasa.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-pkginclude_HEADERS = Package__Version.h  $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/ParmDB/src/Makefile.am b/CEP/ParmDB/src/Makefile.am
deleted file mode 100644
index 861f74c57fb6af85741d98ad2a6e341f60ec1d5a..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/src/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-lib_LTLIBRARIES         = libparmdb.la
-
-libparmdb_la_SOURCES = Package__Version.cc  \
-Axis.cc AxisMapping.cc Box.cc Grid.cc \
-ParmValue.cc ParmSet.cc ParmMap.cc ParmCache.cc \
-ParmDBMeta.cc ParmDB.cc ParmDBCasa.cc ParmDBLocker.cc \
-Parm.cc \
-ParmFacadeRep.cc ParmFacadeLocal.cc ParmFacadeDistr.cc ParmFacade.cc \
-SourceDB.cc SourceDBCasa.cc
-#ParmDBPostgres.cc ParmDBPostgresTransactors.cc
-
-
-# AM_YFLAGS               = -d -p KeyParse
-# AM_LFLAGS               = -PKeyTokenize
-# LEX_OUTPUT_ROOT         = lex.KeyTokenize
-
-bin_PROGRAMS = versionparmdb \
-		parmdbm parmdbremote makesourcedb
-
-parmdbm_SOURCES			= parmdbm.cc
-parmdbm_LDADD			= libparmdb.la
-parmdbm_DEPENDENCIES		= libparmdb.la $(LOFAR_DEPEND)
-
-parmdbremote_SOURCES		= parmdbremote.cc
-parmdbremote_LDADD		= libparmdb.la
-parmdbremote_DEPENDENCIES	= libparmdb.la $(LOFAR_DEPEND)
-
-makesourcedb_SOURCES		= makesourcedb.cc
-makesourcedb_LDADD		= libparmdb.la
-makesourcedb_DEPENDENCIES	= libparmdb.la $(LOFAR_DEPEND)
-
-pythondir = $(bindir)
-dist_python_SCRIPTS = 
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS =	setupparmdb setupparmdb-part \
-			setupsourcedb setupsourcedb-part \
-			startparmdbdistr parmdbremote-scr
-
-versionparmdb_SOURCES      = versionparmdb.cc
-versionparmdb_LDADD        = libparmdb.la
-versionparmdb_DEPENDENCIES = libparmdb.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/ParmDB/test/Makefile.am b/CEP/ParmDB/test/Makefile.am
deleted file mode 100644
index 8af33c84c2759d01c4ef13db1943a1fec413db1d..0000000000000000000000000000000000000000
--- a/CEP/ParmDB/test/Makefile.am
+++ /dev/null
@@ -1,89 +0,0 @@
-check_PROGRAMS        = tAxis tAxisMapping tBox tGrid \
-			tParmValue tParmDBCasa \
-			tParmSet tParmCache tParm tParmFacade \
-			tSourceDBCasa tTimeAxis
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        = $(check_PROGRAMS)
-
-# scripts used to run tests
-TESTSCRIPTS           = tAxis.sh tAxisMapping.sh tBox.sh tGrid.sh \
-			tParmValue.sh tParmDBCasa.sh \
-			tParmSet.sh tParmCache tParm.sh \
-			tParmFacade.sh  \
-			tparmdb.sh \
-			tSourceDBCasa.sh tmakesourcedb.sh \
-			tsetupparmdb.sh tsetupsourcedb.sh \
-			tTimeAxis.sh
-
-# scripts and possible programs to run tests
-TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-tAxis_SOURCES			= tAxis.cc
-tAxis_LDADD			= ../src/libparmdb.la
-tAxis_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tAxisMapping_SOURCES		= tAxisMapping.cc
-tAxisMapping_LDADD		= ../src/libparmdb.la
-tAxisMapping_DEPENDENCIES	= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tBox_SOURCES			= tBox.cc
-tBox_LDADD			= ../src/libparmdb.la
-tBox_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tGrid_SOURCES			= tGrid.cc
-tGrid_LDADD			= ../src/libparmdb.la
-tGrid_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tParmValue_SOURCES		= tParmValue.cc
-tParmValue_LDADD		= ../src/libparmdb.la
-tParmValue_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tParmDBCasa_SOURCES		= tParmDBCasa.cc
-tParmDBCasa_LDADD		= ../src/libparmdb.la
-tParmDBCasa_DEPENDENCIES	= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tParmSet_SOURCES		= tParmSet.cc
-tParmSet_LDADD			= ../src/libparmdb.la
-tParmSet_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tParmCache_SOURCES		= tParmCache.cc
-tParmCache_LDADD		= ../src/libparmdb.la
-tParmCache_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tParm_SOURCES			= tParm.cc
-tParm_LDADD			= ../src/libparmdb.la
-tParm_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tParmFacade_SOURCES		= tParmFacade.cc
-tParmFacade_LDADD		= ../src/libparmdb.la
-tParmFacade_DEPENDENCIES	= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tSourceDBCasa_SOURCES		= tSourceDBCasa.cc
-tSourceDBCasa_LDADD		= ../src/libparmdb.la
-tSourceDBCasa_DEPENDENCIES	= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-tTimeAxis_SOURCES		= tTimeAxis.cc
-tTimeAxis_LDADD			= ../src/libparmdb.la
-tTimeAxis_DEPENDENCIES		= ../src/libparmdb.la $(LOFAR_DEPEND)
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS) \
-			tparmdb.run tparmdb.in tparmdb.stdout \
-			tParmFacade.run tParmFacade.stdout \
-			tParmFacadeDistr.run tParmFacadeDistr.stdout \
-			tmakesourcedb.run tmakesourcedb.in \
-			tmakesourcedb.in_2 tmakesourcedb.stdout \
-			tsetupparmdb.run \
-			tsetupparmdb.in_cd tsetupparmdb.in_gds \
-			tsetupparmdb.in_ms0.vds tsetupparmdb.in_ms1.vds \
-			tsetupparmdb.in_ms2.vds
-			tsetupsourcedb.run tsetupsourcedb.in \
-			tsetupsourcedb.in_cd tsetupsourcedb.in_gds \
-			tsetupsourcedb.in_ms0.vds tsetupsourcedb.in_ms1.vds \
-			tsetupsourcedb.in_ms2.vds
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Pipeline/Makefile.am b/CEP/Pipeline/Makefile.am
deleted file mode 100644
index 1524d1c96d14e0b9fe22e210c9b584e6fb65e59d..0000000000000000000000000000000000000000
--- a/CEP/Pipeline/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = Core library 
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-EXTRA_DIST = Makefile.common
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/Pipeline/bootstrap b/CEP/Pipeline/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/CEP/Pipeline/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/CEP/Pipeline/configure.in b/CEP/Pipeline/configure.in
deleted file mode 100644
index 5cff80328339e21ba34f796991e1ce022c85643f..0000000000000000000000000000000000000000
--- a/CEP/Pipeline/configure.in
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-
-dnl Not really necessary (we have no C sources), but autoconf requires it
-AC_CONFIG_HEADERS(config.h)
-
-dnl Needed by automake (e.g. for make dist)
-AM_INIT_AUTOMAKE(Pipeline, 0.1, no-define)
-
-dnl This is only needed because bootstrap issues a libtoolize command
-AC_PROG_LIBTOOL
-
-dnl Check for Python
-AM_PATH_PYTHON
-
-dnl Check for LOFAR specific things
-lofar_INIT
-lofar_INTERNAL(LCS/pytools,pytools,,,,"")
-
-dnl Output Makefiles
-AC_OUTPUT(
-Core/Makefile
-library/Makefile
-Makefile)
diff --git a/CEP/Pipeline/library/Makefile.am b/CEP/Pipeline/library/Makefile.am
deleted file mode 100644
index a6a4d48d12ccd35a23c27164a29db749e1ba0709..0000000000000000000000000000000000000000
--- a/CEP/Pipeline/library/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# This will install .py files into $(bindir) with their execute bit set.
-bin_SCRIPTS	= dppp_node.py \
-		  DPPP.py \
-		  MakeVDS.py \
-		  MWImager.py \
-		  StandardImagingPipeline.py
-
-# This will install .py, .pyc, and .pyo files into the site-packages directory.
-pypkgdir	= $(pythondir)/lofar/pipeline
-pypkg_PYTHON	= __init__.py \
-		  Observation.py \
-		  sysconfig.py
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/lofarconf.in b/CEP/lofarconf.in
deleted file mode 100644
index 1b7c81e38e8a7066929dc7ccbf3904808158aac7..0000000000000000000000000000000000000000
--- a/CEP/lofarconf.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Calibration
-DP3
-Imager
-MS
-MWCommon
-ParmDB
-Pipeline
-pyparmdb
diff --git a/CEP/pyparmdb/Makefile.am b/CEP/pyparmdb/Makefile.am
deleted file mode 100644
index 2cec4d9a6908323248676f5d6953297792730e92..0000000000000000000000000000000000000000
--- a/CEP/pyparmdb/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      pyparmdb.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/pyparmdb/bootstrap b/CEP/pyparmdb/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/CEP/pyparmdb/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/CEP/pyparmdb/configure.in b/CEP/pyparmdb/configure.in
deleted file mode 100644
index e19602c36337fa0a3aa1a4b8b417ac0dedda6936..0000000000000000000000000000000000000000
--- a/CEP/pyparmdb/configure.in
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(pyparmdb, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-dnl AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl Checks for Python
-lofar_PYTHON
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(CEP/ParmDB,ParmDB,,1,ParmDB/ParmDB.h)
-lofar_INTERNAL(CEP/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h)
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h)
-lofar_INTERNAL(LCS/pytools,pytools,,,,"")
-
-lofar_EXTERNAL(pyrap,1,pyrap/Converters/PycBasicData.h)
-lofar_AIPSPP(1,"-ltables -lscimath -lscimath_f -lcasa")
-lofar_EXTERNAL(boost,1,boost/python.hpp,boost_python)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-pyparmdb.spec
-)
diff --git a/CEP/pyparmdb/pyparmdb.spec.in b/CEP/pyparmdb/pyparmdb.spec.in
deleted file mode 100644
index 1b02f040326cda671f556fdea1d94282fdc797b5..0000000000000000000000000000000000000000
--- a/CEP/pyparmdb/pyparmdb.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# pyparmdb.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: pyparmdb is the pyton access layer to the Parameter Data Base
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-pyparmdb is the pyton access layer to the Parameter Data Base
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/CEP/pyparmdb/src/Makefile.am b/CEP/pyparmdb/src/Makefile.am
deleted file mode 100644
index c089a076deeb05d4590d6ae05c6f9cc8b5784046..0000000000000000000000000000000000000000
--- a/CEP/pyparmdb/src/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-lib_LTLIBRARIES         = _parmdb.la
-
-_parmdb_la_SOURCES	= pyparmdb.cc
-# Needed for non-standard library name (i.e. not lib...)
-_parmdb_la_LDFLAGS	= -module
-_parmdb_la_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-lofarpython_PYTHON	= __init__.py
-lofarpythondir		= $(pythondir)/lofar/parmdb
-libdir			= $(lofarpythondir)
-
-bin_PROGRAMS = versionpyparmdb
-
-versionpyparmdb_SOURCES      = versionpyparmdb.cc Package__Version.cc
-versionpyparmdb_DEPENDENCIES = $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/pyparmdb/test/Makefile.am b/CEP/pyparmdb/test/Makefile.am
deleted file mode 100644
index c368efcbbdc81a4253f801b246ebedf69d3d7cbd..0000000000000000000000000000000000000000
--- a/CEP/pyparmdb/test/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# scripts used to run tests
-TESTSCRIPTS           = tpyparmdb.sh
-
-# scripts and possible programs to run tests
-TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS) \
-			tpyparmdb.run tpyparmdb.py
-			tpyparmdb.in tpyparmdb.stdout	
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/pyparmdb/test/tpyparmdb.sh b/CEP/pyparmdb/test/tpyparmdb.sh
index 77ad095e62d87fd203eac84eea2a6598acc7f96b..e535825e0ff8bc796eef907aa9f20af696ab39b7 100755
--- a/CEP/pyparmdb/test/tpyparmdb.sh
+++ b/CEP/pyparmdb/test/tpyparmdb.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-./runctest.sh -pythonpkg parmdb tpyparmdb > tpyparmdb.log 2>&1
+./runctest.sh tpyparmdb > tpyparmdb.log 2>&1
diff --git a/CMake/LofarCTest.cmake b/CMake/LofarCTest.cmake
index 05aa23727dacfeac9930ae82ead1f496be2456b0..c93f627a81939c9e38ba79a255610e957be0d2f9 100644
--- a/CMake/LofarCTest.cmake
+++ b/CMake/LofarCTest.cmake
@@ -31,5 +31,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 ## ----------------------------------------------------------------------------
 ## Configure the LOFAR CTest wrapper script in the current binary directory
 ## ----------------------------------------------------------------------------
-configure_file(${LOFAR_ROOT}/autoconf_share/runctest.sh.in
+configure_file(${LOFAR_ROOT}/CMake/testscripts/runctest.sh.in
                ${CMAKE_CURRENT_BINARY_DIR}/runctest.sh)
diff --git a/CMake/makeCMakeCache b/CMake/makeCMakeCache
deleted file mode 100755
index 5d4d9388415b423b2982072fc83e30bf98bdafbd..0000000000000000000000000000000000000000
--- a/CMake/makeCMakeCache
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# makeCMakeCache: create a CMakeCache file for the packages to be built
-#
-#  Copyright (C) 2009
-#  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#  $Id$
-
-
-# This script is used by dorubbuild to create an initial CMakeCache.
-#
-# Run as:   makeCMakeCache sourceroot lofarconf_file outfile
-# E.g.      makeCMakeCache ~/LOFAR ~/LOFAR/lofarconf.in.private CMakeCache
-
-if test $# != 4; then
-  echo "Run as:   makeCMakeCache sourceroot lofarconf_file buildtest outfile"
-  exit 1
-fi
-
-# Create output file.
-rm -f $4
-touch $4
-
-# Find the packages to be built.
-pkgs=
-if test "$2" != ""; then
-  for PKG in `sed -e 's/ //g' $2`
-  do
-    pkg=`echo $PKG | sed -e 's/#.*//' | sed -e 's%/% %g'`
-    pkgs="$pkgs $pkg"
-  done
-fi
-
-# Loop through all packages in the source tree and set to OFF except for
-# the ones to be built.
-# A package is a directory with a CMakeLists.txt containing a lofar package line.
-for FIL in `find $1 -name CMakeLists.txt`
-do
-  egrep lofar_\(add_\)?package $FIL > /dev/null 2>&1
-  if test $? = 0; then
-    pkg=`dirname $FIL | sed -e s"%.*/%%"`
-    if test "$pkg" != ""  -a  "$pkg" != "."; then
-      opt=OFF
-      for p in $pkgs
-      do
-        if test "$p" = "$pkg"; then
-          opt=ON
-          break
-        fi
-      done
-      echo "//Build package $pkg?" >> $4
-      echo "BUILD_$pkg:BOOL=$opt" >> $4
-      echo "" >> $4
-    fi
-  fi
-done
-
-# Optionally build test programs.
-btest=ON
-test $3 = 1  ||  btest=OFF
-echo "//Build the testing tree?" >> $4
-echo "BUILD_TESTING:BOOL=$btest" >> $4
-echo "" >> $4
-# LOFAR needs to be built.
-echo "//Build packageLOFAR?." >> $4
-echo "BUILD_LOFAR:BOOL=ON" >> $4
-echo "" >> $4
-
-exit 0
diff --git a/CMake/testscripts/assay b/CMake/testscripts/assay
new file mode 100755
index 0000000000000000000000000000000000000000..ada76e728a08a85ce585531b28d9e9b1f68ce242
--- /dev/null
+++ b/CMake/testscripts/assay
@@ -0,0 +1,282 @@
+#!/bin/sh
+#
+# assay: Invoke a test program and verify its output
+#
+#  Copyright (C) 2001
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#  $Id: assay 14252 2009-10-13 12:14:53Z loose $
+
+
+#-----------------------------------------------------------------------------
+# Usage: assay <testexe> <max run-time(sec)> <precision> <needoutfil> [<arguments>]
+#-----------------------------------------------------------------------------
+# This script is an adapted version of the AIPS++ assay script.
+#
+# assay invokes a test program. If the test program has an associated
+# .run file then it simply invokes it. Otherwise assay invokes the test
+# executable directly.
+#
+# assay redirects the output of program or .run file to a temporary file
+# and compare it with a corresponding .stdout file (if present) using diff.
+# (Note: assay will flag the absence of a .stdout file as an error, when 
+# your program or .run file returns with an exit status 2.)
+# Parts of the output can be skipped using special markers (>>> and <<<).
+# If the out files are different, it tries to find out if they match
+# by comparing numbers with the given precision (e.g. 1e-5) using:
+#    abs(a1-a2) <= precision * max(abs(a1),abs(a2))
+#
+# example:
+#
+# >>>
+# This total line will be skipped
+# <<<
+#
+# Only >>>this<<< will be skipped 
+#
+#
+#
+# A .run file is necessary in the following cases:
+# 1. There are other input files. In that case the .run file should
+#    copy those files to the working directory. If needed, it should
+#    guard against the case where the working directory is already the
+#    directory containing the input files.
+# 2. There are multiple output files that should be compared.
+# 3. The test program has to be run multiple times with various arguments.
+# Note that the .run file can be executed from the source directory
+# or from the machine/test directory.
+#
+# An example t_fft.run file could look like:
+#
+#  #!/bin/sh
+#
+#  # Get working directory.
+#  wdir=`pwd`
+#  # Get source directory (by removing trailing part like /dop08/test).
+#  sdir=`pwd | sed 's#/[^/]*/test$##'`
+#  echo $wdir
+#  echo $sdir
+#  # Copy input files (actually, guard is not needed in this case).
+#  if [ "$wdir" != "$sdir/BASELINE" ]
+#  then
+#    cp $sdir/BASELINE/*.coef .
+#  fi
+#  # Execute the program.
+#  t_fft
+#  STATUS=$?
+#  if [ $STATUS ]
+#  then
+#    # Do a difference of all output files.
+#    mdiff *.stdout $sdir/BASELINE
+#    STATUS=$?
+#  fi
+#  # Remove the files created.
+#  if [ "$wdir" != "$sdir/BASELINE" ]
+#  then
+#    \rm -f  *.coef
+#  fi
+#  # Remove .stdout files only if succesfully ended.
+#  if [ $STATUS ]
+#  then
+#    \rm -f *.stdout*
+#  fi
+#  exit $STATUS
+##########################################################
+#
+# Options:
+#   none
+#
+# Status returns:
+#    0:  success
+#    1:  test execution failed
+#    2:  test output disagreement
+#   77:  untested (conforming make check) (3 is returned from a .run)
+#  130:  interrupt
+#
+# Notes:
+#    1) It is assumed that the test executable exists in the working directory.
+#
+# Original: 1995/11/01 by Mark Calabretta, ATNF
+#
+#=============================================================================
+
+# CHECKTOOL is a Make option that contains the checktoolcommand. To be able to 
+# insert the program name into the options (for logfile naming for example)
+# a [PROGNAME] can be inserted into the call, this will be substituted by the
+# program name.
+#
+# For example:
+#  make check CHECKTOOL='valgrind --tool=memcheck \
+#                                 --num-callers=50 \
+#                                 --workaround-gcc296-bugs=yes \
+#                                 --leak-check=yes \
+#                                 --track-fds=yes \
+#                                 --logfile=[PROGNAME]_valgrind'
+
+  if test $# -lt 3; then
+    echo "usage: assay <testexe> <max run-time(sec)> <precision> [<arguments>]"
+    exit 1
+  fi
+
+  PROG=$1
+  shift
+  MAXTIME=$1
+  shift
+  PREC=$1
+  shift
+  NEEDOUTFIL=$1
+  shift
+
+# Use LimitExec if possible and available.
+  LOFAR_LIMITEXEC=
+  if [ -x $LOFARROOT/bin/LimitExec ]
+  then
+    LOFAR_LIMITEXEC="$LOFARROOT/bin/LimitExec"
+  elif [ -x $lfr_script_dir/limitexec.sh ]
+  then
+    LOFAR_LIMITEXEC="$lfr_script_dir/limitexec.sh"
+  fi
+  export LOFAR_LIMITEXEC
+  if [ "$LOFAR_LIMITEXEC" != "" ]
+  then
+    CMDPREFIX="$LOFAR_LIMITEXEC $MAXTIME"
+  fi
+
+# Initialize the command to be executed.
+  COMMAND="$CMDPREFIX ./$PROG"
+  
+# Determine if the program needs to be run with a checktool like valgrind.
+# That is only done if defined in CHECKTOOLPROGS.
+  if [ "$CHECKTOOL" != ""  -a  "$CHECKTOOLPROGS" != "" ]
+  then
+    match=0
+    for prg in $CHECKTOOLPROGS
+    do
+      if [ "$PROG" = "$prg" ]
+      then
+        match=1
+        break
+      fi
+    done
+    if [ $match = 1 ]
+    then
+      # Use a checktool; replace [PROGNAME] by actual program name.
+      CHKTOOL=`echo "$CHECKTOOL" | sed -e 's/\[PROGNAME\]/'$PROG'/g'`
+      COMMAND="$CMDPREFIX $CHKTOOL ./$PROG"
+    fi
+  fi
+
+
+# Define exit and interrupt handler.
+  trap 'rm -rf core ${PROG}_tmp*; \
+        trap - 0 ; \
+        exit $STATUS' 0 1 2 3 15
+
+# If there is a .py file then use it.
+  if [ -f "$PROG.py" ]; then
+    COMMAND="python $PROG.py"
+    LOFAR_CHECKTOOL=
+  fi
+
+# If there is a .run file then use it.
+# Note: this must be tested after the test on .py file, otherwise it gets
+# overwritten if there is a .py file.
+  if [ -f "$PROG.run" ]
+  then
+    COMMAND="./$PROG.run"
+    LOFAR_CHECKTOOL="$CHKTOOL"
+    export LOFAR_CHECKTOOL
+  fi
+
+# Execute the command.
+  eval "$COMMAND" > ${PROG}_tmp.out
+  STATUS=$?
+
+  # Check the status.
+  case $STATUS in 
+  0) 
+    if [ -f $PROG.stdout ]
+    then
+      CAT=cat
+    else
+      if [ "$NEEDOUTFIL" = 1 ]; then
+        echo "FAIL (reference output file missing): $PROG"
+        STATUS=2
+      else
+        echo "PASS (execution succeeded): $PROG"
+      fi
+      exit
+    fi
+    ;;
+  3) 
+    echo "UNTESTED: $PROG"
+    STATUS=77
+    exit
+    ;;
+  *) 
+    echo "FAIL (execution failure): $PROG"
+    # We may want to know what went wrong, so we'll secure the log file
+    if [ -f ${PROG}_tmp.log ]
+    then
+      mv ${PROG}_tmp.log ${PROG}.err
+    fi
+    exit
+     ;;
+  esac
+
+  echo "Comparing output with $PROG.stdout ..."
+# Strip out demarked text.
+# inline parts enclosed by >>> && <<<
+  sed -e 's/>>>.*<<<//' ${PROG}_tmp.out > ${PROG}_tmp.out2
+# lines enclosed by >>> && <<<
+  sed -e '/^>>>/,/^<<</d' ${PROG}_tmp.out2 > ${PROG}_tmp.out
+
+# Compare with the expected output.
+  $CAT $PROG.stdout | sed -e 's/>>>.*<<<//' | sed -e '/^>>>/,/^<<</d' > ${PROG}_tmp_orig.out
+  if diff ${PROG}_tmp.out ${PROG}_tmp_orig.out
+  then
+     echo "PASS (output verified): $PROG"
+     STATUS=0
+     exit
+  fi
+
+# Not fully equal, check if equal except for numbers.
+# Replace for this purpose all numbers by x.
+  sed -e 's/[+-]\?\(\(\([0-9][0-9]*\)\|\([0-9]*\.\?[0-9]*\)\)\(e[+-]\?[0-9][0-9]*\)\?\)/x/g' ${PROG}_tmp.out > ${PROG}_tmp.out2
+  sed -e 's/[+-]\?\(\(\([0-9][0-9]*\)\|\([0-9]*\.\?[0-9]*\)\)\(e[+-]\?[0-9][0-9]*\)\?\)/x/g' ${PROG}_tmp_orig.out > ${PROG}_tmp_orig.out2
+  diff ${PROG}_tmp.out2 ${PROG}_tmp_orig.out2 > /dev/null 2>&1
+  diff ${PROG}_tmp.out2 ${PROG}_tmp_orig.out2 > /dev/null 2>&1
+  if [ $? != 0 ]
+  then
+     echo "FAIL (output not verified): $PROG"
+     STATUS=2
+     exit
+  fi
+
+# Okay, the non-numbers are equal.
+# Now check if all numbers are approximately equal.
+  $lfr_script_dir/checkfloat ${PROG}_tmp.out ${PROG}_tmp_orig.out $PREC
+  if [ $? != 0 ]
+  then
+     echo "FAIL (floating point discrepancies > $PREC): $PROG"
+     STATUS=2
+     exit
+  fi
+  echo "PASS (floating point discrepancies <= $PREC): $PROG"
+  STATUS=0
+  exit
diff --git a/CMake/testscripts/checkfloat b/CMake/testscripts/checkfloat
new file mode 100755
index 0000000000000000000000000000000000000000..f77267dbb20a0f5377b82e4655fe190eb46411ac
--- /dev/null
+++ b/CMake/testscripts/checkfloat
@@ -0,0 +1,41 @@
+#! /bin/sh
+#
+# This script checks if two files containing floating point numbers
+# are approximately equal.
+# All non-numeric characters are ignored.
+# The differences are written to stdout.
+#
+# run as:    checkfloat file1 file2 [precision]
+#                       default precision is 1e-5
+
+  if test $# -lt 2; then
+    echo "usage: checkfloat file1 file2 [precision]"
+    exit 1
+  fi
+  PREC=$3
+  if test $# -lt 3; then
+    PREC=1e-5
+  fi
+ 
+  pid=$$
+
+# Check if all numbers are approximately equal.
+# First replace all non-numeric characters and single e.+- by a blank.
+# Insert a blank if a - or + is preceeded by a digit.
+# Replace blanks by a newline.
+  sed -e 's/[^-+.e0-9]/ /g' $1 | sed -e 's/\(^\| \)[e.+-][e.+-]*\( \|$\)//g' | sed -e 's/^ *//' -e 's/ *$//' -e 's/\([0-9.]\)\([+-]\)/\1 \2/g' -e 's/  */\n/g' > /tmp/$pid.checkfloat_tmp.1
+  sed -e 's/[^-+.e0-9]/ /g' $2 | sed -e 's/\(^\| \)[e.+-][e.+-]*\( \|$\)//g' | sed -e 's/^ *//' -e 's/ *$//' -e 's/\([0-9.]\)\([+-]\)/\1 \2/g' -e 's/  */\n/g' > /tmp/$pid.checkfloat_tmp.2
+
+# Show the differences column-wise.
+  diff -y --suppress-common-lines /tmp/$pid.checkfloat_tmp.1 /tmp/$pid.checkfloat_tmp.2 > /tmp/$pid.checkfloat_tmp.diff
+
+# Now loop through all differences and see if almost equal.
+  awk '{ a1=$1; if (a1<0) a1=-a1; a2=$3; if (a2<0) a2=-a2; if (a1>1e-20 || a2>1e-20) if ((a1>a2 && a1-a2> '"$PREC"'*a1) || (a2>a1 && a2-a1> '"$PREC"'*a2)) print "float diff>'"$PREC"':",$1,$3 }' /tmp/$pid.checkfloat_tmp.diff > /tmp/$pid.checkfloat_tmp.res
+  STATUS=0;
+  if [ -s /tmp/$pid.checkfloat_tmp.res ]
+  then
+    cat /tmp/$pid.checkfloat_tmp.res
+    STATUS=2
+  fi
+  \rm -f /tmp/$pid.checkfloat_tmp.*
+  exit $STATUS
diff --git a/CMake/testscripts/default.log_prop b/CMake/testscripts/default.log_prop
new file mode 100644
index 0000000000000000000000000000000000000000..5f1f957f26a3f5239e3844f121373641879eb0fb
--- /dev/null
+++ b/CMake/testscripts/default.log_prop
@@ -0,0 +1,6 @@
+log4cplus.rootLogger=TRACE, TESTOUT
+log4cplus.logger.TRC=DEBUG
+log4cplus.appender.TESTOUT=log4cplus::FileAppender
+log4cplus.appender.TESTOUT.File=<LOGFILENAME>
+log4cplus.appender.TESTOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.TESTOUT.layout.ConversionPattern=%-5p %c{3} [%F:%L] - %m%n
diff --git a/CMake/testscripts/runctest.sh.in b/CMake/testscripts/runctest.sh.in
new file mode 100755
index 0000000000000000000000000000000000000000..c7a3a6b1184eb2a98673e766db484d1feee77696
--- /dev/null
+++ b/CMake/testscripts/runctest.sh.in
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# runctest.sh: CTest wrapper script for runtest.sh
+#
+#  Copyright (C) 2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#  $Id: runctest.sh 13275 2009-05-15 15:42:36Z loose $
+
+# runtest.sh uses this variable to find test input files and the like.
+srcdir=@srcdir@; export srcdir
+
+# Add the Python build directory to PYTHONPATH.
+PYTHONPATH=@PYTHON_BUILD_DIR@; export PYTHONPATH
+
+# Start CMake/testscripts/runtest.sh
+"@LOFAR_ROOT@/CMake/testscripts/runtest.sh" "$@"
+
+# The Autotools use the magic return value 77 for skipped tests. CMake can
+# only handle zero and non-zero return values. To avoid that CMake will flag a
+# skipped test as failed, we will silently change the return value 77 to 0.
+STATUS=$?
+if [ $STATUS -eq 77 ]; then
+  STATUS=0
+fi
+exit $STATUS
diff --git a/CMake/testscripts/runtest.sh b/CMake/testscripts/runtest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..732e3ecd28e7c5f3298975e1fa1180ae6a154270
--- /dev/null
+++ b/CMake/testscripts/runtest.sh
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# runtest.sh: script to assay a test program
+#
+#  Copyright (C) 2002
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#  $Id$
+
+# Set default options.
+NEEDOUTFIL=0
+
+# Sanity check! Can be removed once things work OK.
+if test -z "$srcdir"; then
+  echo "FATAL ERROR: srcdir is not set"
+  exit 1
+fi
+
+# Handle possible options. 
+while [ $# != 0 ]
+do
+  if [ "$1" = "-stdout" ]; then
+    NEEDOUTFIL=1
+    shift
+  elif [ "$1" = "-nostdout" ]; then
+    NEEDOUTFIL=0
+    shift
+  else
+    break
+  fi
+done
+
+if test $# -lt 1 || test $# -gt 3; then
+  echo "usage: runtest.sh [-stdout] <testname> [<max run-time>] [<precision>]"
+  exit 1
+fi
+
+if [ "$2" != "" ]; then
+  MAXTIME=$2
+else
+  MAXTIME=300  # 300 seconds == 5 minutes
+fi
+
+if [ "$3" != "" ]; then
+  PREC=$3
+else
+  PREC=1e-5
+fi
+
+# Get directory of this script.
+lfr_script_dir=`dirname $0`
+lfr_script_dir=`cd $lfr_script_dir && pwd`
+
+# Export lfr_script_dir, so that it can be used by assay
+export lfr_script_dir
+
+# Add the current directory to the path. We don't care if it's already in.
+PATH=.:$PATH
+export PATH
+
+# Delete all possible files from previous test runs.
+\rm -f $1.err $1.valgrind*
+
+#
+# Copy expected files to current directory
+#
+if test -f "$srcdir/$1.in"; then
+  \rm -f $1.in
+  \cp $srcdir/$1.in  .
+fi
+\rm -rf $1.in_*
+\cp -r $srcdir/$1.in_* . > /dev/null 2>&1
+chmod -R +w $1.in_* > /dev/null 2>&1    # Make writable (for make distcheck).
+if test -f "$srcdir/$1.stdout"; then
+  \rm -f $1.stdout
+  \cp $srcdir/$1.stdout .
+elif test -f "$srcdir/$1.out"; then
+  \rm -f $1.stdout
+  \cp $srcdir/$1.out $1.stdout
+fi
+if test -f "$srcdir/$1.run"; then
+  \rm -f $1.run
+  \cp $srcdir/$1.run .
+fi
+if test -f "$srcdir/$1.py"; then
+  \rm -f $1.py
+  \cp $srcdir/$1.py .
+fi
+if test -f "$srcdir/$1.parset"; then
+  \rm -f $1.parset
+  \cp $srcdir/$1.parset .
+fi
+if test -f "$srcdir/$1.log_prop"; then
+  \rm -f $1.log_prop
+  \cp $srcdir/$1.log_prop .
+else
+  if test ! -f "$1.log_prop"; then
+    sed -e "s%<LOGFILENAME>%$1_tmp.log%" $lfr_script_dir/default.log_prop > $1.log_prop
+  fi
+fi
+
+# Run assay
+$lfr_script_dir/assay $1 $MAXTIME $PREC $NEEDOUTFIL
+STS=$?
+
+# Cleanup (mainly for make distcheck).
+\rm -f $1.stdout $1.run $1.py $1.in $1.parset $1.log_prop
+\rm -rf $1.in_*
+exit $STS
diff --git a/LCS/ACC/ALC/ALC.spec.in b/LCS/ACC/ALC/ALC.spec.in
deleted file mode 100644
index b2f5759f5c1f265e777a6615984474d576ce9c81..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/ALC.spec.in
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# ALC.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: ALC contains the protocol for controlling an application via an ACC controller.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-#Requires: Common >= 3.0
-#Requires: Blob >= 1.0
-#Requires: Transport >= 2.3
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-ALC is a package that contains the (end-user) protocol for controlling
-an application with an ACC controller.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/ACC/ALC/Makefile.am b/LCS/ACC/ALC/Makefile.am
deleted file mode 100644
index 0b9392eaca1ea7d83f48795bc94c22071eddb2b4..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix) \
-      --with-blob=$(prefix) \
-      --with-transport=$(prefix) 
-
-EXTRA_DIST = \
-      Makefile.common \
-      ALC.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/ALC/bootstrap b/LCS/ACC/ALC/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/LCS/ACC/ALC/configure.in b/LCS/ACC/ALC/configure.in
deleted file mode 100644
index 8758954971274bc71f21c342bbde157dec1a5b56..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/configure.in
+++ /dev/null
@@ -1,70 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_INIT_AUTOMAKE(ALC, 2.1, no-define)
-AM_CONFIG_HEADER(config.h)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
-lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/ALC/Makefile
-Makefile
-src/Makefile
-test/Makefile
-ALC.spec
-)
diff --git a/LCS/ACC/ALC/include/ALC/Makefile.am b/LCS/ACC/ALC/include/ALC/Makefile.am
deleted file mode 100644
index 9edca614df1f9df504212936d869a0bdebb01a65..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/include/ALC/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-					ACCmd.h \
-					ACAsyncClient.h \
-					ACRequest.h \
-					ACSyncClient.h \
-					ApplControlClient.h \
-					ApplControlComm.h \
-					ApplControl.h \
-					ApplControlServer.h \
-					DH_ApplControl.h
-
-noinst_HEADERS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/ALC/include/Makefile.am b/LCS/ACC/ALC/include/Makefile.am
deleted file mode 100644
index ce409c47efa06e91f538c18a2983cca187c8b48c..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = ALC
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/ALC/src/Makefile.am b/LCS/ACC/ALC/src/Makefile.am
deleted file mode 100644
index 12135c09610007dbe15785efab10a6c36fd4895a..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/src/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-lib_LTLIBRARIES           = libalc.la
-
-libalc_la_SOURCES 		  = Package__Version.cc  ACCmd.cc \
-							DH_ApplControl.cc \
-							ApplControlComm.cc \
-							ApplControlClient.cc \
-							ACSyncClient.cc  \
-							ACAsyncClient.cc \
-							ApplControlServer.cc 
-
-bin_PROGRAMS = versionalc
-
-versionalc_SOURCES      = versionalc.cc
-versionalc_LDADD        = libalc.la
-versionalc_DEPENDENCIES = libalc.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/ACC/ALC/test/Makefile.am b/LCS/ACC/ALC/test/Makefile.am
deleted file mode 100644
index 896c59e6d49e75dbe7919f10bb987be5954d3de4..0000000000000000000000000000000000000000
--- a/LCS/ACC/ALC/test/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-check_PROGRAMS				= tACServer tACClient tACCmd
-
-tACServer_SOURCES			= tACServer.cc 
-tACClient_SOURCES			= tACClient.cc 
-tACCmd_SOURCES				= tACCmd.cc 
-
-noinst_HEADERS              = myACClientFunctions.h
-
-LDADD						= ../src/libalc.la
-DEPENDENCIES				= ../src/libalc.la $(LOFAR_DEPEND)
-
-TESTSCRIPTS					=
-
-TESTS						= $(TESTSCRIPTS)
-
-
-EXTRA_DIST					= $(TESTSCRIPTS)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/ACC/AUTHORS b/LCS/ACC/AUTHORS
deleted file mode 100644
index 0c1720dd9b31a8bac370a57bfdbc934a354db6e3..0000000000000000000000000000000000000000
--- a/LCS/ACC/AUTHORS
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Ruud Overeem            <overeem@astron.nl>
-
-
-Contributors:
-============
-
-        Arthur Coolen           <coolen@astron.nl>
-        Ger van Diepen          <diepen@astron.nl>
-        Alex Gerdes             <gerdes@astron.nl>
-        Marcel Loose            <loose@astron.nl>
-        Ellen van Meijeren      <meijeren@astron.nl>
-        Walther Zwart           <zwart@astron.nl>
diff --git a/LCS/ACC/COPYING b/LCS/ACC/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/LCS/ACC/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LCS/ACC/ChangeLog b/LCS/ACC/ChangeLog
deleted file mode 100644
index cc662575b780909c494421f45bfe09472c96ebfb..0000000000000000000000000000000000000000
--- a/LCS/ACC/ChangeLog
+++ /dev/null
@@ -1,874 +0,0 @@
-2005-08-05 11:28  overeem
-
-	* APS/src/KVpair.cc: BugID: 78 More significant numbers for
-	  doubles.
-
-2005-07-29 13:35  zwart
-
-	* ACCbin/src/: startAP.sh, startMPI.sh: BugID: 235
-
-	  ACC now gives "ACC" as first parameter and the parameterfile as
-	  second
-
-2005-07-22 12:59  overeem
-
-	* ACCbin/src/ACCmdImpl.cc: BugID: 78 One namespace too deep.
-
-2005-07-19 12:21  diepen
-
-	* APS/test/: tParameterSet.cc, tParameterSet.out: %[ER: 70]% Make
-	  it compile without warnings and run without differences
-
-2005-07-14 08:49  overeem
-
-	* APS/test/: merge.in_param, tParameterSet.in_merge: %[ER:285]%
-	  Renaming of files
-
-2005-07-14 08:49  overeem
-
-	* APS/test/: tParameterSet.cc, tParameterSet.out,
-	  tParameterSet_test.sh: %[ER:285]% Renaming of files.
-
-2005-07-14 08:34  overeem
-
-	* APS/test/: merge.in_param, merge.ps, tParameterSet.in_param,
-	  tParameterSet.ps: %[ER:285]% Renaming of files.
-
-2005-07-14 08:32  overeem
-
-	* APS/test/tParameterSet.cc: %[ER:285]% Renaming of parameterfiles.
-
-2005-07-11 15:14  zwart
-
-	* APS/src/ParameterSet.cc: %[ER: 206]%
-
-	  Fixed bug (string constructor doesn't make a copy when called
-	  with a reference to another string as argument)
-
-2005-07-11 14:55  zwart
-
-	* APS/src/ParameterSet.cc: %[ER: 206]%
-
-	  Made splitVector work with empty vectors
-
-2005-07-08 16:59  overeem
-
-	* lofarconf.in: %[ER:285 ]% Typo.
-
-2005-07-08 13:54  overeem
-
-	* ChangeLog, INSTALL, NEWS, README, lofarconf.in,
-	  ACCbin/configure.in, ALC/configure.in, APS/configure.in,
-	  PLC/configure.in: %[ER:0]% Prepare for release 2.0
-
-2005-07-06 14:36  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS: %[ER: 0]%
-
-	  Merged relevant files from the release 1.1 branch into the main
-	  development line.
-
-2005-07-06 09:49  overeem
-
-	* Makefile.am, configure.in: %[ER:285]% Obsolete in ACC 1.1
-
-2005-07-06 09:11  overeem
-
-	* configure.in, lofarconf.in, ACCbin/Makefile.am, ACCbin/bootstrap,
-	  ACCbin/configure.in, ACCbin/src/ACCmdImpl.cc,
-	  ACCbin/src/ACCmdImpl.h, ACCbin/src/ACDaemon.cc,
-	  ACCbin/src/ACDaemon.h, ACCbin/src/ACDaemon.log_prop,
-	  ACCbin/src/ACDaemonComm.cc, ACCbin/src/ACDaemonComm.h,
-	  ACCbin/src/ACDaemonMain.cc, ACCbin/src/ACRequestPool.cc,
-	  ACCbin/src/ACRequestPool.h, ACCbin/src/APAdmin.cc,
-	  ACCbin/src/APAdmin.h, ACCbin/src/APAdminPool.cc,
-	  ACCbin/src/APAdminPool.h, ACCbin/src/ApplController.cc,
-	  ACCbin/src/ApplController.h, ACCbin/src/ApplControllerMain.cc,
-	  ACCbin/src/CmdStack.cc, ACCbin/src/CmdStack.h,
-	  ACCbin/src/ConfigurationMgr.cc, ACCbin/src/ConfigurationMgr.h,
-	  ACCbin/src/ItemList.cc, ACCbin/src/ItemList.h,
-	  ACCbin/src/Makefile.am, ACCbin/src/PR_MPI.cc,
-	  ACCbin/src/PR_MPI.h, ACCbin/src/PR_Shell.cc,
-	  ACCbin/src/PR_Shell.h, ACCbin/src/ParCollRecord.cc,
-	  ACCbin/src/ParCollRecord.h, ACCbin/src/ProcRule.cc,
-	  ACCbin/src/ProcRule.h, ACCbin/src/ProcRuler.cc,
-	  ACCbin/src/ProcRuler.h, ACCbin/src/StateEngine.cc,
-	  ACCbin/src/StateEngine.h, ACCbin/test/ACuserMenu.cc,
-	  ACCbin/test/APCmdImpl.cc, ACCbin/test/APCmdImpl.h,
-	  ACCbin/test/APExample.cc, ACCbin/test/APTest.cc,
-	  ACCbin/test/Makefile.am, ACCbin/test/myACClientFunctions.h,
-	  ACCbin/test/tConfMgr.cc, ALC/Makefile.am, ALC/bootstrap,
-	  ALC/configure.in, ALC/src/ACAsyncClient.cc,
-	  ALC/src/ACAsyncClient.h, ALC/src/ACRequest.h,
-	  ALC/src/ACSyncClient.cc, ALC/src/ACSyncClient.h,
-	  ALC/src/ApplControl.h, ALC/src/ApplControlClient.cc,
-	  ALC/src/ApplControlClient.h, ALC/src/ApplControlComm.cc,
-	  ALC/src/ApplControlComm.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/ApplControlServer.h, ALC/src/DH_ApplControl.cc,
-	  ALC/src/DH_ApplControl.h, ALC/src/Makefile.am,
-	  ALC/test/Makefile.am, ALC/test/myACClientFunctions.h,
-	  ALC/test/tACClient.cc, ALC/test/tACServer.cc, APS/Makefile.am,
-	  APS/bootstrap, APS/configure.in, APS/src/KVpair.cc,
-	  APS/src/KVpair.h, APS/src/Makefile.am, APS/src/ParameterSet.cc,
-	  APS/src/ParameterSet.h, APS/test/Makefile.am,
-	  APS/test/tParameterSet.cc, APS/test/tParameterSet.ps,
-	  APS/test/tParameterSet_test.sh, PLC/Makefile.am, PLC/bootstrap,
-	  PLC/configure.in, PLC/src/DH_ProcControl.cc,
-	  PLC/src/DH_ProcControl.h, PLC/src/Makefile.am,
-	  PLC/src/ProcControlComm.cc, PLC/src/ProcControlComm.h,
-	  PLC/src/ProcControlServer.cc, PLC/src/ProcControlServer.h,
-	  PLC/src/ProcessControl.h: %[ER:285]% Major file-move due to
-	  upgrade ACC 1.0 to ACC 1.1 ACC 1.1 now offers three seperate
-	  libraries: APS for ParameterSets, ALC for Application Lifecycle
-	  Control and PLC for Process Lifecycle Control.  All executables
-	  like ACDaemon and Application controller are moved to ACCbin.
-
-	  The ParameterSet is extended with a lot of new types and offers
-	  support for reading vectors of types.
-
-2005-07-06 08:47  cvs
-
-	* APS/test/tParameterSet.ps: Moved with cvsmv from
-	  LOFAR/LCS/ACC/test, creating new revision
-
-2005-07-06 08:46  cvs
-
-	* ACCbin/test/templates/: applicationQ.ps, moduleA.ps, moduleC.ps,
-	  moduleD.ps, moduleE.ps, processF.ps, processG.ps: Moved with
-	  cvsmv from LOFAR/LCS/ACC/test/templates, creating new revision
-
-2005-07-06 08:44  cvs
-
-	* ACCbin/test/ACuserMenu.cc, ACCbin/test/APCmdImpl.cc,
-	  ACCbin/test/APCmdImpl.h, ACCbin/test/APExample.cc,
-	  ACCbin/test/APTest.cc, ACCbin/test/Makefile.am,
-	  APS/test/merge.ps, ALC/test/myACClientFunctions.h,
-	  ALC/test/tACClient.cc, ALC/test/tACServer.cc,
-	  ACCbin/test/tConfMgr.cc, APS/test/tParameterSet.cc,
-	  APS/test/tParameterSet.log_prop, APS/test/tParameterSet.out:
-	  Moved with cvsmv from LOFAR/LCS/ACC/test, creating new revision
-
-2005-07-06 08:44  cvs
-
-	* ACCbin/src/: stopAP.sh, stopMPI.sh: Moved with cvsmv from
-	  LOFAR/LCS/ACC/src, creating new revision
-
-2005-07-06 08:41  cvs
-
-	* APS/src/ParameterSet.cc, APS/src/ParameterSet.h,
-	  ACCbin/src/ParCollRecord.cc, ACCbin/src/ParCollRecord.h,
-	  ACCbin/src/PR_MPI.cc, ACCbin/src/PR_MPI.h,
-	  PLC/src/ProcControlComm.cc, PLC/src/ProcControlComm.h,
-	  PLC/src/ProcControlServer.cc, PLC/src/ProcControlServer.h,
-	  PLC/src/ProcessControl.h, ACCbin/src/ProcRule.cc,
-	  ACCbin/src/ProcRule.h, ACCbin/src/ProcRuler.cc,
-	  ACCbin/src/ProcRuler.h, ACCbin/src/PR_Shell.cc,
-	  ACCbin/src/PR_Shell.h, ACCbin/src/startAP.sh,
-	  ACCbin/src/startMPI.sh, ACCbin/src/StateEngine.cc,
-	  ACCbin/src/StateEngine.h: Moved with cvsmv from
-	  LOFAR/LCS/ACC/src, creating new revision
-
-2005-07-06 08:38  cvs
-
-	* ALC/src/ApplControlComm.h, ALC/src/ApplControl.h,
-	  ACCbin/src/ApplController.cc, ACCbin/src/ApplController.h,
-	  ACCbin/src/ApplControllerMain.cc, ALC/src/ApplControlServer.cc,
-	  ALC/src/ApplControlServer.h, ACCbin/src/CmdStack.cc,
-	  ACCbin/src/CmdStack.h, ACCbin/src/ConfigurationMgr.cc,
-	  ACCbin/src/ConfigurationMgr.h, ALC/src/DH_ApplControl.cc,
-	  ALC/src/DH_ApplControl.h, PLC/src/DH_ProcControl.cc,
-	  PLC/src/DH_ProcControl.h, ACCbin/src/ItemList.cc,
-	  ACCbin/src/ItemList.h, APS/src/KVpair.cc, APS/src/KVpair.h,
-	  ACCbin/src/Observation-CygA.param,
-	  ACCbin/src/Observation-CygB.param: Moved with cvsmv from
-	  LOFAR/LCS/ACC/src, creating new revision
-
-2005-07-06 08:35  cvs
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/ACCmdImpl.h,
-	  ACCbin/src/ACDaemon.cc, ACCbin/src/ACDaemonComm.cc,
-	  ACCbin/src/ACDaemonComm.h, ACCbin/src/ACDaemon.h,
-	  ACCbin/src/ACDaemon.log_prop, ACCbin/src/ACDaemonMain.cc,
-	  ACCbin/src/ACDaemon.param, ALC/src/ACRequest.h,
-	  ACCbin/src/ACRequestPool.cc, ACCbin/src/ACRequestPool.h,
-	  ALC/src/ACSyncClient.cc, ALC/src/ACSyncClient.h,
-	  ACCbin/src/APAdmin.cc, ACCbin/src/APAdmin.h,
-	  ACCbin/src/APAdminPool.cc, ACCbin/src/APAdminPool.h,
-	  ALC/src/ApplControlClient.cc, ALC/src/ApplControlClient.h,
-	  ALC/src/ApplControlComm.cc: Moved with cvsmv from
-	  LOFAR/LCS/ACC/src, creating new revision
-
-2005-07-06 08:32  cvs
-
-	* ALC/src/: ACAsyncClient.cc, ACAsyncClient.h: Moved with cvsmv
-	  from LOFAR/LCS/ACC/src, creating new revision
-
-2005-06-24 17:44  loose
-
-	* configure.in: %[ER: 0]%
-
-	  Prepare for release.
-
-2005-06-24 15:42  lofar
-
-	* configure.in: changed lofar_INTERNAL entry
-
-2005-06-17 14:45  loose
-
-	* configure.in: %[ER: 0]%
-
-	  Prepare for release 1.1
-
-2005-06-17 14:29  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, configure.in: %[ER:
-	  0]%
-
-	  Prepare for release 1.1
-
-2005-06-10 17:11  loose
-
-	* ACCbin/test/: APCmdImpl.cc, APCmdImpl.h: %[ER: 116]%
-
-	  Made all overloaded virtuals non-const, just as in the base
-	  class.
-
-2005-06-10 11:35  zwart
-
-	* ACCbin/test/Makefile.am: %[ER: 242]%
-
-	  Changed bin_PROGRAMS to test_PROGRAMS
-
-2005-06-10 11:34  zwart
-
-	* PLC/src/: ProcControlServer.cc, ProcControlServer.h,
-	  ProcessControl.h: %[ER: 242]%
-
-	  Removed some const qualifiers
-
-2005-06-06 12:12  meijeren
-
-	* configure.in, ALC/src/ACAsyncClient.cc,
-	  ALC/src/ApplControlClient.cc, ALC/src/ApplControlComm.cc,
-	  ALC/src/ApplControlComm.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/DH_ApplControl.cc, ALC/src/DH_ApplControl.h,
-	  PLC/src/DH_ProcControl.cc, PLC/src/DH_ProcControl.h,
-	  PLC/src/ProcControlComm.cc, PLC/src/ProcControlComm.h,
-	  PLC/src/ProcControlServer.cc: %[ER: 231]% Merge with branch
-	  ER231_development.
-
-2005-06-03 12:07  overeem
-
-	* configure.in, ALC/src/ACAsyncClient.cc,
-	  ALC/src/ApplControlClient.cc, ALC/src/ApplControlComm.cc,
-	  ALC/src/ApplControlComm.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/DH_ApplControl.cc, ALC/src/DH_ApplControl.h,
-	  PLC/src/DH_ProcControl.cc, PLC/src/DH_ProcControl.h,
-	  PLC/src/ProcControlComm.cc, PLC/src/ProcControlComm.h,
-	  PLC/src/ProcControlServer.cc: %[ER:231]% Modified ACC for new
-	  libtransport.
-
-2005-05-27 17:03  coolen
-
-	* configure.in: %[ER: 273]%
-
-	  Changed lofar_PACKAGE into lofar_INTERNAL.
-
-2005-05-10 16:43  overeem
-
-	* ACCbin/src/: ApplController.cc, ApplController.h: %[ER:116]% When
-	  Quit command fails the Kill phase is still executed.
-
-2005-05-10 09:53  zwart
-
-	* ACCbin/src/stopMPI.sh: %[ER: 242]%
-
-	  Made 15 the default signal to kill mpirun
-
-2005-05-09 10:56  coolen
-
-	* configure.in: %[ER: 273]% minor bugs removed && PACKAGE ..
-	  INTERNAL changed in configure.in files
-
-2005-05-04 14:47  overeem
-
-	* ACCbin/src/ApplController.cc: %[ER:116]% Writing final-result
-	  file before sending Ack on Quit command or request of tilman.
-
-2005-05-03 08:10  overeem
-
-	* ACCbin/: src/ApplController.cc, test/ACuserMenu.cc: %[ER:116]%
-	  Support for Cancel Command Queue also in ACusermenu program.
-
-2005-05-03 00:00  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/ACCmdImpl.h,
-	  ACCbin/src/ApplController.cc, ACCbin/src/CmdStack.h,
-	  ALC/src/ApplControl.h, ALC/src/ApplControlClient.cc,
-	  ALC/src/ApplControlClient.h, ALC/src/DH_ApplControl.h: %[ER:116]%
-	  Added command for cancelling command queue of Application
-	  Controller.
-
-2005-04-29 16:04  zwart
-
-	* ACCbin/src/: PR_MPI.cc, PR_MPI.h: %[ER: 242]%
-
-	  Made the map of PR's sorted correctly, so machinefile will have
-	  right hostnames in right order
-
-2005-04-29 07:48  zwart
-
-	* ACCbin/src/: ApplController.cc, PR_MPI.cc: %[ER: 242]%
-
-	  bugfix for PR_MPI
-
-2005-04-28 14:13  zwart
-
-	* ACCbin/src/: ApplController.cc, PR_MPI.cc, PR_MPI.h, ProcRule.h,
-	  startMPI.sh, stopMPI.sh: %[ER: 242]%
-
-	  Added functionality to start MPI programs using mpirun
-
-2005-04-26 13:34  overeem
-
-	* ACCbin/src/ACDaemon.cc, ACCbin/src/ApplController.cc,
-	  PLC/src/ProcControlServer.cc, PLC/src/ProcControlServer.h:
-	  %[ER:116]% Added hostname in ProcControlServer and to paramfile
-	  of ApplController.
-
-2005-04-26 13:32  overeem
-
-	* ACCbin/test/: APExample.cc, APTest.cc: %[ER:116]% Added hostname
-	  to constructor of ProcControlServer.
-
-2005-04-21 10:52  overeem
-
-	* ACCbin/src/ApplController.cc, ALC/src/ApplControlClient.cc:
-	  %[ER:264]% Fixed bug. The result the ApplController returned
-	  sometimes referred to the wrong Command.
-
-2005-04-21 09:10  overeem
-
-	* ACCbin/src/ApplController.cc, ACCbin/src/ApplController.h,
-	  ALC/src/ApplControlServer.cc, ALC/src/ApplControlServer.h,
-	  PLC/src/ProcControlServer.cc, PLC/src/ProcControlServer.h:
-	  %[ER:264]% Fixed bug. The result the ApplController returned
-	  sometimes referred to the wrong Command.
-
-2005-04-15 12:18  loose
-
-	* configure.in, ALC/test/myACClientFunctions.h: %[PR: 100]%
-
-	  Removed all `#include <config.h>' and `#include <lofar_config.h>'
-	  from .h and .tcc files. Added `#include <lofar_config.h>' to .cc
-	  files where necessary.
-
-2005-04-14 23:59  loose
-
-	* configure.in, ALC/test/myACClientFunctions.h: %[PR: 100]%
-
-	  Removed `#include <config.h>' and `#include <lofar_config.h>'
-	  from .h and .tcc files. Added `#include <lofar_config.h> to .cc
-	  files where necessary.
-
-2005-04-13 16:47  overeem
-
-	* ACCbin/src/: ACDaemon.cc, ACDaemon.param, ACRequestPool.cc,
-	  ACRequestPool.h, ApplController.cc, Observation-CygA.param,
-	  Observation-CygB.param, PR_Shell.cc, PR_Shell.h, ProcRule.cc,
-	  ProcRule.h, startAP.sh, stopAP.sh: %[ER:116 ]% Update after first
-	  use by Ordina.  ACDaemon has extra parameter in its param file
-	  for specifying the machine on which the ApplController will be
-	  running.  In the Observation files the .executable lable is added
-	  to specify the executable of a procestype.  Start and stop shells
-	  are updated to receive the nodename of the process as well.
-
-2005-03-11 16:24  loose
-
-	* package.doc: %[ER: 236]%
-
-	  Initial version.
-
-2005-03-09 08:23  diepen
-
-	* ACCbin/src/: ACDaemon.cc, ACDaemonMain.cc: %[ER: 70]% Needed
-	  unistd.h
-
-2005-02-25 15:23  overeem
-
-	* ACCbin/src/: ACDaemon.cc, ACDaemon.h, ACDaemon.log_prop,
-	  APAdminPool.cc, APAdminPool.h, Observation-CygA.param: %[ER:116
-	  ]% Uses FdSet class frm Common/Net.
-
-2005-02-21 14:46  overeem
-
-	* ACCbin/test/APTest.cc: %[ER:116]% Test AP now sends intermediate
-	  result at random intervals.
-
-2005-02-21 14:45  overeem
-
-	* ACCbin/src/Observation-CygA.param: %[ER:116]% Weekly update
-
-2005-02-21 14:44  overeem
-
-	* ACCbin/src/ACCmdImpl.h, ACCbin/src/ACDaemon.cc,
-	  ACCbin/src/ACDaemon.h, ACCbin/src/ACDaemonComm.cc,
-	  ACCbin/src/ACDaemonComm.h, ACCbin/src/ACRequestPool.cc,
-	  ACCbin/src/ACRequestPool.h, ACCbin/src/APAdmin.h,
-	  ACCbin/src/APAdminPool.h, ACCbin/src/ApplController.cc,
-	  ACCbin/src/ApplController.h, ACCbin/src/ApplControllerMain.cc,
-	  ACCbin/src/CmdStack.h, ACCbin/src/ConfigurationMgr.cc,
-	  ACCbin/src/ConfigurationMgr.h, ACCbin/src/ItemList.h,
-	  ACCbin/src/PR_Shell.cc, ACCbin/src/PR_Shell.h,
-	  ACCbin/src/ParCollRecord.h, ACCbin/src/ProcRule.cc,
-	  ACCbin/src/ProcRule.h, ACCbin/src/ProcRuler.cc,
-	  ACCbin/src/ProcRuler.h, ACCbin/src/StateEngine.cc,
-	  ACCbin/src/StateEngine.h, ACCbin/src/stopAP.sh,
-	  ALC/src/ACAsyncClient.h, ALC/src/ACRequest.h,
-	  ALC/src/ACSyncClient.cc, ALC/src/ACSyncClient.h,
-	  ALC/src/ApplControl.h, ALC/src/ApplControlClient.h,
-	  ALC/src/ApplControlComm.h, ALC/src/ApplControlServer.h,
-	  ALC/src/DH_ApplControl.h, APS/src/KVpair.cc, APS/src/KVpair.h,
-	  APS/src/ParameterSet.h, PLC/src/DH_ProcControl.h,
-	  PLC/src/ProcControlComm.h, PLC/src/ProcControlServer.cc,
-	  PLC/src/ProcControlServer.h, PLC/src/ProcessControl.h: %[ER:116]%
-	  Weekly update.  AC sends pings to AM.  APs may send intermediate
-	  results to AC.  ProcRules are made more common.
-
-2005-02-11 11:44  overeem
-
-	* ACCbin/test/: APExample.cc, APTest.cc: %[ER:116]% Weekly update.
-
-2005-02-11 11:43  overeem
-
-	* ACCbin/src/ACCmdImpl.h, ACCbin/src/ACDaemon.cc,
-	  ACCbin/src/ACDaemon.h, ACCbin/src/ACDaemon.param,
-	  ACCbin/src/ACDaemonMain.cc, ACCbin/src/ACRequestPool.cc,
-	  ACCbin/src/ACRequestPool.h, ACCbin/src/APAdmin.h,
-	  ACCbin/src/APAdminPool.h, ACCbin/src/ApplController.cc,
-	  ACCbin/src/ApplController.h, ACCbin/src/ApplControllerMain.cc,
-	  ACCbin/src/CmdStack.h, ACCbin/src/ConfigurationMgr.h,
-	  ACCbin/src/ItemList.h, ACCbin/src/Observation-CygA.param,
-	  ACCbin/src/ParCollRecord.h, ACCbin/src/ProcRule.h,
-	  ACCbin/src/ProcRuler.h, ACCbin/src/StateEngine.h,
-	  ALC/src/ACAsyncClient.h, ALC/src/ACRequest.h,
-	  ALC/src/ACSyncClient.h, ALC/src/ApplControl.h,
-	  ALC/src/ApplControlClient.cc, ALC/src/ApplControlClient.h,
-	  ALC/src/ApplControlComm.h, ALC/src/ApplControlServer.h,
-	  ALC/src/DH_ApplControl.h, APS/src/KVpair.h,
-	  APS/src/ParameterSet.h, PLC/src/DH_ProcControl.h,
-	  PLC/src/ProcControlComm.h, PLC/src/ProcControlServer.h,
-	  PLC/src/ProcessControl.h: %[ER:116]% Weekly update, mainly for
-	  doxygen. The ACDaemon was extended with an administration to
-	  manage the AC more precisely and is able to survive crashes now.
-
-2005-02-02 16:18  overeem
-
-	* ACCbin/test/ACuserMenu.cc, ACCbin/test/APCmdImpl.cc,
-	  ACCbin/test/APCmdImpl.h, ACCbin/test/APExample.cc,
-	  ACCbin/test/APTest.cc, ACCbin/test/Makefile.am,
-	  ALC/test/tACClient.cc: %[ER:116]% The constructor of ACclient is
-	  changed, the ACDaemon needs more info now to be able to choose
-	  the right machine to start the AC on.  APTest replaces the old
-	  tPPClient, it is based on the APExample source.
-
-2005-02-02 16:15  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/ACDaemon.cc,
-	  ACCbin/src/ACDaemon.h, ACCbin/src/ACDaemon.param,
-	  ACCbin/src/ACRequestPool.cc, ACCbin/src/ACRequestPool.h,
-	  ACCbin/src/APAdminPool.cc, ACCbin/src/APAdminPool.h,
-	  ACCbin/src/ApplController.cc, ACCbin/src/ApplController.h,
-	  ACCbin/src/StateEngine.h, ALC/src/ACAsyncClient.cc,
-	  ALC/src/ACAsyncClient.h, ALC/src/ACRequest.h,
-	  ALC/src/ACSyncClient.cc, ALC/src/ACSyncClient.h,
-	  ALC/src/ApplControlClient.cc, ALC/src/ApplControlClient.h,
-	  APS/src/KVpair.cc, APS/src/KVpair.h, PLC/src/DH_ProcControl.cc,
-	  PLC/src/DH_ProcControl.h, PLC/src/ProcControlComm.cc,
-	  PLC/src/ProcControlComm.h, PLC/src/ProcControlServer.cc,
-	  PLC/src/ProcControlServer.h, PLC/src/ProcessControl.h: %[ER:116]%
-	  Removed scheduletime in proces control.  Introduced KVpair class
-	  for easier construction of ParameterCollections and as a
-	  preparation for the new database structure that must be
-	  implemented.	Made a start with a more intelligent ACDaemon that
-	  manages a pool of AC's and will be able to reconnect an ACuser to
-	  a still running AC.
-
-2005-01-31 10:16  overeem
-
-	* ACCbin/test/: APCmdImpl.cc, APCmdImpl.h: %[ER:116]% Different
-	  number of args for pause command.
-
-2005-01-21 16:35  overeem
-
-	* ACCbin/src/ACDaemon.h, ACCbin/src/APAdmin.h,
-	  ACCbin/src/APAdminPool.cc, ACCbin/src/APAdminPool.h,
-	  ACCbin/src/CmdStack.h, ACCbin/src/ProcRule.h,
-	  ALC/src/ACAsyncClient.h, ALC/src/ACRequest.h,
-	  ALC/src/ACSyncClient.h, ALC/src/ApplControl.h,
-	  ALC/src/ApplControlClient.h, ALC/src/ApplControlComm.h,
-	  ALC/src/ApplControlServer.cc, ALC/src/ApplControlServer.h,
-	  ALC/src/DH_ApplControl.h, APS/src/ParameterSet.h,
-	  PLC/src/DH_ProcControl.h, PLC/src/ProcControlComm.h,
-	  PLC/src/ProcControlServer.cc, PLC/src/ProcControlServer.h,
-	  PLC/src/ProcessControl.h: %[ER:116]% Added doxygen documentation
-	  in the sources.
-
-2005-01-14 16:39  overeem
-
-	* ACCbin/test/ACuserMenu.cc: %[ER:116]% Development update.
-
-2005-01-14 16:37  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/APAdminPool.h,
-	  ACCbin/src/ApplController.cc, ACCbin/src/ApplController.h,
-	  ACCbin/src/ItemList.cc, ACCbin/src/ProcRule.cc,
-	  ACCbin/src/StateEngine.cc, ACCbin/src/StateEngine.h,
-	  ALC/src/ApplControlClient.cc: %[ER:116]% Development update.
-	  Solved some small bugs and made some enhancements.
-
-2005-01-12 10:25  overeem
-
-	* ALC/src/: ACAsyncClient.cc, ACSyncClient.cc, ApplControlComm.cc:
-	  %[ER:116]% Removed reference to DH_AC_Connect.
-
-2005-01-12 10:01  overeem
-
-	* ACCbin/test/: APCmdImpl.cc, APCmdImpl.h, APExample.cc,
-	  Makefile.am: %[ER:116]% The temporarely tACMaster daemon is
-	  replaced by the more definitive ACDaemon program is de src
-	  directory. The communication with the ACDaemon is not longer li
-	  btransport compatible to solve a lot of problems.  APExample
-	  shows how an Application process can be implemented. It shows the
-	  minimal implementation possible with a lot of comment to explain
-	  were other code could be inserted.
-
-2005-01-12 09:54  overeem
-
-	* ACCbin/src/ACDaemon.cc, ACCbin/src/ACDaemon.h,
-	  ACCbin/src/ACDaemon.log_prop, ACCbin/src/ACDaemon.param,
-	  ACCbin/src/ACDaemonMain.cc, ACCbin/src/ApplController.cc,
-	  ACCbin/src/ApplControllerMain.cc, ALC/src/ACRequest.h,
-	  ALC/src/ApplControlClient.cc, PLC/src/ProcControlServer.cc,
-	  PLC/src/ProcControlServer.h: %[ER:116]% The temporarely tACMaster
-	  daemon in the test directory is replaced by the more definitive
-	  ACDaemon program. The communication with the ACDaemon is not
-	  longer libtransport compatible to solve a lot of problems.
-
-2005-01-10 16:01  overeem
-
-	* ACCbin/src/: APAdminPool.h, ApplController.cc, CmdStack.cc,
-	  ProcRuler.h, StateEngine.cc, StateEngine.h, startAP.sh:
-	  %[ER:116]% Development update: timer for starting Apps runs ok
-	  now also.
-
-2005-01-07 17:00  overeem
-
-	* ACCbin/test/ACuserMenu.cc: %[ER:116]% Development update.
-	  ACuserMenu supports delayed commands and specifying the
-	  parameterfile for the AP's. tACMaster starts the real
-	  ApplController program.
-
-2005-01-07 16:57  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/ACCmdImpl.h,
-	  ACCbin/src/ApplController.cc, ACCbin/src/ApplController.h,
-	  ACCbin/src/CmdStack.cc, ACCbin/src/CmdStack.h,
-	  ACCbin/src/Observation-CygA.param, ACCbin/src/StateEngine.cc,
-	  ACCbin/src/StateEngine.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/ApplControlServer.h, ALC/src/DH_ApplControl.cc,
-	  ALC/src/DH_ApplControl.h, PLC/src/ProcControlServer.cc,
-	  PLC/src/ProcControlServer.h: %[ER:116]% Development update.
-	  ApplController now has its own Parameterfile. State timers are
-	  optimized.
-
-2005-01-06 10:05  overeem
-
-	* ALC/test/myACClientFunctions.h: %[ER:116]% Check in compilable
-	  version
-
-2005-01-06 09:55  overeem
-
-	* ACCbin/test/ACuserMenu.cc, ACCbin/test/Makefile.am,
-	  ALC/test/tACClient.cc: %[ER:116 ]% Check in of compilable
-	  version.
-
-2005-01-06 09:54  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/ACCmdImpl.h,
-	  ACCbin/src/APAdminPool.h, ACCbin/src/ApplController.cc,
-	  ACCbin/src/ApplController.h, ACCbin/src/ItemList.cc,
-	  ACCbin/src/ItemList.h, ACCbin/src/ProcRule.cc,
-	  ACCbin/src/ProcRule.h, ACCbin/src/ProcRuler.cc,
-	  ACCbin/src/ProcRuler.h, ACCbin/src/StateEngine.cc,
-	  ACCbin/src/StateEngine.h, ACCbin/src/startAP.sh,
-	  ACCbin/src/stopAP.sh, ALC/src/ACAsyncClient.cc,
-	  ALC/src/ACAsyncClient.h, ALC/src/ApplControl.h,
-	  ALC/src/ApplControlClient.cc, ALC/src/ApplControlClient.h:
-	  %[ER:116]% Check in of compilable version
-
-2005-01-03 09:06  overeem
-
-	* ACCbin/test/Makefile.am, APS/test/tParameterSet.cc,
-	  APS/test/tParameterSet.out, APS/test/tParameterSet.ps: %[ER:116]%
-	  Update to test the more relaxes syntax with multiline lines,
-	  neatly aligned lines around the = sign and the new getTime
-	  routines.
-
-2004-12-29 16:44  overeem
-
-	* ALC/test/: myACClientFunctions.h, tACClient.cc: %[ER:116]%
-	  Development update.
-
-2004-12-29 16:43  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/ACCmdImpl.h,
-	  ACCbin/src/APAdmin.cc, ACCbin/src/APAdminPool.cc,
-	  ACCbin/src/ApplController.cc, ACCbin/src/ApplController.h,
-	  ACCbin/src/ApplControllerMain.cc, ACCbin/src/StateEngine.cc,
-	  ACCbin/src/StateEngine.h, ALC/src/ACAsyncClient.cc,
-	  ALC/src/ApplControl.h, ALC/src/ApplControlClient.cc,
-	  ALC/src/ApplControlClient.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/ApplControlServer.h, ALC/src/DH_ApplControl.cc,
-	  ALC/src/DH_ApplControl.h, PLC/src/DH_ProcControl.h,
-	  PLC/src/ProcControlServer.cc: %[ER:116]% Development update.
-	  Multiple command states are implemented.
-
-2004-12-24 10:11  overeem
-
-	* ACCbin/src/: APAdminPool.cc, ApplController.cc: %[ER:116]%
-	  Development update.
-
-2004-12-23 14:57  overeem
-
-	* ALC/test/tACClient.cc, ACCbin/test/Makefile.am: %[ER:116]%
-	  Development update.
-
-2004-12-23 14:54  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/APAdmin.cc,
-	  ACCbin/src/APAdmin.h, ACCbin/src/APAdminPool.cc,
-	  ACCbin/src/APAdminPool.h, ACCbin/src/ApplController.cc,
-	  ALC/src/ACAsyncClient.cc, ALC/src/ACSyncClient.cc,
-	  ALC/src/ApplControl.h, ALC/src/ApplControlClient.cc,
-	  ALC/src/ApplControlComm.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/ApplControlServer.h, ALC/src/DH_ApplControl.cc,
-	  ALC/src/DH_ApplControl.h, PLC/src/DH_ProcControl.cc,
-	  PLC/src/DH_ProcControl.h, PLC/src/ProcControlComm.cc,
-	  PLC/src/ProcControlComm.h, PLC/src/ProcControlServer.cc,
-	  PLC/src/ProcControlServer.h, PLC/src/ProcessControl.h: %[ER:30]%
-	  Development update. The main loop of the Application controller
-	  is finally becomming simple and stable by using the APAdmin
-	  objects and not longer using libTransport. The I/O remains
-	  libTransport compatible so MAC and the Appl. processes may still
-	  use it.
-
-2004-12-15 15:18  overeem
-
-	* configure.in: %[ER:116]% ACC lifecycle control depends on
-	  libtransport.
-
-2004-12-15 15:17  overeem
-
-	* ALC/test/myACClientFunctions.h: %[ER:116]% Prototype of an
-	  Application Process.
-
-2004-12-15 15:13  overeem
-
-	* ALC/test/tACClient.cc, ACCbin/test/Makefile.am,
-	  ALC/test/tACServer.cc: %[ER:116]% Development update.
-
-2004-12-15 15:09  overeem
-
-	* ACCbin/src/ACCmdImpl.cc, ACCbin/src/ACCmdImpl.h,
-	  ACCbin/src/ApplController.cc, ACCbin/src/CmdStack.cc,
-	  ACCbin/src/CmdStack.h, ALC/src/ApplControlComm.cc,
-	  ALC/src/ApplControlComm.h, PLC/src/ProcControlComm.h,
-	  PLC/src/ProcessControl.h: %[ER:116]% Development update.
-
-2004-12-15 15:02  overeem
-
-	* ALC/src/: ApplControl.h, ApplControlClient.cc,
-	  ApplControlClient.h, ApplControlServer.cc, ApplControlServer.h,
-	  DH_ApplControl.cc, DH_ApplControl.h: %[ER:116]% Development
-	  update.
-
-2004-12-06 10:52  overeem
-
-	* ALC/src/: ACSyncClient.h, ApplControl.h, ApplControlClient.cc,
-	  ApplControlServer.cc, ApplControlServer.h: %[ER:161]% Development
-	  update.
-
-2004-11-30 14:58  overeem
-
-	* ALC/test/tACServer.cc: %[ER:116]% Development update after split
-	  of ApplControl.
-
-2004-11-30 14:55  overeem
-
-	* ACCbin/src/ConfigurationMgr.cc, ALC/src/ACAsyncClient.cc,
-	  ALC/src/ApplControl.h, ALC/src/ApplControlClient.cc,
-	  ALC/src/ApplControlClient.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/ApplControlServer.h: %[ER:116]% Development update.
-	  ApplControl is split into ApplControl and ApplControlComm.  Added
-	  'test' qualification to Parameter management.
-
-2004-11-26 15:53  overeem
-
-	* ALC/: src/ApplControl.h, src/ApplControlClient.cc,
-	  src/ApplControlClient.h, src/DH_ApplControl.cc,
-	  src/DH_ApplControl.h, test/tACClient.cc: %[ER:116]% Just a weekly
-	  development update.
-
-2004-11-26 15:52  overeem
-
-	* ALC/src/: ACAsyncClient.cc, ACAsyncClient.h, ACSyncClient.cc,
-	  ACSyncClient.h: %[ER:116]% Two flavor of ACC clients, a sync and
-	  an async version.
-
-2004-11-24 16:18  overeem
-
-	* ACCbin/test/templates/: applicationQ.ps, moduleA.ps, moduleC.ps,
-	  moduleD.ps, moduleE.ps, processF.ps, processG.ps: Initial
-	  revision
-
-2004-11-24 16:18  overeem
-
-	* ACCbin/test/templates/: applicationQ.ps, moduleA.ps, moduleC.ps,
-	  moduleD.ps, moduleE.ps, processF.ps, processG.ps:
-	  ParameterTemplates for testing the ConfigurationMgr class.
-
-2004-11-24 16:14  overeem
-
-	* ACCbin/test/tConfMgr.cc: %[ER:116 ]% Program for testing the
-	  ConfigurationMgr class.
-
-2004-11-24 16:13  overeem
-
-	* ACCbin/src/: ParCollRecord.cc, ParCollRecord.h: %[ER:116]% The
-	  ParCollRecord class is the recordform how ParameterCollections
-	  are stored in the database.
-
-2004-11-24 16:08  overeem
-
-	* ACCbin/src/: ConfigurationMgr.cc, ConfigurationMgr.h: %[ER:116]%
-	  First (not complete!) working version of the configuration
-	  Manager.
-
-2004-11-18 13:26  overeem
-
-	* APS/test/tParameterSet.cc: %[ER:116]% Update of the flavors of
-	  parameter collections to the new design.
-
-2004-11-18 13:22  overeem
-
-	* APS/src/: ParameterSet.cc, ParameterSet.h: %[ER:116]% Update of
-	  the flavors of parameter collections to the new design.
-
-2004-11-10 08:59  diepen
-
-	* configure.in: %[ER: 70]% Changed CEP/Transport to LCS/Transport
-
-2004-10-26 14:10  diepen
-
-	* configure.in: %[ER: 70]% Change such that make install works
-	  correctly
-
-2004-10-25 16:46  overeem
-
-	* ALC/: test/tACClient.cc, test/tACServer.cc,
-	  src/ApplControlClient.cc, src/ApplControlServer.cc: %[ER:116]%
-	  Update for new TH_Socket.
-
-2004-10-20 16:22  overeem
-
-	* configure.in, ACCbin/test/Makefile.am: %[ER:116]% Don't make AC
-	  programs yet.
-
-2004-10-18 15:08  overeem
-
-	* ALC/test/tACClient.cc, ALC/test/tACServer.cc,
-	  APS/test/tParameterSet.cc: %[ER:116]% Moved everthing into
-	  namespace LOFAR::ACC.
-
-2004-10-18 15:07  overeem
-
-	* ALC/src/ApplControlClient.cc, ALC/src/ApplControl.h,
-	  ALC/src/ApplControlClient.h, ALC/src/ApplControlServer.cc,
-	  ALC/src/ApplControlServer.h, ALC/src/DH_ApplControl.cc,
-	  ALC/src/DH_ApplControl.h, APS/src/ParameterSet.cc,
-	  APS/src/ParameterSet.h: %[ER:116]% Moved everything into
-	  namespace LOFAR:ACC.
-
-2004-10-18 13:51  overeem
-
-	* ACCbin/test/Makefile.am: %[ER:116]% Only tParameterSet in
-	  makefile to assure weekly build.
-
-2004-10-18 13:50  overeem
-
-	* configure.in: %[ER:116]% Added dependency with CEP/Transport
-	  (TH_Socket).
-
-2004-10-18 13:30  overeem
-
-	* ACCbin/test/Makefile.am: %[ER:116]% Added testprograms for ACC
-	  classes.
-
-2004-10-18 13:28  overeem
-
-	* ALC/test/: tACClient.cc, tACServer.cc: %[ER:116]% Simple
-	  testprograms for manually testing the ACC classes.
-
-2004-10-18 13:24  overeem
-
-	* ALC/src/: ApplControl.h, ApplControlClient.cc,
-	  ApplControlClient.h, ApplControlServer.cc, ApplControlServer.h,
-	  DH_ApplControl.cc, DH_ApplControl.h: %[ER:116]% New setup from
-	  the application control classes.
-
-2004-10-18 12:32  overeem
-
-	* configure.in: %[ER:102]% Added test directory.
-
-2004-10-18 12:30  overeem
-
-	* Makefile.am: %[ER:102]% Added test directory
-
-2004-10-18 12:28  overeem
-
-	* ACCbin/test/Makefile.am, APS/test/merge.ps,
-	  APS/test/tParameterSet.cc, APS/test/tParameterSet.log_prop,
-	  APS/test/tParameterSet.ps: Initial revision
-
-2004-10-18 12:28  overeem
-
-	* ACCbin/test/Makefile.am, APS/test/merge.ps,
-	  APS/test/tParameterSet.cc, APS/test/tParameterSet.log_prop,
-	  APS/test/tParameterSet.ps: Moved from src.
-
-2004-05-13 11:09  gerdes
-
-	* APS/src/: ParameterSet.cc, ParameterSet.h: %[ER: 116]% Added a
-	  library target in the makefile and added a getFloat method.
-
-2004-04-06 15:19  overeem
-
-	* APS/src/: ParameterSet.cc, ParameterSet.h: %[ER:102]% Passing
-	  strings by reference.
-
-2004-03-31 10:08  overeem
-
-	* README: %[ER:102]% Added syntax info.
-
-2004-03-31 09:44  overeem
-
-	* Makefile.am, README, bootstrap, configure.in,
-	  APS/src/ParameterSet.cc, APS/src/ParameterSet.h: %[ER:102]%
-	  Tryout of ParameterSets.
-
-2004-03-31 09:44  overeem
-
-	* Makefile.am, README, bootstrap, configure.in,
-	  APS/src/ParameterSet.cc, APS/src/ParameterSet.h: Initial revision
-
diff --git a/LCS/ACC/INSTALL b/LCS/ACC/INSTALL
deleted file mode 100644
index 1b5df50efd951e76b0b2c48bf648149e1e1891fc..0000000000000000000000000000000000000000
--- a/LCS/ACC/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building a LOFAR package
-========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to one of the package directories (i.e. LCS/ACC/APS).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/LCS/ACC/NEWS b/LCS/ACC/NEWS
deleted file mode 100644
index c1ac561ffa7636ea921d2589f14ee7adb865884d..0000000000000000000000000000000000000000
--- a/LCS/ACC/NEWS
+++ /dev/null
@@ -1,109 +0,0 @@
-LCS/ACC: Version 2.1, date: 2006/02/01
-======================================
-
-In preparation of making package distributable as rpm package, all header
-files that must be installed have been moved from the `src' directory to the
-`inclucde/<package>' directory (ref. BugID #396).
-
-Furthermore, some changes to the build environment require the use of
-autoconf_share 2.4 (or later). 
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 466 : make ACC RPM installable
-        All subpackages of ACC are made installable by rpm.
-
-# 546 : Add 'not_supported' return value to ACC commands
-        Implemented tribool's for the Process commands. The commands on the
-        application side are left unchanged and still return a bool.
-
-
-
-LCS/ACC: Version 2.0, date: 2005/07/08
-======================================
-
-Version 2.0 has two major changes:
-[1] The directory structure is changed
-[2] The ParameterSet class is extended (ER285).
-
-[1] ACC is split into 4 subpackages
------------------------------------
-APS : Application ParameterSet
-APS contains the functionality of the ParametersSet. 
-
-ALC : Application Lifecycle Control
-Library that supports the use of the Application Control protocol.
-
-PLC : Proces Lifecycle Control
-Library that supports the use of the Process Control protocol.
-
-ACCbin : Executables of ACC.
-Contains the programs ACDaemon and ApplController.
-
-[2] The ParameterSet was changed according to ER285
----------------------------------------------------
-The group of parameter related classes is reduced to one class the ParameterSet.
-This class is extended with functions to support most of the basic types of 
-LOFAR like uint16, int16, uint32, etc. 
-The function getInt became obsolete, use getInt32 instead.
-The ParameterSet is also extended with functions to get vectors of variables:
-getUint16Vector, getInt16Vector, etc.
-
-
-
-LCS/ACC: Version 1.1, date: 2005/06/17
-======================================
-
-Version 1.1 of LCS/ACC package is the first "official" release. The main
-differences with the first "unofficial" release (version 1.0) are related to
-the changed interface of the LCS/Transport package. No functionality has been
-added. 
-
-The build process has changed as well. The ACC library should now be built
-against an installed version of the Common and Transport
-libraries. (Ref. ER-270 and ER-273).
-
-
-The following Enhancement Requests have been implemented
---------------------------------------------------------
-
-ER 231 : Transport             : Change DH/Transport/TH relationship 
-
-         Change the transport library in such a way DataHolders and
-         TransportHolders can be used independently. Plus remove all unused
-         functionality from the interfaces of all classes.
-
-ER 242 : Demo                  : Station Correlator development 
-
-         Added functionality to start MPI programs using mpirun.
-
-ER 264 : ACC                   : ApplController should preserve commandnr 
-
-         The sendExecutionResult function must get an extra parameter being
-         the original commandnr. When sending a couple of commands and look at
-         the results afterwards may perhaps result in wrong commandnr reported
-         back.
-
-ER 273 : Build environment     : Change from lofar_PACKAGE to lofar_INTERNAL
-
-         Instead of lofar_PACKAGE, lofar_INTERNAL should be used in the
-         configure.in files. This is in preparation of making distributable
-         packages.
-
-
-The following Problem Reports have been fixed
----------------------------------------------
-
-PR 100 : LOFAR SW development  : Neither config.h nor lofar_config.h should
-                                 be included in header files
-
-         Inclusion of either config.h or lofar_config.h in a distributed
-         header file is problematic, because the config files themselves
-         cannot be distributed; they contain system specific definitions. It
-         is therefore unwise to include either of these files in a header
-         file.
-
-         Note: This Problem Report is closely related to Enhancement Request
-               ER 229.
diff --git a/LCS/ACC/PLC/Makefile.am b/LCS/ACC/PLC/Makefile.am
deleted file mode 100644
index cb86730864aefa0f7a0f2a5ac525f4d3e04393f4..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBDIRS=src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix) \
-      --with-blob=$(prefix) \
-      --with-transport=$(prefix) \
-      --with-aps=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      PLC.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/PLC/PLC.spec.in b/LCS/ACC/PLC/PLC.spec.in
deleted file mode 100644
index c410eeb7ed4d10b4979e6403300f3cf9832c45d3..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/PLC.spec.in
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# PLC.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: PLC contains a framework for developping processes and applications that can be managed by an ACC controller.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-#Requires: Common >= 3.0
-#Requires: Blob >= 1.0
-#Requires: Transport >= 2.3
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-PLC is the package that contains a framework for developing applications
-that can be controlled by an ACC-controller.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/ACC/PLC/bootstrap b/LCS/ACC/PLC/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/LCS/ACC/PLC/configure.in b/LCS/ACC/PLC/configure.in
deleted file mode 100644
index 34981aca9a4b6d88e3e308804d5f7abfc5c79129..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(PLC, 2.1, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_MPI(0)
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
-lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
-lofar_EXTERNAL(boost,1,boost/logic/tribool.hpp,"")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/PLC/Makefile
-Makefile
-src/Makefile
-test/Makefile
-PLC.spec
-)
diff --git a/LCS/ACC/PLC/include/Makefile.am b/LCS/ACC/PLC/include/Makefile.am
deleted file mode 100644
index 2c9c2f61037e44310bfc49db85896219a1e3701f..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = PLC
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/PLC/include/PLC/Makefile.am b/LCS/ACC/PLC/include/PLC/Makefile.am
deleted file mode 100644
index b1ab1505ff13fd26fa824c6f3062992ad981bdb2..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/include/PLC/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	DH_ProcControl.h \
-	PCCmd.h \
-	ProcControlComm.h \
-	ProcControlServer.h \
-	ProcessControl.h \
-	ProcCtrlProxy.h \
-	ProcCtrlCmdLine.h \
-	ProcCtrlRemote.h \
-	ACCmain.h
-
-noinst_HEADERS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/PLC/src/Makefile.am b/LCS/ACC/PLC/src/Makefile.am
deleted file mode 100644
index e8bb628370243a1ad0d5ef4b0483dc9239e93486..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/src/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-lib_LTLIBRARIES           = libplc.la
-
-libplc_la_SOURCES 		  = Package__Version.cc  DH_ProcControl.cc \
-							PCCmd.cc \
-							ProcessControl.cc  \
-							ProcControlComm.cc  \
-							ProcControlServer.cc \
-							ProcCtrlProxy.cc \
-							ProcCtrlCmdLine.cc \
-							ProcCtrlRemote.cc \
-							ACCmain.cc
-
-bin_PROGRAMS = versionplc
-
-versionplc_SOURCES      = versionplc.cc
-versionplc_LDADD        = libplc.la
-versionplc_DEPENDENCIES = libplc.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/ACC/PLC/test/Makefile.am b/LCS/ACC/PLC/test/Makefile.am
deleted file mode 100644
index 7504bd61bac8545d334306b42c20abd812c4082c..0000000000000000000000000000000000000000
--- a/LCS/ACC/PLC/test/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-check_PROGRAMS				= tPCCmd tACCmain
-
-tPCCmd_SOURCES				= tPCCmd.cc 
-
-tACCmain_SOURCES			= tACCmain.cc APCmdImpl.cc
-
-LDADD						= ../src/libplc.la
-DEPENDENCIES				= ../src/libplc.la $(LOFAR_DEPEND)
-
-TESTSCRIPTS					=
-
-TESTS						= $(TESTSCRIPTS)
-
-
-EXTRA_DIST					= $(TESTSCRIPTS)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/ACC/bootstrap b/LCS/ACC/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/ACC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/ACC/lofarconf.in b/LCS/ACC/lofarconf.in
deleted file mode 100644
index e2ab7286a13580caa300358ce7b9c3371df015b3..0000000000000000000000000000000000000000
--- a/LCS/ACC/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-ALC
-PLC
diff --git a/LCS/AMC/AMCBase/AMCBase.spec.in b/LCS/AMC/AMCBase/AMCBase.spec.in
deleted file mode 100644
index f12634357e0fc82a3bfd97db77013a7a6ac22163..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/AMCBase.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# AMCBase.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: AMCBase contains the interface definition of the conversion methods and some basic classes.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 3.0
-Requires: Blob >= 1.0
-Requires: Transport >= 2.3
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-AMCBase contains the interface definition of the conversion methods and some
-basic classes that define sky coordinates, earth coordinates (position on
-earth) and time.  AMCClient contains the implementation of the client side of
-the AMC client/server.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/AMC/AMCBase/AUTHORS b/LCS/AMC/AMCBase/AUTHORS
deleted file mode 100644
index 5e6fc5b63bb5582ab4791c93623a2c42d620126e..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Marcel Loose            <loose@astron.nl>
-
-
-Contributors:
-============
-
-        Arthur Coolen           <coolen@astron.nl>
-        Ger van Diepen          <diepen@astron.nl>
diff --git a/LCS/AMC/AMCBase/COPYING b/LCS/AMC/AMCBase/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LCS/AMC/AMCBase/ChangeLog b/LCS/AMC/AMCBase/ChangeLog
deleted file mode 100644
index 3fc5bde0e12fadbf3e54561b497c07f598562c62..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/ChangeLog
+++ /dev/null
@@ -1,362 +0,0 @@
-2005-12-02 12:02  loose
-
-	* test/: tEarthCoord.stdout, tSkyCoord.stdout: BugID: 196
-
-	  Added reference output files for test programs tEarthCoord and
-	  tSkyCoord.
-
-2005-11-30 17:42  loose
-
-	* test/AMCClient/tConverterCommand.stdout: BugID: 196
-
-	  Added reference output for test programs.
-
-2005-11-30 17:27  loose
-
-	* src/EarthCoord.cc, src/SkyCoord.cc,
-	  test/AMCClient/tConverterCommand.cc: BugID: 196
-
-	  Added methods to return the enum value Types or Commands as a
-	  string.
-
-2005-11-30 16:55  loose
-
-	* src/AMCClient/BlobIO.cc, src/AMCClient/ConverterCommand.cc,
-	  src/AMCClient/ConverterCommand.h, test/AMCClient/tBlobIO.cc,
-	  test/AMCClient/tConverterCommand.cc: BugID: 196
-
-	  Reimplemented ConverterCommand class: the constructor now only
-	  accepts a true enum, which more closely matches the way that enum
-	  data members are handled in the classes SkyCoord and EarthCoord.
-
-2005-11-28 16:34  loose
-
-	* src/Converter.h, src/SkyCoord.cc,
-	  src/AMCClient/ConverterClient.cc,
-	  src/AMCClient/ConverterClient.h,
-	  src/AMCClient/ConverterCommand.h, src/AMCClient/DH_Request.cc,
-	  src/AMCClient/DH_Result.cc, test/AMCClient/tBlobIO.cc,
-	  test/AMCClient/tConverterCommand.cc: BugID: 196
-
-	  Added ITRF --> J2000 conversion routines.
-
-2005-11-23 12:29  loose
-
-	* src/: Converter.h, AMCClient/ConverterClient.cc,
-	  AMCClient/ConverterClient.h: BugID: 382
-
-	  * Made the destructor in Converter.h public.	* Moved actual
-	  conversion routines into one generic doConvert() method; this
-	  reduces code duplication.  * Added resilience and error handling
-	  when server has died (temporarily).
-
-2005-10-07 14:04  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in,
-	  src/AMCClient/ConverterClient.cc: BugID: 196
-
-	  Development for Bug #196. Branch created at
-	  LCS-AMC-1_0-release-root; merged changes in LCS-AMC-1_0patch1
-	  into this branch.
-
-2005-10-04 11:42  diepen
-
-	* Makefile.am, src/Makefile.am, test/AMCClient/Makefile.am,
-	  test/Makefile.am: BugId: 396 Use $(top_srcdir)/Makefile.common
-
-2005-10-04 11:40  diepen
-
-	* configure.in: BugId: 396 Use lofar_GENERAL
-
-2005-09-28 22:03  loose
-
-	* ChangeLog, NEWS, src/AMCClient/ConverterClient.cc: BugID: 382
-
-	  Merged release 1.0 patch 1 with main development line.
-
-2005-09-27 16:37  loose
-
-	* ChangeLog, NEWS: BugID: 382
-
-	  Created patch release 1_0patch1.
-
-2005-09-23 23:55  loose
-
-	* src/AMCClient/ConverterClient.cc: BugID: 382
-
-	  Now throws ClientError exception when call to Connection::read()
-	  or Connection::write() returns a Connection::Error.
-
-2005-07-27 17:16  loose
-
-	* src/Converter.h, src/EarthCoord.cc, src/EarthCoord.h,
-	  src/SkyCoord.cc, src/SkyCoord.h, src/TimeCoord.cc,
-	  src/TimeCoord.h, src/AMCClient/BlobIO.cc,
-	  src/AMCClient/ConverterClient.cc,
-	  src/AMCClient/ConverterClient.h,
-	  src/AMCClient/ConverterCommand.h, test/tEarthCoord.cc,
-	  test/tSkyCoord.cc, test/tTimeCoord.cc, test/AMCClient/tBlobIO.cc,
-	  test/AMCClient/tConverterClient.cc,
-	  test/AMCClient/tConverterCommand.cc,
-	  test/AMCClient/tDH_Request.cc: BugID: 196
-
-	  * Added conversion routines for J2000 to ITRF conversion of sky
-	  coordinates. Actual conversion has not yet been implemented.
-
-	  * Added support for different types of SkyCoord (J2000, AZEL, and
-	  ITRF) and   EarthCoord (ITRF, WGS84). Modifications are backward
-	  compatible, except for   the output of operator<<(), which now
-	  also prints the type.    Tests have been extended to cover these
-	  different types.
-
-2005-07-05 16:29  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in:
-	  %[ER: 214]%
-
-	  Merged relevant changes from the 1.0 release branch back into the
-	  main development line.
-
-2005-07-05 09:40  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in:
-	  %[ER: 0]%
-
-	  Prepare for release 1.0
-
-2005-07-04 11:56  loose
-
-	* src/Converter.h, src/EarthCoord.h, src/Exceptions.h,
-	  src/Makefile.am, src/SkyCoord.h, src/TimeCoord.h,
-	  src/AMCClient/BlobIO.h, src/AMCClient/ConverterClient.cc,
-	  src/AMCClient/ConverterClient.h,
-	  src/AMCClient/ConverterCommand.h, src/AMCClient/DH_Converter.cc,
-	  src/AMCClient/DH_Converter.h, src/AMCClient/DH_Request.cc,
-	  src/AMCClient/DH_Request.h, src/AMCClient/DH_Result.cc,
-	  src/AMCClient/DH_Result.h, test/Makefile.am,
-	  test/AMCClient/Makefile.am, test/AMCClient/tConverterClient.cc,
-	  test/AMCClient/tDH_Request.cc, test/AMCClient/tDH_Request.sh,
-	  test/AMCClient/tDH_Result.cc, test/AMCClient/tDH_Result.sh: %[ER:
-	  231]%
-
-	  Merged changes of ER231 with the main development line.
-
-2005-06-24 15:42  lofar
-
-	* configure.in: changed lofar_INTERNAL entry
-
-2005-06-03 15:28  loose
-
-	* src/AMCClient/ConverterClient.h: %[ER: 231]%
-
-	  Minor code changes.
-
-2005-05-30 10:18  loose
-
-	* src/Makefile.am: %[ER: 214]%
-
-	  Added missing backslash in definition of INSTHDRS.
-
-2005-05-27 16:57  coolen
-
-	* configure.in: %[ER: 273]%
-
-	  Changed from lofar_PACKAGE to lofar_INTERNAL.
-
-2005-05-26 12:20  loose
-
-	* src/: Converter.h, EarthCoord.h, Exceptions.h, SkyCoord.h,
-	  TimeCoord.h, AMCClient/BlobIO.h, AMCClient/ConverterClient.h,
-	  AMCClient/ConverterCommand.h, AMCClient/DH_Request.h,
-	  AMCClient/DH_Result.h: %[ER: 231]%
-
-	  Improved documentation.
-
-2005-05-25 15:37  loose
-
-	* src/AMCClient/: ConverterClient.cc, ConverterClient.h: %[ER:
-	  231]%
-
-	  Initialize the TH_Socket object in the ConverterClient
-	  constructor, so that we can catch a failed connect earlier. We
-	  don't want to wait for a failed assert on data we've never read,
-	  do we? :-))
-
-2005-05-18 17:12  loose
-
-	* test/: Makefile.am, AMCClient/Makefile.am: %[ER: 231]%
-
-	  We need to export LOFARROOT.	The test program tConverterClient
-	  is now built in the AMCServer test directory, because it can only
-	  run successfully when the server is also available.
-
-2005-05-18 17:10  loose
-
-	* src/AMCClient/: ConverterClient.cc, ConverterClient.h,
-	  DH_Request.cc, DH_Result.cc: %[ER: 231]%
-
-	  Minor changes; irrelevant for operation.
-
-2005-05-13 16:41  loose
-
-	* configure.in, src/Makefile.am, src/AMCClient/Makefile.am,
-	  test/AMCClient/Makefile.am: %[ER: 214]%
-
-	  Removed convenience libraries libamcclient in AMCBase/AMCClient
-	  and libamcserver in AMCImpl/AMCServer. They caused too much
-	  trouble during linking.
-
-2005-05-13 11:44  coolen
-
-	* configure.in, src/Makefile.am, src/AMCClient/ConverterClient.cc,
-	  src/AMCClient/ConverterClient.h, src/AMCClient/DH_Converter.cc,
-	  src/AMCClient/DH_Converter.h, src/AMCClient/DH_Request.cc,
-	  src/AMCClient/DH_Request.h, src/AMCClient/DH_Result.cc,
-	  src/AMCClient/DH_Result.h, src/AMCClient/Makefile.am,
-	  test/AMCClient/Makefile.am, test/AMCClient/tConverterClient.cc,
-	  test/AMCClient/tDH_Request.cc, test/AMCClient/tDH_Request.sh,
-	  test/AMCClient/tDH_Result.cc, test/AMCClient/tDH_Result.sh: all
-	  changes so far for the lofar_PACKAGE to lofar_INTERNAL step.
-	  beware!!!  this branch also contains the ER231 changes , and
-	  those are NOT wanted in the main development tree....  Only take
-	  the configure.in stuff
-
-2005-05-09 10:56  coolen
-
-	* configure.in, src/Makefile.am: %[ER: 273]% minor bugs removed &&
-	  PACKAGE .. INTERNAL changed in configure.in files
-
-2005-05-09 09:50  loose
-
-	* src/Makefile.am: %[ER: 214]%
-
-	  Oops! Added missing backslash.
-
-2005-04-04 12:07  loose
-
-	* configure.in: %[ER: 214]%
-
-	  Should have removed src/AMCClient/Makefile and
-	  src/AMCServer/Makefile from AC_OUTPUT, because the associated
-	  Makefile.am were removed.
-
-2005-04-01 18:08  loose
-
-	* configure.in, src/Makefile.am, src/AMCClient/ConverterClient.cc,
-	  src/AMCClient/ConverterClient.h, src/AMCClient/DH_Converter.cc,
-	  src/AMCClient/DH_Converter.h, src/AMCClient/DH_Request.cc,
-	  src/AMCClient/DH_Request.h, src/AMCClient/DH_Result.cc,
-	  src/AMCClient/DH_Result.h, src/AMCClient/Makefile.am,
-	  test/AMCClient/Makefile.am, test/AMCClient/tConverterClient.cc,
-	  test/AMCClient/tDH_Request.cc, test/AMCClient/tDH_Request.sh,
-	  test/AMCClient/tDH_Result.cc, test/AMCClient/tDH_Result.sh: %[ER:
-	  214]%
-
-	  AMC client/server is now (almost) complete. The implementation is
-	  based on the ER231 enhancements made in package LCS/Transport.
-
-	  * Removed DH_Converter class; added DH_Request and DH_Result
-	  classes. It	turned out that we do need separate data holder
-	  classes for request and   result.
-
-	  * Removed convenience libraries libamcclient in AMCBase/AMCClient
-	  and	libamcserver in AMCImpl/AMCServer. They caused too much
-	  trouble during   linking.
-
-	  * Modified both ConverterClient and ConverterServer.
-
-	  * Added class Process that wraps the OS fork() method. Class
-	  ConverterProcess   is derived from this base class.
-
-	  * Added several test programs; the most important being
-	  tConverterClient and	 tConverterServer. The tConverterServer.run
-	  script will try to start both   server and client; the client
-	  then requests some conversions from the   server; the output
-	  returned by the server is then verified.
-
-2005-03-14 12:26  loose
-
-	* test/AMCClient/: tBlobIO.cc, tBlobIO.sh, tConverterCommand.cc,
-	  tConverterCommand.sh: %[ER: 214]%
-
-	  Added test programs for BlobIO and ConverterCommand.
-
-2005-03-14 12:14  loose
-
-	* src/AMCClient/ConverterClient.cc, test/tSkyCoord.cc: %[ER: 214]%
-
-	  Minor changes. Introduction of Common/macros.h was rejected.
-
-2005-03-14 11:14  loose
-
-	* src/AMCClient/: ConverterCommand.cc, ConverterCommand.h: %[ER:
-	  214]%
-
-	  Initial version.
-
-2005-03-10 09:54  loose
-
-	* src/Converter.h, src/EarthCoord.h, src/Exceptions.h,
-	  src/SkyCoord.h, src/TimeCoord.cc, src/TimeCoord.h,
-	  src/AMCClient/BlobIO.cc, src/AMCClient/BlobIO.h,
-	  src/AMCClient/ConverterClient.cc,
-	  src/AMCClient/ConverterClient.h, src/AMCClient/DH_Converter.cc,
-	  src/AMCClient/DH_Converter.h, src/AMCClient/Makefile.am,
-	  test/tSkyCoord.cc, test/AMCClient/Makefile.am: %[ER: 214]%
-
-	  Alpha version. Parts of client/server have been implemented.
-	  Mostly updated to latest coding standards.
-
-2005-01-12 18:01  loose
-
-	* test/tTimeCoord.cc: %[ER: 214]%
-
-	  Completely rewrote test program, taking into account the new
-	  methods for setting a TimeCoord as well.
-
-2005-01-12 18:00  loose
-
-	* src/AMCClient/: DH_Converter.cc, DH_Converter.h: %[ER: 214]%
-
-	  Rewrote most methods, taking advantage of BlobArrays having
-	  built-in support for I/O streaming an array of objects.
-
-2005-01-12 17:57  loose
-
-	* src/AMCClient/: ConverterClient.cc, ConverterClient.h: %[ER:
-	  214]%
-
-	  Rewrote most methods, using another more compact way to construct
-	  vectors.
-
-2005-01-12 17:54  loose
-
-	* src/: TimeCoord.cc, TimeCoord.h: %[ER: 214]%
-
-	  * Added methods for setting the time, where time can be specified
-	  as seconds   since 1 Jan 1970 (UTC or local time), or as Modified
-	  Julian Day.  * Improved formatting of operator<<().
-
-2004-12-14 14:38  loose
-
-	* src/Converter.h, src/EarthCoord.cc, src/EarthCoord.h,
-	  src/Exceptions.h, src/Makefile.am, src/SkyCoord.cc,
-	  src/SkyCoord.h, src/TimeCoord.cc, src/TimeCoord.h,
-	  src/AMCClient/BlobIO.cc, src/AMCClient/BlobIO.h,
-	  src/AMCClient/ConverterClient.cc,
-	  src/AMCClient/ConverterClient.h, src/AMCClient/DH_Converter.cc,
-	  src/AMCClient/DH_Converter.h, src/AMCClient/Makefile.am,
-	  test/Makefile.am, test/tEarthCoord.cc, test/tEarthCoord.sh,
-	  test/tSkyCoord.cc, test/tSkyCoord.sh, test/tTimeCoord.cc,
-	  test/tTimeCoord.sh, test/AMCClient/Makefile.am: %[ER: 214]%
-
-	  Initial version. Stand-alone version is (mostly) implemented.
-	  Client/Server still needs to be done.
-
-2004-12-14 14:08  loose
-
-	* Makefile.am, bootstrap, configure.in: %[ER: 214]%
-
-	  Initial version. Stand-alone version is (mostly) implemented.
-	  Client/Server still needs to be done.
-
diff --git a/LCS/AMC/AMCBase/INSTALL b/LCS/AMC/AMCBase/INSTALL
deleted file mode 100644
index 528227b6345cf2757b3392b12f58bd2e376087fa..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building a LOFAR package
-========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to the package root directory (i.e. LCS/AMC/AMCBase).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/LCS/AMC/AMCBase/Makefile.am b/LCS/AMC/AMCBase/Makefile.am
deleted file mode 100644
index 378040e292fbf22cfaecfe9eeb680776ec0ec5c9..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = include src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--with-common=$(prefix) \
-	--with-blob=$(prefix) \
-	--with-transport=$(prefix) 
-
-EXTRA_DIST = \
-	Makefile.common \
-	AMCBase.spec \
-	autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCBase/NEWS b/LCS/AMC/AMCBase/NEWS
deleted file mode 100644
index 55a70de97cc395c4d79bd6d275a35afacce58955..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/NEWS
+++ /dev/null
@@ -1,40 +0,0 @@
-LCS/AMC/AMCBASE: Version 1.1, date: 2005/12/02
-==============================================
-
-The following BugIDs have been resolved:
----------------------------------------
-
-# 196 : Add support for conversion to ITRF
-
-        Conversion from J200 to ITRF and vice versa has been implemented. Test
-        programs have been updated and their output has been verified using
-        the AIPS++ Glish script measures.g.
-
-# 382 : Connection loss to AMCserver can not be detected or acted upon in 
-        client
-
-        Whenenver a client temporarily loses connection with the server it
-        will try to reconnect once. When it succeeds, processing will continue
-        normally. When it fails it will throw an exception.  
-        The server will no longer treat connection loss to a client (i.e. a
-        client simply hanging up) as an exceptional case; hence it will not
-        throw an exception anymore.
-
-
-LCS/AMC/AMCBase: Version 1.0 patch 1, date: 2005/09/27
-======================================================
-
-The following BugIDs have been resolved:
----------------------------------------
-
-# 382 : Connection loss to AMCserver can not be detected or acted upon in
-        client.
-
-        ConverterClient would throw an AssertError when the server had
-        died. This has now been fixed; a ClientError is thrown instead.
-
-LCS/AMC/AMCBase: Version 1.0, date: 2005/07/04
-==============================================
-
-This is the first official release of the AMCBase package. 
-
diff --git a/LCS/AMC/AMCBase/bootstrap b/LCS/AMC/AMCBase/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/LCS/AMC/AMCBase/configure.in b/LCS/AMC/AMCBase/configure.in
deleted file mode 100644
index 31f5697586921f66dfac78462cd26a65c49b7834..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/configure.in
+++ /dev/null
@@ -1,71 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_INIT_AUTOMAKE(AMCBase, 2.0, no-define)
-AM_CONFIG_HEADER(config.h)
-dnl AX_PREFIX_CONFIG_H([lofar-config.h], [])
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
-lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-Makefile
-include/Makefile
-include/AMCBase/Makefile
-src/Makefile
-test/Makefile
-AMCBase.spec
-)
diff --git a/LCS/AMC/AMCBase/include/AMCBase/Makefile.am b/LCS/AMC/AMCBase/include/AMCBase/Makefile.am
deleted file mode 100644
index 035b93bf9371e389ab1d14c04e75ba1ede5f84b3..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/include/AMCBase/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	BlobIO.h \
-	ConverterClient.h \
-	ConverterCommand.h \
-	Converter.h \
-	ConverterStatus.h \
-	Coord3D.h \
-	DH_Request.h \
-	DH_Result.h \
-	Direction.h \
-	Epoch.h \
-	Exceptions.h \
-	Position.h \
-	RequestData.h \
-	ResultData.h
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/AMC/AMCBase/include/Makefile.am b/LCS/AMC/AMCBase/include/Makefile.am
deleted file mode 100644
index 5befdddc28d9627227cbbbee40c19fa7e3d3dcf6..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= AMCBase
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCBase/src/Makefile.am b/LCS/AMC/AMCBase/src/Makefile.am
deleted file mode 100644
index 4882d4e76cb430d820a4ac936035cbda418458d3..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/src/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-lib_LTLIBRARIES		= libamcbase.la
-
-libamcbase_la_SOURCES = Package__Version.cc  \
-	BlobIO.cc \
-	ConverterClient.cc \
-	ConverterCommand.cc \
-	ConverterStatus.cc \
-	Coord3D.cc \
-	DH_Request.cc \
-	DH_Result.cc \
-	Direction.cc \
-	Epoch.cc \
-	Position.cc
-
-bin_PROGRAMS = versionamcbase
-
-versionamcbase_SOURCES      = versionamcbase.cc
-versionamcbase_LDADD        = libamcbase.la
-versionamcbase_DEPENDENCIES = libamcbase.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCBase/test/Makefile.am b/LCS/AMC/AMCBase/test/Makefile.am
deleted file mode 100644
index 35a69726529e0f5c0e1841c594394f30bebc2284..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCBase/test/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-check_PROGRAMS			= tCoord3D \
-				  tDirection \
-				  tPosition \
-				  tEpoch \
-				  tConverterCommand \
-				  tConverterStatus \
-				  tBlobIO \
-				  tDH_Request \
-				  tDH_Result
-
-CHECKTOOLPROGS			= tCoord3D \
-				  tDirection \
-				  tPosition \
-				  tEpoch \
-				  tConverterCommand \
-				  tConverterStatus \
-				  tBlobIO \
-				  tDH_Request \
-				  tDH_Result
-#ENDCHECKTOOLPROGS
-
-tCoord3D_SOURCES		= tCoord3D.cc
-tCoord3D_LDADD			= ../src/libamcbase.la
-tCoord3D_DEPENDENCIES		= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tDirection_SOURCES		= tDirection.cc
-tDirection_LDADD		= ../src/libamcbase.la
-tDirection_DEPENDENCIES		= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tPosition_SOURCES		= tPosition.cc
-tPosition_LDADD			= ../src/libamcbase.la
-tPosition_DEPENDENCIES		= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tEpoch_SOURCES			= tEpoch.cc
-tEpoch_LDADD			= ../src/libamcbase.la
-tEpoch_DEPENDENCIES		= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tConverterCommand_SOURCES	= tConverterCommand.cc
-tConverterCommand_LDADD		= ../src/libamcbase.la
-tConverterCommand_DEPENDENCIES	= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tConverterStatus_SOURCES	= tConverterStatus.cc
-tConverterStatus_LDADD		= ../src/libamcbase.la
-tConverterStatus_DEPENDENCIES	= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tBlobIO_SOURCES			= tBlobIO.cc
-tBlobIO_LDADD			= ../src/libamcbase.la
-tBlobIO_DEPENDENCIES		= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tDH_Request_SOURCES		= tDH_Request.cc
-tDH_Request_LDADD		= ../src/libamcbase.la
-tDH_Request_DEPENDENCIES	= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-tDH_Result_SOURCES		= tDH_Result.cc
-tDH_Result_LDADD		= ../src/libamcbase.la
-tDH_Result_DEPENDENCIES		= ../src/libamcbase.la $(LOFAR_DEPEND)
-
-TESTS				= tCoord3D.sh \
-				  tDirection.sh \
-				  tPosition.sh \
-				  tEpoch.sh \
-				  tConverterCommand.sh \
-				  tConverterStatus.sh \
-				  tBlobIO.sh \
-				  tDH_Request.sh \
-				  tDH_Result.sh
-
-
-EXTRA_DIST			= $(TESTS) \
-				  tDirection.stdout \
-				  tPosition.stdout \
-				  tConverterCommand.stdout \
-				  tConverterStatus.stdout
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCImpl/AMCImpl.spec.in b/LCS/AMC/AMCImpl/AMCImpl.spec.in
deleted file mode 100644
index 68f2381c0324f1c103d9fc2170504c82422d7bef..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/AMCImpl.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# AMCImpl.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: AMCImpl contains the implementation of the conversion methods.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 3.0
-Requires: Transport >= 2.3
-Requires: AMCBase >= 1.1
-Requires: AIPS++ >= 1.9
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-AMCImpl contains the implementation of the conversion methods. AMCServer
-contains the implementation of the server side of the AMC client/server.
-
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/AMC/AMCImpl/AUTHORS b/LCS/AMC/AMCImpl/AUTHORS
deleted file mode 100644
index 5e6fc5b63bb5582ab4791c93623a2c42d620126e..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Marcel Loose            <loose@astron.nl>
-
-
-Contributors:
-============
-
-        Arthur Coolen           <coolen@astron.nl>
-        Ger van Diepen          <diepen@astron.nl>
diff --git a/LCS/AMC/AMCImpl/COPYING b/LCS/AMC/AMCImpl/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LCS/AMC/AMCImpl/ChangeLog b/LCS/AMC/AMCImpl/ChangeLog
deleted file mode 100644
index e113c41c079fba7a6e142662fafb708015ceec71..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/ChangeLog
+++ /dev/null
@@ -1,458 +0,0 @@
-2005-12-02 12:06  loose
-
-	* test/tConverter.stdout: BugID: 196
-
-	  Added new output reference file for tConverter test program.
-
-2005-11-30 17:45  loose
-
-	* test/tConverter.cc: BugID: 196
-
-	  Removed one (potentially desastrous) ASSERTSTR.
-
-2005-11-30 12:32  loose
-
-	* src/ConverterImpl.cc, test/tConverter.cc: BugID: 196
-
-	  * All conversion routines to/from ITRF have been implemented.  *
-	  Test program has been rewritten; output has been verified using
-	  the AIPS++   Glish Measures GUI (glish -l measures.g; -
-	  dm.gui()).
-
-2005-11-28 16:39  loose
-
-	* test/tConverter.stdout: BugID: 196
-
-	  Fixed bug in conversion routines. Type field was not properly
-	  updated.
-
-2005-11-28 16:37  loose
-
-	* src/: ConverterImpl.h, AMCServer/ConverterProcess.cc: BugID: 196
-
-	  Added ITRF --> J2000 conversion routines.
-
-2005-11-28 12:14  loose
-
-	* src/AMCServer/ConverterProcess.cc: BugID: 196
-
-	  Added J2000 --> ITRF conversion.
-
-2005-11-23 13:26  loose
-
-	* src/AMCServer/: ConverterProcess.cc, ConverterProcess.h: BugID:
-	  382
-
-	  sendResult() and recvRequest() now return false when the
-	  connection is lost, instead of throwing an exception; a client
-	  hanging up is not such an exceptional case.
-
-2005-11-16 13:38  loose
-
-	* ChangeLog, NEWS, src/AMCServer/ConverterServer.cc: BugID: 444
-
-	  Merged release 1.0 patch 2  with main development line.
-
-2005-11-14 16:50  cvs
-
-	* test/: tConverter.out, tConverterImpl.out: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/AMC/AMCImpl/test
-
-2005-11-14 16:50  cvs
-
-	* test/: tConverter.stdout, tConverterImpl.stdout: %lofarcvsmv%:
-	  Moved from LOFAR/LCS/AMC/AMCImpl/test, creating new revision
-
-2005-11-14 16:50  cvs
-
-	* test/AMCServer/tProcess.out: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/AMC/AMCImpl/test/AMCServer
-
-2005-11-14 16:50  cvs
-
-	* test/AMCServer/tProcess.stdout: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/AMC/AMCImpl/test/AMCServer, creating new revision
-
-2005-10-11 10:09  loose
-
-	* test/tConverter.sh: BugID: 196
-
-	  Use port 31339 for testing, instead of the default port 31337,
-	  which could already be in use.
-
-2005-10-11 10:07  loose
-
-	* test/tConverter.run: BugID: 196
-
-	  `cut' prints the whole line when no separator is present. In
-	  other words, when `tConverter.in' only contains the text
-	  "client", PORT will also be set to "client", instead of the empty
-	  string. `cut -s' avoids this.
-
-2005-10-10 23:16  loose
-
-	* NEWS, ChangeLog: BugID: 444
-
-	  Created patch release 1_0patch2.
-
-2005-10-10 23:01  loose
-
-	* src/AMCServer/ConverterServer.cc: BugID: 444
-
-	  The parent process should delete the dataSocket object; otherwise
-	  we will sooner or later run out of file descriptors.
-
-2005-10-07 14:04  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in,
-	  src/AMCServer/ConverterProcess.cc, test/tConverter.run,
-	  test/tConverter.sh: BugID: 196
-
-	  Development for Bug #196. Branch created at
-	  LCS-AMC-1_0-release-root; merged changes in LCS-AMC-1_0patch1
-	  into this branch.
-
-2005-10-07 13:51  loose
-
-	* test/tConverter.run: BugID: 196
-
-	  Optional port number is now read from the file tConverter.in as
-	  it ought to be.
-
-2005-10-04 11:42  diepen
-
-	* Makefile.am, src/Makefile.am, test/AMCServer/Makefile.am,
-	  test/Makefile.am: BugId: 396 Use $(top_srcdir)/Makefile.common
-
-2005-10-04 11:40  diepen
-
-	* configure.in: BugId: 396 Use lofar_GENERAL
-
-2005-09-28 22:03  loose
-
-	* ChangeLog, NEWS, src/AMCServer/ConverterProcess.cc: BugID: 382
-
-	  Merged release 1.0 patch 1 with main development line.
-
-2005-09-27 16:37  loose
-
-	* ChangeLog, NEWS: BugID: 382
-
-	  Created patch release 1_0patch1.
-
-2005-09-26 09:56  loose
-
-	* src/AMCServer/ConverterProcess.cc: BugID: 382
-
-	  recvRequest() and sendResult() now throw a ServerError exception
-	  when read() or write() fails. This exception is caught in
-	  handleRequests() which then returns.
-
-2005-07-27 17:16  loose
-
-	* src/ConverterImpl.cc, src/ConverterImpl.h, test/Makefile.am,
-	  test/tConverter.cc, test/tConverter.out, test/tConverter.stdout:
-	  BugID: 196
-
-	  * Added conversion routines for J2000 to ITRF conversion of sky
-	  coordinates. Actual conversion has not yet been implemented.
-
-	  * Added support for different types of SkyCoord (J2000, AZEL, and
-	  ITRF) and   EarthCoord (ITRF, WGS84). Modifications are backward
-	  compatible, except for   the output of operator<<(), which now
-	  also prints the type.    Tests have been extended to cover these
-	  different types.
-
-2005-07-08 13:50  loose
-
-	* test/: tConverter.out, tConverter.stdout: %[ER: 214]%
-
-	  Changed value for someTime, because it caused rounding errors in
-	  some cases. Hopefully, these errors are gone now.
-
-2005-07-07 12:57  loose
-
-	* test/tConverter.cc: %[ER: 214]%
-
-	  Changed value for someTime, because it caused rounding errors in
-	  some cases. Hopefully, these errors are gone now.
-
-2005-07-05 16:29  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in,
-	  test/tConverter.run: %[ER: 214]%
-
-	  Merged relevant changes from the 1.0 release branch back into the
-	  main development line.
-
-2005-07-05 09:40  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in:
-	  %[ER: 0]%
-
-	  Prepare for release 1.0
-
-2005-07-04 11:56  loose
-
-	* src/ConverterImpl.cc, src/ConverterImpl.h, src/Exceptions.h,
-	  src/Makefile.am, src/AMCServer/ConverterProcess.cc,
-	  src/AMCServer/ConverterProcess.h,
-	  src/AMCServer/ConverterServer.cc,
-	  src/AMCServer/ConverterServer.h, src/AMCServer/Process.cc,
-	  src/AMCServer/Process.h, src/AMCServer/amcserver.cc,
-	  src/AMCServer/amcserver.log_prop, test/Makefile.am,
-	  test/tConverter.cc, test/tConverter.log_prop,
-	  test/tConverter.out, test/tConverter.run, test/tConverter.sh,
-	  test/tConverter.stdout, test/tConverterImpl.cc,
-	  test/tConverterImpl.out, test/tConverterImpl.stdout,
-	  test/AMCServer/Makefile.am, test/AMCServer/tProcess.cc,
-	  test/AMCServer/tProcess.out, test/AMCServer/tProcess.sh,
-	  test/AMCServer/tProcess.stdout: %[ER: 231]%
-
-	  Merged changes of ER231 with the main development line.
-
-2005-06-24 15:42  lofar
-
-	* configure.in: changed lofar_INTERNAL entry
-
-2005-06-03 15:28  loose
-
-	* src/ConverterImpl.cc: %[ER: 231]%
-
-	  Minor code changes.
-
-2005-06-03 15:28  loose
-
-	* src/AMCServer/ConverterServer.h: %[ER: 231]%
-
-	  Improved documentation.
-
-2005-05-27 16:57  coolen
-
-	* configure.in: %[ER: 273]%
-
-	  Changed from lofar_PACKAGE to lofar_INTERNAL.
-
-2005-05-26 12:20  loose
-
-	* src/: ConverterImpl.h, Exceptions.h,
-	  AMCServer/ConverterProcess.h, AMCServer/ConverterServer.h,
-	  AMCServer/Process.h: %[ER: 231]%
-
-	  Improved documentation.
-
-2005-05-25 15:59  loose
-
-	* test/: Makefile.am, tConverter.cc, tConverter.log_prop,
-	  tConverter.out, tConverter.run, tConverter.sh, tConverter.stdout,
-	  tConverterImpl.cc, AMCServer/tClientServer.out,
-	  AMCServer/tClientServer.run, AMCServer/tClientServer.sh,
-	  AMCServer/tConverterClient.cc, AMCServer/tConverterServer.cc:
-	  %[ER: 231]%
-
-	  Merged the tests tConverterImpl and tConverterClient into
-	  tConverter. This makes sense, because both programs shared a lot
-	  of source code and the output of both programs should always be
-	  the same. Whether ConverterImpl or ConverterClient is tested is
-	  now determined by the contents of tConverter.in; this file is
-	  created by tConverter.sh. The tConverterServer program was
-	  promoted to the program `amcserver' and moved into the src
-	  directory tree.
-
-2005-05-25 15:41  loose
-
-	* src/: Makefile.am, AMCServer/amcserver.cc,
-	  AMCServer/amcserver.log_prop: %[ER: 231]%
-
-	  Added amcserver program, which implements an AMC Server process.
-
-2005-05-23 16:56  loose
-
-	* test/: tConverterImpl.out, tConverterImpl.stdout: %[ER: 214]%
-
-	  AIPS++ Measures tables were updated today. This caused some
-	  rounding errors. Hence a new output file.
-
-2005-05-18 16:58  loose
-
-	* test/AMCServer/: Makefile.am, tClientServer.out,
-	  tClientServer.run, tClientServer.sh, tConverterClient.cc,
-	  tConverterServer.out, tConverterServer.run, tConverterServer.sh:
-	  %[ER: 231]%
-
-	  Restructured client/server test. Now both tConverterClient and
-	  tConverterServer are built in the AMCServer test directory.
-	  Although the client can be built using only the AMCBase package,
-	  it cannot run successfully without the server, which obviously
-	  needs the AMCImpl package. The testname has been modified to
-	  "tClientServer".
-
-2005-05-18 15:22  loose
-
-	* test/tConverterImpl.run: %[ER: 231]%
-
-	  We no longer need the .run file, because the AIPS++ environment
-	  is now set by runtest.sh whenever AIPSPP is defined.
-
-2005-05-18 15:20  loose
-
-	* test/Makefile.am: %[ER: 231]%
-
-	  We need to export both LOFARROOT and AIPSPP.
-
-2005-05-18 15:19  loose
-
-	* src/AMCServer/ConverterServer.cc: %[ER: 231]%
-
-	  Added a few trace log messages.
-
-2005-05-13 16:55  loose
-
-	* test/tConverterImpl.run: %[ER: 214]%
-
-	  We do not want the AIPS++ version number in the output file; it
-	  will change over time!
-
-2005-05-13 16:41  loose
-
-	* configure.in, src/Makefile.am, src/AMCServer/Makefile.am: %[ER:
-	  214]%
-
-	  Removed convenience libraries libamcclient in AMCBase/AMCClient
-	  and libamcserver in AMCImpl/AMCServer. They caused too much
-	  trouble during linking.
-
-2005-05-13 11:44  coolen
-
-	* configure.in, src/Makefile.am, src/AMCServer/ConverterProcess.cc,
-	  src/AMCServer/ConverterProcess.h,
-	  src/AMCServer/ConverterServer.cc,
-	  src/AMCServer/ConverterServer.h, src/AMCServer/Makefile.am,
-	  src/AMCServer/Process.cc, src/AMCServer/Process.h,
-	  test/tConverterImpl.cc, test/tConverterImpl.out,
-	  test/tConverterImpl.run, test/tConverterImpl.stdout,
-	  test/AMCServer/Makefile.am, test/AMCServer/tConverterServer.cc,
-	  test/AMCServer/tConverterServer.out,
-	  test/AMCServer/tConverterServer.run,
-	  test/AMCServer/tConverterServer.sh, test/AMCServer/tProcess.cc,
-	  test/AMCServer/tProcess.out, test/AMCServer/tProcess.sh,
-	  test/AMCServer/tProcess.stdout: all changes so far for the
-	  lofar_PACKAGE to lofar_INTERNAL step.  beware!!!  this branch
-	  also contains the ER231 changes , and those are NOT wanted in the
-	  main development tree....  Only take the configure.in stuff
-
-2005-05-09 10:56  coolen
-
-	* configure.in: %[ER: 273]% minor bugs removed && PACKAGE ..
-	  INTERNAL changed in configure.in files
-
-2005-04-04 12:07  loose
-
-	* configure.in: %[ER: 214]%
-
-	  Should have removed src/AMCClient/Makefile and
-	  src/AMCServer/Makefile from AC_OUTPUT, because the associated
-	  Makefile.am were removed.
-
-2005-04-01 18:08  loose
-
-	* configure.in, src/Makefile.am, src/AMCServer/ConverterProcess.cc,
-	  src/AMCServer/ConverterProcess.h,
-	  src/AMCServer/ConverterServer.cc,
-	  src/AMCServer/ConverterServer.h, src/AMCServer/Makefile.am,
-	  src/AMCServer/Process.cc, src/AMCServer/Process.h,
-	  test/tConverterImpl.cc, test/tConverterImpl.out,
-	  test/tConverterImpl.run, test/tConverterImpl.stdout,
-	  test/AMCServer/Makefile.am, test/AMCServer/tConverterServer.cc,
-	  test/AMCServer/tConverterServer.out,
-	  test/AMCServer/tConverterServer.run,
-	  test/AMCServer/tConverterServer.sh, test/AMCServer/tProcess.cc,
-	  test/AMCServer/tProcess.out, test/AMCServer/tProcess.sh,
-	  test/AMCServer/tProcess.stdout: %[ER: 214]%
-
-	  AMC client/server is now (almost) complete. The implementation is
-	  based on the ER231 enhancements made in package LCS/Transport.
-
-	  * Removed DH_Converter class; added DH_Request and DH_Result
-	  classes. It	turned out that we do need separate data holder
-	  classes for request and   result.
-
-	  * Removed convenience libraries libamcclient in AMCBase/AMCClient
-	  and	libamcserver in AMCImpl/AMCServer. They caused too much
-	  trouble during   linking.
-
-	  * Modified both ConverterClient and ConverterServer.
-
-	  * Added class Process that wraps the OS fork() method. Class
-	  ConverterProcess   is derived from this base class.
-
-	  * Added several test programs; the most important being
-	  tConverterClient and	 tConverterServer. The tConverterServer.run
-	  script will try to start both   server and client; the client
-	  then requests some conversions from the   server; the output
-	  returned by the server is then verified.
-
-2005-03-10 09:54  loose
-
-	* src/: ConverterImpl.h, Exceptions.h,
-	  AMCServer/ConverterServer.cc, AMCServer/ConverterServer.h: %[ER:
-	  214]%
-
-	  Alpha version. Parts of client/server have been implemented.
-	  Mostly updated to latest coding standards.
-
-2005-02-25 09:26  loose
-
-	* src/ConverterImpl.cc: %[ER: 214]%
-
-	  Added extra parentheses around the constructors of the
-	  temporaries of Quantity and MVDirection to keep the GCC 3.2
-	  parser happy and unconfused..
-
-2005-02-24 12:27  loose
-
-	* src/AMCServer/: ConverterServer.cc, ConverterServer.h: %[ER:
-	  214]%
-
-	  This class represents the server side of the client/server
-	  implementation of the AMC.
-
-2005-02-24 12:26  loose
-
-	* test/: tConverterImpl.out, tConverterImpl.run,
-	  tConverterImpl.stdout: %[ER: 214]%
-
-	  We do not want the AIPS++ version number in the output file; it
-	  will change over time!
-
-2005-01-12 18:06  loose
-
-	* test/: tConverterImpl.out, tConverterImpl.stdout: %[ER: 214]%
-
-	  Output of operator<<() for TimeCoord has changed.
-
-2005-01-12 18:03  loose
-
-	* src/AMCServer/Makefile.am: %[ER: 214]%
-
-	  Added ConverterServer.
-
-2005-01-12 18:03  loose
-
-	* src/ConverterImpl.cc: %[ER: 214]%
-
-	  AIPS++ Measures now resides in namespace "casa".
-
-2004-12-14 14:08  loose
-
-	* Makefile.am, bootstrap, configure.in, src/ConverterImpl.cc,
-	  src/ConverterImpl.h, src/Exceptions.h, src/Makefile.am,
-	  src/AMCServer/Makefile.am, test/Makefile.am,
-	  test/tConverterImpl.cc, test/tConverterImpl.out,
-	  test/tConverterImpl.run, test/tConverterImpl.sh,
-	  test/tConverterImpl.stdout, test/AMCServer/Makefile.am: %[ER:
-	  214]%
-
-	  Initial version. Stand-alone version is (mostly) implemented.
-	  Client/Server still needs to be done.
-
diff --git a/LCS/AMC/AMCImpl/INSTALL b/LCS/AMC/AMCImpl/INSTALL
deleted file mode 100644
index 4d4822918e1194406068f1220d6bb5523e0ad624..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building a LOFAR package
-========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to the package root directory (i.e. LCS/AMC/AMCImpl).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/LCS/AMC/AMCImpl/Makefile.am b/LCS/AMC/AMCImpl/Makefile.am
deleted file mode 100644
index d1a920825ca53f73e76a1c4115ac416646cc581b..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = include src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--with-common=$(prefix) \
-	--with-transport=$(prefix) \
-	--with-amcbase=$(prefix) 
-
-EXTRA_DIST = \
-	Makefile.common \
-	AMCImpl.spec \
-	autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCImpl/NEWS b/LCS/AMC/AMCImpl/NEWS
deleted file mode 100644
index aec95b5df84405c74d94cfadc6871de24b2e997f..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/NEWS
+++ /dev/null
@@ -1,54 +0,0 @@
-LCS/AMC/AMCImpl: Version 1.0 patch 1, date: 2005/09/27
-======================================================
-
-The following BugIDs have been resolved:
----------------------------------------
-
-# 196 : Add support for conversion to ITRF
-
-        Conversion from J200 to ITRF and vice versa has been implemented. Test
-        programs have been updated and their output has been verified using
-        the AIPS++ Glish script measures.g.
-
-# 382 : Connection loss to AMCserver can not be detected or acted upon in
-        client.
-
-        ConverterServer does not throw an exception anymore when a client has
-        disconnected, as this is not considered exceptional.
-
-
-
-LCS/AMC/AMCImpl: Version 1.0 patch 2, date: 2005/10/10
-======================================================
-
-The following BugIDs have been resolved:
----------------------------------------
-
-# 444 : amcserver leaks file descriptors/socket
-
-        In ConverterServer::handleConnections(), the data socket is now
-        deleted in the parent process; otherwise the server would sooner or
-        later run out of file descriptors.
-
-
-
-LCS/AMC/AMCImpl: Version 1.0 patch 1, date: 2005/09/27
-======================================================
-
-The following BugIDs have been resolved:
----------------------------------------
-
-# 382 : Connection loss to AMCserver can not be detected or acted upon in
-        client.
-
-        ConverterServer would throw an AssertError when the client had
-        died. This has now been fixed; a ServerError is thrown instead, which
-        is caught in the main event loop.
-
-
-
-LCS/AMC/AMCImpl: Version 1.0, date: 2005/07/04
-==============================================
-
-This is the first official release of the AMCImpl package. 
-
diff --git a/LCS/AMC/AMCImpl/bootstrap b/LCS/AMC/AMCImpl/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/LCS/AMC/AMCImpl/configure.in b/LCS/AMC/AMCImpl/configure.in
deleted file mode 100644
index fe31938575c91c4f8416fdc3531da647d1300cd7..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_INIT_AUTOMAKE(AMCImpl, 2.0, no-define)
-AM_CONFIG_HEADER(config.h)
-dnl AX_PREFIX_CONFIG_H([lofar-config.h], [])
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_AIPSPP(1,"-lmeasures -ltables -lscimath -lscimath_f -lcasa")
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
-lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/Converter.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-Makefile
-include/Makefile
-include/AMCImpl/Makefile
-src/Makefile
-test/Makefile
-AMCImpl.spec
-)
diff --git a/LCS/AMC/AMCImpl/include/AMCImpl/Makefile.am b/LCS/AMC/AMCImpl/include/AMCImpl/Makefile.am
deleted file mode 100644
index 4abf997ca9b7c0dc7b191dab8df0ad3b4edac05e..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/include/AMCImpl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	ConverterImpl.h \
-	ConverterProcess.h \
-	ConverterServer.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCImpl/include/Makefile.am b/LCS/AMC/AMCImpl/include/Makefile.am
deleted file mode 100644
index b7417be7956080974414b75590539874b651c5ef..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= AMCImpl
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCImpl/src/Makefile.am b/LCS/AMC/AMCImpl/src/Makefile.am
deleted file mode 100644
index 198bc38ed0df1586d90889fef98754846a83d70b..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/src/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-lib_LTLIBRARIES			= libamcimpl.la
-
-libamcimpl_la_SOURCES 		= Package__Version.cc  ConverterImpl.cc \
-				  ConverterProcess.cc \
-				  ConverterServer.cc
-
-bin_PROGRAMS			= versionamcimpl AMCServer WGS84toITRF
-
-AMCServer_SOURCES		= AMCServer.cc
-AMCServer_LDADD			= libamcimpl.la
-AMCServer_DEPENDENCIES		= libamcimpl.la $(LOFAR_DEPEND)
-
-WGS84toITRF_SOURCES		= WGS84toITRF.cc
-WGS84toITRF_LDADD		= libamcimpl.la
-WGS84toITRF_DEPENDENCIES	= libamcimpl.la $(LOFAR_DEPEND)
-
-versionamcimpl_SOURCES      = versionamcimpl.cc
-versionamcimpl_LDADD        = libamcimpl.la
-versionamcimpl_DEPENDENCIES = libamcimpl.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/AMCImpl/test/Makefile.am b/LCS/AMC/AMCImpl/test/Makefile.am
deleted file mode 100644
index 1ab1866da361740dd1d6f17cf4c853f44c08490d..0000000000000000000000000000000000000000
--- a/LCS/AMC/AMCImpl/test/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-check_PROGRAMS			= tConverter tConverterStress
-
-tConverter_SOURCES		= tConverter.cc
-tConverter_LDADD		= ../src/libamcimpl.la
-tConverter_DEPENDENCIES		= ../src/libamcimpl.la $(LOFAR_DEPEND)
-
-tConverterStress_SOURCES	= tConverterStress.cc
-tConverterStress_LDADD		= ../src/libamcimpl.la
-tConverterStress_DEPENDENCIES	= ../src/libamcimpl.la $(LOFAR_DEPEND)
-
-TESTS				= tConverter.sh \
-				  tConverterStress.sh 
-
-
-EXTRA_DIST			= $(TESTS) \
-				  tConverter.run \
-				  tConverterStress.run \
-				  tConverter.stdout
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/AMC/bootstrap b/LCS/AMC/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/AMC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/AMC/lofarconf.in b/LCS/AMC/lofarconf.in
deleted file mode 100644
index 2c2d8c340c7dc9a5291496a6a85734aa3c914d3b..0000000000000000000000000000000000000000
--- a/LCS/AMC/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-AMCBase #
-AMCImpl #
diff --git a/LCS/ApplCommon/ApplCommon.spec.in b/LCS/ApplCommon/ApplCommon.spec.in
deleted file mode 100644
index 0d5f5e7a48587e73c56b03c04a7692e66ee8cc14..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/ApplCommon.spec.in
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# ApplCommon.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: ApplCommon contains common classes and functions for LOFAR applications.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-ApplCommon contains common classes and functions for LOFAR applications.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/ApplCommon/Makefile.am b/LCS/ApplCommon/Makefile.am
deleted file mode 100644
index 14be32e19bf8fd1350201a6ef861e5503e0d3eae..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=include src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      ApplCommon.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ApplCommon/bootstrap b/LCS/ApplCommon/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/ApplCommon/configure.in b/LCS/ApplCommon/configure.in
deleted file mode 100644
index 6be9674a7b807284fee8d1c4a8f28cc3fb06d24c..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ApplCommon, 3.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR general things
-dnl
-lofar_GENERAL
-lofar_MPI
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-dnl lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, "boost_date_time boost_regex")
-lofar_EXTERNAL(BOOST_DATE_TIME,1,boost/date_time/date.hpp, "boost_date_time")
-lofar_EXTERNAL(BOOST_REGEX,0,boost/regex.hpp, "boost_regex")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/ApplCommon/Makefile
-src/Makefile
-test/Makefile
-Makefile
-ApplCommon.spec
-)
diff --git a/LCS/ApplCommon/include/ApplCommon/Makefile.am b/LCS/ApplCommon/include/ApplCommon/Makefile.am
deleted file mode 100644
index 5de071e5d5825e7d4f5149c95e5ad13b71133e4e..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/include/ApplCommon/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-pkginclude_HEADERS = Package__Version.h  \
-					 Observation.h \
-					 StationConfig.h \
-					 StationInfo.h
-
-noinst_HEADERS =
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ApplCommon/include/Makefile.am b/LCS/ApplCommon/include/Makefile.am
deleted file mode 100644
index 67a7e61584e42c941870d4605533a147ec5079ea..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= ApplCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ApplCommon/src/Makefile.am b/LCS/ApplCommon/src/Makefile.am
deleted file mode 100644
index 6fd7b691ea750d393a5992dd96c239121fcabf37..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/src/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-lib_LTLIBRARIES 		= libapplcommon.la
-
-libapplcommon_la_SOURCES = Package__Version.cc   \
-						   Observation.cc \
-						   StationConfig.cc \
-						   StationInfo.cc
-
-BUILT_SOURCES 			= 
-
-EXTRA_DIST 				= $(BUILT_SOURCES)
-
-sysconf_DATA			= 
-
-bin_SCRIPTS				= 
-
-bin_PROGRAMS = versionapplcommon
-
-versionapplcommon_SOURCES      = versionapplcommon.cc
-versionapplcommon_LDADD        = libapplcommon.la
-versionapplcommon_DEPENDENCIES = libapplcommon.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/ApplCommon/test/Makefile.am b/LCS/ApplCommon/test/Makefile.am
deleted file mode 100755
index 457ec47b8aa09166fe81d64e298b10b0c788f62e..0000000000000000000000000000000000000000
--- a/LCS/ApplCommon/test/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-check_PROGRAMS			= tObservation tStationInfo
-
-TESTSCRIPTS			= tObservation.sh 
-
-TESTS				= $(TESTSCRIPTS)
-
-tObservation_SOURCES		= tObservation.cc
-tObservation_LDADD		= ../src/libapplcommon.la
-tObservation_DEPENCIES		= ../src/libapplcommon.la $(LOFAR_DEPEND)
-
-tStationInfo_SOURCES		= tStationInfo.cc
-tStationInfo_LDADD		= ../src/libapplcommon.la $(LOFAR_DEPEND)
-tStationInfo_DEPENCIES		= ../src/libapplcommon.la $(LOFAR_DEPEND)
-
-EXTRA_DIST			= tObservation.log_prop tObservation.run \
-				tObservation.stdout \
-				tObservation.in_conflict1 \
-				tObservation.in_conflict2 \
-				tObservation.in_conflict3 \
-				tObservation.in_conflict4 \
-				tObservation.in_conflict5 \
-				tObservation.in_parset1 \
-				  $(TESTSCRIPTS)
-
-NOINSTHDRS =
-
-INSTHDRS =
-
-pkginclude_HEADERS = $(NOINSTHDRS) $(INSTHDRS)
-
-
-%.log_prop: %.log_prop.in
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Blob/AUTHORS b/LCS/Blob/AUTHORS
deleted file mode 100644
index 501d51acdb14096b97d6f87701605cc6022acfe5..0000000000000000000000000000000000000000
--- a/LCS/Blob/AUTHORS
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Ger van Diepen          <diepen@astron.nl>
-
-
-Contributors:
-============
-
-        Chris Broekema          <broekema@astron.nl>
-        Marcel Loose            <loose@astron.nl>
-        Ruud Overeem            <overeem@astron.nl>
-        John Romein             <romein@astron.nl>
-        Walther Zwart           <zwart@astron.nl>
diff --git a/LCS/Blob/Blob.spec.in b/LCS/Blob/Blob.spec.in
deleted file mode 100644
index 150bf7078c024d09308e2d04e8a28fa02bcecae5..0000000000000000000000000000000000000000
--- a/LCS/Blob/Blob.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Blob.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Blob is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 3.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Blob ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/Blob/COPYING b/LCS/Blob/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/LCS/Blob/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LCS/Blob/ChangeLog b/LCS/Blob/ChangeLog
deleted file mode 100644
index 715d03373ede3f562ff859a2cb97ed53fbead2ab..0000000000000000000000000000000000000000
--- a/LCS/Blob/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-2006-01-26 15:40  diepen
-
-	* test/: tBlobStream.cc, tBlobStream.in_be, tBlobStream.in_le:
-	  BugID: 603 DataConvert changed the bit order, so the in_* files
-	  were not correct.  Furthermore tBlobStream has been made a bit
-	  more robust.
-
-2006-01-19 15:37  diepen
-
-	* include/Blob/KeyValue.h: BugID: 556 Removed scoping to get rid of
-	  compiler warning.
-
-2006-01-18 11:45  loose
-
-	* include/Blob/Makefile.am: BugID: 596
-
-	  * Removed any references to nobase_.	* Removed "local" variable
-	  INSTHDRS as it is not useful anymore.  * Added few missing
-	  --with-<package>=$(prefix) lines.
-
-2006-01-02 12:41  diepen
-
-	* Blob.spec.in: Bugid: 556 Added Requires line
-
-2006-01-02 12:32  diepen
-
-	* test/tKeyValueMap.cc: Bugid: 556 Moved Blob code to a separate
-	  package
diff --git a/LCS/Blob/INSTALL b/LCS/Blob/INSTALL
deleted file mode 100644
index 55dcc050053270ac1a470723e3c116f5ef30db3d..0000000000000000000000000000000000000000
--- a/LCS/Blob/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building a LOFAR package
-========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to the package root directory (i.e. LCS/Blob).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/LCS/Blob/Makefile.am b/LCS/Blob/Makefile.am
deleted file mode 100644
index 59431c8328cd8856242163ed10896fa5f190042d..0000000000000000000000000000000000000000
--- a/LCS/Blob/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      Blob.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Blob/NEWS b/LCS/Blob/NEWS
deleted file mode 100644
index e50d396643c90723fa56e3de550e8e7679a406a5..0000000000000000000000000000000000000000
--- a/LCS/Blob/NEWS
+++ /dev/null
@@ -1,17 +0,0 @@
-LCS/Blob: Version 1.0, date: 2006/01/31
-=======================================
-
-This is the first release of LCS/Blob as a separate package; it used to be
-part of the LCS/Common package. For changes to the blob stuff prior to the
-split up, please refer to the NEWS and ChangeLog files of the LCS/Common
-package.
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 603 : The tBlobStream test fails with an exception: 
-        Assertion: valbl[i] == valblc[i]
-        DataConvert changed the bit order, so the in_* files were not correct.
-        Furthermore tBlobStream has been made a bit more robust.
-
diff --git a/LCS/Blob/bootstrap b/LCS/Blob/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/Blob/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/Blob/configure.in b/LCS/Blob/configure.in
deleted file mode 100644
index 32618b7c52da85aa14eadb1e6abce2953395b89b..0000000000000000000000000000000000000000
--- a/LCS/Blob/configure.in
+++ /dev/null
@@ -1,70 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Blob, 1.2, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_AIPSPP(0,"-lcasa")
-lofar_BLITZ(0)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/Blob/Makefile
-src/Makefile
-test/Makefile
-Makefile
-Blob.spec
-)
diff --git a/LCS/Blob/include/Blob/Makefile.am b/LCS/Blob/include/Blob/Makefile.am
deleted file mode 100644
index 8ef300c0d59c4ffa80a4e7f3e677cb9432c22f52..0000000000000000000000000000000000000000
--- a/LCS/Blob/include/Blob/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	BlobAipsIO.h \
-        BlobArray.h \
-	BlobArray.tcc \
-        BlobArrayHeader.h \
-        BlobException.h \
-        BlobField.h \
-	BlobField.tcc \
-        BlobFieldSet.h \
-        BlobHeader.h \
-        BlobIBufChar.h \
-        BlobIBuffer.h \
-        BlobIBufStream.h \
-        BlobIBufString.h \
-        BlobIBufVector.h \
-        BlobIStream.h \
-        BlobOBufChar.h \
-        BlobOBuffer.h \
-        BlobOBufNull.h \
-        BlobOBufStream.h \
-        BlobOBufString.h \
-        BlobOBufVector.h \
-        BlobOStream.h \
-	BlobSTL.h \
-	BlobSTL.tcc \
-	BlobStreamable.h \
-        BlobString.h \
-        BlobStringTraits.h \
-        BlobStringType.h \
-        KeyParser.h \
-        KeyValue.h \
-        KeyValueMap.h 
-
-noinst_HEADERS =
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Blob/include/Makefile.am b/LCS/Blob/include/Makefile.am
deleted file mode 100644
index bb2e01cc7a5e7d42002ba7549b57dae2c2a1cb22..0000000000000000000000000000000000000000
--- a/LCS/Blob/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= Blob
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Blob/src/Makefile.am b/LCS/Blob/src/Makefile.am
deleted file mode 100644
index f03c1781193ba9c1dab0e9a64e00730f5684b272..0000000000000000000000000000000000000000
--- a/LCS/Blob/src/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-lib_LTLIBRARIES 	= libblob.la
-
-libblob_la_SOURCES 	= Package__Version.cc  \
-	BlobAipsIO.cc \
-        BlobArray.cc \
-        BlobField2.cc \
-        BlobFieldSet.cc \
-        BlobHeader.cc \
-        BlobIBufChar.cc \
-        BlobIBufStream.cc \
-        BlobIStream.cc \
-        BlobOBufChar.cc \
-        BlobOBufNull.cc \
-        BlobOBufStream.cc \
-        BlobOBufString.cc \
-        BlobOStream.cc \
-	BlobStreamable.cc \
-        BlobString.cc \
-        BlobStringType.cc \
-        KeyParse.yy \
-        KeyTokenize.ll \
-        KeyParser.cc \
-        KeyValue.cc \
-        KeyValueMap.cc 
-
-AM_YFLAGS		= -d -p KeyParse
-AM_LFLAGS		= -PKeyTokenize
-LEX_OUTPUT_ROOT		= lex.KeyTokenize
-
-bin_PROGRAMS = versionblob
-
-versionblob_SOURCES      = versionblob.cc
-versionblob_LDADD        = libblob.la
-versionblob_DEPENDENCIES = libblob.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Blob/test/Makefile.am b/LCS/Blob/test/Makefile.am
deleted file mode 100644
index 7c9f29ac11b827b5009612506c9a717982d770cc..0000000000000000000000000000000000000000
--- a/LCS/Blob/test/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-check_PROGRAMS	      =	tBlobHeader tBlobString tBlobStream tBlobArray \
-			tBlobSTL tBlobCasa \
-			tBlobField tBlobAipsIO tKeyValueMap
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS	      =	$(check_PROGRAMS)
-
-TESTSCRIPTS = \
-          tBlobHeader.sh \
-          tBlobString.sh \
-          tBlobStream.sh \
-	  tBlobArray.sh \
-	  tBlobSTL.sh \
-	  tBlobCasa.sh \
-	  tBlobField.sh \
-	  tBlobAipsIO.sh \
-	  tKeyValueMap.sh 
-
-TESTS	= $(TESTSCRIPTS)
-
-EXTRA_DIST = $(TESTSCRIPTS) \
-	  tBlobField.in_be tBlobField.in_le \
-          tBlobStream.in_be tBlobStream.in_le tBlobStream.stdout \
-	  tKeyValueMap.in tKeyValueMap.stdout 
-
-tBlobHeader_SOURCES		= tBlobHeader.cc
-tBlobHeader_LDADD		= ../src/libblob.la
-tBlobHeader_DEPENDENCIES	= ../src/libblob.la $(LOFAR_DEPEND)
-
-tBlobString_SOURCES		= tBlobString.cc
-tBlobString_LDADD		= ../src/libblob.la
-tBlobString_DEPENDENCIES	= ../src/libblob.la $(LOFAR_DEPEND)
-
-tBlobStream_SOURCES		= tBlobStream.cc
-tBlobStream_LDADD		= ../src/libblob.la
-tBlobStream_DEPENDENCIES	= ../src/libblob.la $(LOFAR_DEPEND)
-
-tBlobArray_SOURCES		= tBlobArray.cc
-tBlobArray_LDADD		= ../src/libblob.la
-tBlobArray_DEPENDENCIES		= ../src/libblob.la $(LOFAR_DEPEND)
-
-tBlobSTL_SOURCES		= tBlobSTL.cc
-tBlobSTL_LDADD			= ../src/libblob.la
-tBlobSTL_DEPENDENCIES		= ../src/libblob.la $(LOFAR_DEPEND)
-
-tBlobCasa_SOURCES		= tBlobCasa.cc
-tBlobCasa_LDADD			= ../src/libblob.la
-tBlobCasa_DEPENDENCIES		= ../src/libblob.la $(LOFAR_DEPEND)
-
-tBlobField_SOURCES		= tBlobField.cc
-tBlobField_LDADD		= ../src/libblob.la
-tBlobField_DEPENDENCIES		= ../src/libblob.la $(LOFAR_DEPEND)
-
-tBlobAipsIO_SOURCES		= tBlobAipsIO.cc
-tBlobAipsIO_LDADD		= ../src/libblob.la
-tBlobAipsIO_DEPENDENCIES	= ../src/libblob.la $(LOFAR_DEPEND)
-
-tKeyValueMap_SOURCES		= tKeyValueMap.cc
-tKeyValueMap_LDADD		= ../src/libblob.la
-tKeyValueMap_DEPENDENCIES	= ../src/libblob.la $(LOFAR_DEPEND)
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Common/AUTHORS b/LCS/Common/AUTHORS
deleted file mode 100644
index f49c70bbdc46157a96d8a2576d414ccf39810f4e..0000000000000000000000000000000000000000
--- a/LCS/Common/AUTHORS
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Ger van Diepen          <diepen@astron.nl>
-
-
-Contributors:
-============
-
-        Michiel Brentjens       <brentjens@astron.nl>
-        Chris Broekema          <broekema@astron.nl>
-        Arthur Coolen           <coolen@astron.nl>
-        Marcel Loose            <loose@astron.nl>
-        Ruud Overeem            <overeem@astron.nl>
-        John Romein             <romein@astron.nl>
-        Kjeld v.d. Schaaf       <schaaf@astron.nl>
-        Oleg Smirnov            <smirnov@astron.nl>
-        Klaas Jan Wierenga      <wierenga@astron.nl>
-        Walther Zwart           <zwart@astron.nl>
diff --git a/LCS/Common/COPYING b/LCS/Common/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/LCS/Common/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LCS/Common/ChangeLog b/LCS/Common/ChangeLog
deleted file mode 100644
index 9ba0c998ba0ba375ed8ca55903a5c847497da605..0000000000000000000000000000000000000000
--- a/LCS/Common/ChangeLog
+++ /dev/null
@@ -1,2795 +0,0 @@
-2006-01-25 15:19  diepen
-
-	* src/DataConvert.cc, test/tDataConvert.cc,
-	  test/tDataConvert.stdout: BugID: 602 Change bit order
-
-2006-01-24 10:07  loose
-
-	* test/Makefile.am: BugID: 557
-
-	  Removed spurious invocation of tComplex.sh.
-
-2006-01-18 09:39  loose
-
-	* include/Common/shmem/Makefile.am: BugID: 596
-
-	  Removed nobase_ from the _HEADERS variable.
-
-2006-01-13 15:17  overeem
-
-	* src/Net/Socket.cc: BugID: 548 Made it more robust.
-
-2006-01-12 16:51  overeem
-
-	* src/Net/Socket.cc: BugID: 548 Reimplementation of the bugfix.
-	  This time the accept call keeps working right for non-blocking
-	  sockets.
-
-2006-01-05 14:00  loose
-
-	* configure.in: BugID: 557
-
-	  The check for Boost.Threads causes havoc for other packages,
-	  because the .so file is in a non-standard directory and
-	  automake/libtool does not add a -rpath for this .so file (I've
-	  posted a question about this on the automake mailing list).
-
-2006-01-05 09:58  overeem
-
-	* include/Common/LofarLog4Cplus.h, test/testLogger.cc: BugID: 146
-	  Created patch for log4cplus 1.0.2 and include global-init.h in
-	  the header- file of the lofarlogger. Updated the testprogram to
-	  test the static initialize class also.
-
-2006-01-04 16:52  loose
-
-	* configure.in, include/Common/lofar_thread.h: BugID: 557
-
-	  Enhanced lofar_thread.h which should now be a real substitute for
-	  the deprecated Thread.h.
-
-2006-01-04 10:08  loose
-
-	* include/Common/Makefile.am: BugID: 352 557
-
-	  Removed any references to nobase_, and removed "local" variable
-	  INSTHDRS as it is not useful anymore.
-
-2006-01-03 16:31  loose
-
-	* include/Common/: LofarTypes.h, Makefile.am, lofar_algorithm.h,
-	  lofar_deque.h, lofar_fstream.h, lofar_iosfwd.h, lofar_iostream.h,
-	  lofar_list.h, lofar_map.h, lofar_set.h, lofar_sstream.h,
-	  lofar_stack.h, lofar_string.h, lofar_thread.h, lofar_vector.h:
-	  BugID: 557
-
-	  Removed the support for "exporting" symbols to the global
-	  namespace. All symbols are now only defined in the LOFAR
-	  namespace.
-
-2006-01-03 15:50  loose
-
-	* configure.in, src/Stopwatch.cc, test/tNumeric.cc,
-	  test/tRunOnNode.cc: BugID: 557
-
-	  Removed some compiler warnings. Updated configure.in to LCS
-	  version 3.0
-
-2006-01-03 15:29  loose
-
-	* test/: Makefile.am, tDebug.cc, tDebug.stdout, tDebug_test.sh,
-	  tLorrays.cc, tLorrays.stdout, tLorrays_test.sh: BugID: 557
-
-	  Removed deprecated Debug, Thread and backward compatibility stuff
-
-2006-01-03 15:26  loose
-
-	* include/Common/Debug.h, include/Common/Makefile.am,
-	  include/Common/Thread.h,
-	  include/Common/lofar_global_symbol_warning.h,
-	  include/Common/lofar_strstream.h, src/Debug.cc, src/Makefile.am:
-	  BugID: 557
-
-	  Removed deprecated Debug, Thread and backward compatibility stuff
-
-2006-01-03 15:11  loose
-
-	* include/Common/BlitzToAips.h: BugID: 557
-
-	  Moved Blitz related stuff from LCS/Common to LCS/Math.
-
-2006-01-03 15:07  loose
-
-	* include/Common/: Lonumerics.h, Lorrays-Blitz.h, Lorrays.h: BugID:
-	  557
-
-	  Moved Blitz related stuff from LCS/Common to LCS/Math.
-
-2006-01-02 12:26  cvs
-
-	* test/: tKeyValueMap.cc, tKeyValueMap.in, tKeyValueMap.stdout,
-	  tKeyValueMap_test.sh: %lofarcvsmv%: Moved to LOFAR/LCS/Blob/test
-
-2006-01-02 12:08  diepen
-
-	* package.dox, include/Common/Makefile.am, src/Makefile.am,
-	  test/Makefile.am: Bugid: 556 Blob code moved to a separate
-	  package
-
-2006-01-02 12:03  cvs
-
-	* test/: tBlobArray.cc, tBlobArrayHeader.cc,
-	  tBlobArrayHeader_test.sh, tBlobArray_test.sh, tBlobField.cc,
-	  tBlobField.in_be, tBlobField.in_le, tBlobField_test.sh,
-	  tBlobHeader.cc, tBlobHeader_test.sh, tBlobStream.cc,
-	  tBlobStream.in_be, tBlobStream.in_le, tBlobStream.stdout,
-	  tBlobStream_test.sh, tBlobString.cc, tBlobString_test.sh:
-	  %lofarcvsmv%: Moved to LOFAR/LCS/Blob/test
-
-2006-01-02 12:00  cvs
-
-	* src/: KeyParser.cc, KeyValue.cc, KeyValueMap.cc, KeyTokenize.ll,
-	  KeyParse.yy, BlobArray.cc, BlobField2.cc, BlobFieldSet.cc,
-	  BlobHeader.cc, BlobIBufChar.cc, BlobIBufStream.cc,
-	  BlobIStream.cc, BlobOBufChar.cc, BlobOBufNull.cc,
-	  BlobOBufStream.cc, BlobOBufString.cc, BlobOStream.cc,
-	  BlobString.cc, BlobStringType.cc: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/Blob/src
-
-2006-01-02 11:56  cvs
-
-	* include/Common/: BlobArray.h, BlobArrayHeader.h, BlobException.h,
-	  BlobField.h, BlobFieldSet.h, BlobHeader.h, BlobIBufChar.h,
-	  BlobIBuffer.h, BlobIBufStream.h, BlobIBufString.h,
-	  BlobIBufVector.h, BlobIStream.h, BlobOBufChar.h, BlobOBuffer.h,
-	  BlobOBufNull.h, BlobOBufStream.h, BlobOBufString.h,
-	  BlobOBufVector.h, BlobOStream.h, BlobString.h,
-	  BlobStringTraits.h, BlobStringType.h, KeyParser.h, KeyValue.h,
-	  KeyValueMap.h, BlobArray.tcc, BlobField.cc: %lofarcvsmv%: Moved
-	  to LOFAR/LCS/Blob/include/Blob
-
-2005-12-27 11:02  loose
-
-	* include/Common/Allocator.h, include/Common/BlitzToAips.h,
-	  include/Common/BlobArray.h, include/Common/BlobArrayHeader.h,
-	  include/Common/BlobException.h, include/Common/BlobField.h,
-	  include/Common/BlobFieldSet.h, include/Common/BlobHeader.h,
-	  include/Common/BlobIBufChar.h, include/Common/BlobIBufStream.h,
-	  include/Common/BlobIBufString.h, include/Common/BlobIBufVector.h,
-	  include/Common/BlobIBuffer.h, include/Common/BlobIStream.h,
-	  include/Common/BlobOBufChar.h, include/Common/BlobOBufNull.h,
-	  include/Common/BlobOBufStream.h, include/Common/BlobOBufString.h,
-	  include/Common/BlobOBufVector.h, include/Common/BlobOBuffer.h,
-	  include/Common/BlobOStream.h, include/Common/BlobString.h,
-	  include/Common/BlobStringTraits.h,
-	  include/Common/BlobStringType.h, include/Common/CheckConfig.h,
-	  include/Common/ComplexBuiltinFP.h,
-	  include/Common/ComplexBuiltinInt.h, include/Common/ComplexC99.h,
-	  include/Common/ComplexStdFP.h, include/Common/ComplexStdInt.h,
-	  include/Common/DataConvert.h, include/Common/DataFormat.h,
-	  include/Common/Debug.h, include/Common/Exception.h,
-	  include/Common/KeyParser.h, include/Common/KeyValue.h,
-	  include/Common/KeyValueMap.h, include/Common/LofarLog4Cplus.h,
-	  include/Common/LofarLogCout.h, include/Common/LofarLogger.h,
-	  include/Common/LofarTypedefs.h, include/Common/LofarTypes.h,
-	  include/Common/Lonumerics.h, include/Common/Lorrays-Blitz.h,
-	  include/Common/Lorrays.h, include/Common/Numeric.h,
-	  include/Common/RunOnNode.h, include/Common/Stopwatch.h,
-	  include/Common/StringUtil.h, include/Common/Thread.h,
-	  include/Common/Timer.h, include/Common/TypeNames.h,
-	  include/Common/VectorUtil.h, include/Common/hexdump.h,
-	  include/Common/lofar_algorithm.h, include/Common/lofar_complex.h,
-	  include/Common/lofar_datetime.h, include/Common/lofar_deque.h,
-	  include/Common/lofar_fstream.h,
-	  include/Common/lofar_global_symbol_warning.h,
-	  include/Common/lofar_iomanip.h, include/Common/lofar_iosfwd.h,
-	  include/Common/lofar_iostream.h, include/Common/lofar_list.h,
-	  include/Common/lofar_map.h, include/Common/lofar_set.h,
-	  include/Common/lofar_sstream.h, include/Common/lofar_stack.h,
-	  include/Common/lofar_string.h, include/Common/lofar_strstream.h,
-	  include/Common/lofar_thread.h, include/Common/lofar_vector.h,
-	  include/Common/Net/FdSet.h, include/Common/Net/Socket.h,
-	  include/Common/shmem/dlmalloc.h,
-	  include/Common/shmem/segbasemap.h,
-	  include/Common/shmem/shmem_alloc.h, src/HEADER.h: BugID: 394
-
-	  Removed argument to the Doxygen \file command. It caused subtle
-	  documentation bugs and it defaults to the current filename
-	  anyway.
-
-2005-12-23 10:17  zwart
-
-	* src/Net/Socket.cc: BugID: 548
-
-	  If the accept call returns EWOULDBLOCK, EAGAIN or EINTR the call
-	  is repeated.
-
-2005-12-22 15:37  romein
-
-	* include/Common/BlobString.h: BugID: 225 Fix 64-bit bug.
-
-2005-12-19 12:09  romein
-
-	* include/Common/BlobArray.tcc: BugID: 51 Solve 64-bit portability
-	  issue.
-
-2005-12-16 10:05  diepen
-
-	* include/Common/BlobArray.h, include/Common/BlobArray.tcc,
-	  include/Common/BlobField.cc, include/Common/BlobField.h,
-	  include/Common/BlobFieldSet.h, include/Common/BlobString.h,
-	  src/BlobArray.cc, src/BlobField2.cc, src/BlobFieldSet.cc,
-	  src/BlobString.cc, test/tBlobField.cc: BugID: 538 Added alignment
-	  control to BlobField, etc.
-
-2005-11-23 14:56  diepen
-
-	* include/Common/Timer.h, src/Timer.cc: BugID: 500 501 Made
-	  operator<< public.  Added functions getElapsed and getCount
-
-2005-11-22 09:42  loose
-
-	* NEWS, configure.in: BugID: 326
-
-	  Merged relevant changes in release 2.4 with the main development
-	  line.
-
-2005-11-18 17:59  loose
-
-	* NEWS: BugID: 326
-
-	  Added extra release info for release 2.4
-
-2005-11-16 16:58  loose
-
-	* ChangeLog, NEWS, configure.in: BugID: 326
-
-	  Prepare for release 2.4
-
-2005-11-11 11:49  overeem
-
-	* include/Common/LofarLogCout.h: BugID: 488 Added 'public'
-	  statement for ALLOC_TRACER_ALIAS.
-
-2005-10-27 12:24  loose
-
-	* ChangeLog, NEWS, configure.in: BugID: 326
-
-	  Merged relevant changes from the 2.3 release branch into the main
-	  develoment line.
-
-2005-10-24 16:36  broekema
-
-	* src/Net/Socket.cc: BugID: 472 Patch committed
-
-2005-10-24 14:15  lofar
-
-	* package.doc, package.dox: BugID: 271 moved al doxygen related
-	  .doc file to .dox
-
-2005-10-04 14:09  diepen
-
-	* src/Makefile.am: BugID: 396 Removed pkgdep accidently left in
-
-2005-10-04 14:03  cvs
-
-	* src/: BlobField.cc, BlobArray.tcc, TypeNames.tcc: %lofarcvsmv%:
-	  Moved to LOFAR/LCS/Common/include/Common
-
-2005-10-04 14:03  cvs
-
-	* include/Common/: BlobField.cc, BlobArray.tcc, TypeNames.tcc:
-	  %lofarcvsmv%: Moved from LOFAR/LCS/Common/src, creating new
-	  revision
-
-2005-10-04 13:59  diepen
-
-	* include/: Makefile.am, Common/Makefile.am,
-	  Common/shmem/Makefile.am: BugID: 396 New Makefile.am for new
-	  directory
-
-2005-10-04 13:53  cvs
-
-	* test/: tBlobStream.out, tComplex.out, tDataConvert.out,
-	  tDebug.out, tKeyValueMap.out, tLorrays.out, tRunOnNode.out,
-	  tStringUtil.out: %lofarcvsmv%: Moved to LOFAR/LCS/Common/test
-
-2005-10-04 13:53  cvs
-
-	* test/: tBlobStream.stdout, tComplex.stdout, tDataConvert.stdout,
-	  tDebug.stdout, tKeyValueMap.stdout, tLorrays.stdout,
-	  tRunOnNode.stdout, tStringUtil.stdout: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Common/test, creating new revision
-
-2005-10-04 13:52  diepen
-
-	* Common.spec.in, Makefile.am, configure.in, src/Debug.cc,
-	  src/KeyParser.cc, src/KeyTokenize.ll, src/Makefile.am,
-	  src/shmem/Makefile.am, test/Makefile.am: BugID: 396 Make
-	  everything build correctly for distcheck and rpm
-
-2005-10-04 13:23  cvs
-
-	* src/Profiling/PerfProfile.h: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/Common/include/Common/Profiling
-
-2005-10-04 13:23  cvs
-
-	* include/Common/Profiling/PerfProfile.h: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Common/src/Profiling, creating new revision
-
-2005-10-04 13:22  cvs
-
-	* src/shmem/: dlmalloc.h, segbasemap.h, shmem_alloc.h:
-	  %lofarcvsmv%: Moved to LOFAR/LCS/Common/include/Common/shmem
-
-2005-10-04 13:22  cvs
-
-	* include/Common/shmem/: dlmalloc.h, segbasemap.h, shmem_alloc.h:
-	  %lofarcvsmv%: Moved from LOFAR/LCS/Common/src/shmem, creating new
-	  revision
-
-2005-10-04 13:22  cvs
-
-	* src/Thread/: Condition.h, deprecated_warning.h, Key.h, Mutex.h,
-	  SmartLock.h, Thread.h: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/Common/include/Common/Thread
-
-2005-10-04 13:22  cvs
-
-	* include/Common/Thread/: Condition.h, deprecated_warning.h, Key.h,
-	  Mutex.h, SmartLock.h, Thread.h: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Common/src/Thread, creating new revision
-
-2005-10-04 13:22  cvs
-
-	* src/Net/backward/Socket.h: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/Common/include/Common/Net/backward
-
-2005-10-04 13:22  cvs
-
-	* include/Common/Net/backward/Socket.h: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Common/src/Net/backward, creating new revision
-
-2005-10-04 13:21  cvs
-
-	* src/Net/: FdSet.h, Socket.h: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/Common/include/Common/Net
-
-2005-10-04 13:21  cvs
-
-	* include/Common/Net/: FdSet.h, Socket.h: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Common/src/Net, creating new revision
-
-2005-10-04 13:21  cvs
-
-	* include/Common/HEADER.h: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/Common/src
-
-2005-10-04 13:21  cvs
-
-	* src/HEADER.h: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Common/include/Common, creating new revision
-
-2005-10-04 13:13  cvs
-
-	* src/: LofarTypes.h, lofar_vector.h, Lonumerics.h,
-	  Lorrays-Blitz.h, Lorrays.h, Numeric.h, RunOnNode.h, Stopwatch.h,
-	  StringUtil.h, Thread.h, Timer.h, TypeNames.h, VectorUtil.h:
-	  %lofarcvsmv%: Moved to LOFAR/LCS/Common/include/Common
-
-2005-10-04 13:13  cvs
-
-	* include/Common/: LofarTypes.h, lofar_vector.h, Lonumerics.h,
-	  Lorrays-Blitz.h, Lorrays.h, Numeric.h, RunOnNode.h, Stopwatch.h,
-	  StringUtil.h, Thread.h, Timer.h, TypeNames.h, VectorUtil.h:
-	  %lofarcvsmv%: Moved from LOFAR/LCS/Common/src, creating new
-	  revision
-
-2005-10-04 13:10  cvs
-
-	* src/: Allocator.h, BlitzToAips.h, BlobArray.h, BlobArrayHeader.h,
-	  BlobException.h, BlobField.h, BlobFieldSet.h, BlobHeader.h,
-	  BlobIBufChar.h, BlobIBuffer.h, BlobIBufStream.h,
-	  BlobIBufString.h, BlobIBufVector.h, BlobIStream.h,
-	  BlobOBufChar.h, BlobOBuffer.h, BlobOBufNull.h, BlobOBufStream.h,
-	  BlobOBufString.h, BlobOBufVector.h, BlobOStream.h, BlobString.h,
-	  BlobStringTraits.h, BlobStringType.h, CheckConfig.h,
-	  ComplexBuiltinFP.h, ComplexBuiltinInt.h, ComplexC99.h,
-	  ComplexStdFP.h, ComplexStdInt.h, DataConvert.h, DataFormat.h,
-	  Debug.h, Exception.h, hexdump.h, KeyParser.h, KeyValue.h,
-	  KeyValueMap.h, lofar_algorithm.h, lofar_complex.h,
-	  lofar_datetime.h, lofar_deque.h, lofar_fstream.h,
-	  lofar_global_symbol_warning.h, lofar_iomanip.h, lofar_iosfwd.h,
-	  lofar_iostream.h, lofar_list.h, LofarLog4Cplus.h, LofarLogCout.h,
-	  LofarLogger.h, lofar_map.h, lofar_set.h, lofar_sstream.h,
-	  lofar_stack.h, lofar_string.h, lofar_strstream.h, lofar_thread.h,
-	  LofarTypedefs.h: %lofarcvsmv%: Moved to
-	  LOFAR/LCS/Common/include/Common
-
-2005-10-04 13:10  cvs
-
-	* include/Common/Allocator.h, include/Common/BlitzToAips.h,
-	  include/Common/BlobArray.h, include/Common/BlobArrayHeader.h,
-	  include/Common/BlobException.h, include/Common/BlobField.h,
-	  include/Common/BlobFieldSet.h, include/Common/BlobHeader.h,
-	  include/Common/BlobIBufChar.h, include/Common/BlobIBuffer.h,
-	  include/Common/BlobIBufStream.h, include/Common/BlobIBufString.h,
-	  include/Common/BlobIBufVector.h, include/Common/BlobIStream.h,
-	  include/Common/BlobOBufChar.h, include/Common/BlobOBuffer.h,
-	  include/Common/BlobOBufNull.h, include/Common/BlobOBufStream.h,
-	  include/Common/BlobOBufString.h, include/Common/BlobOBufVector.h,
-	  include/Common/BlobOStream.h, include/Common/BlobString.h,
-	  include/Common/BlobStringTraits.h,
-	  include/Common/BlobStringType.h, include/Common/CheckConfig.h,
-	  include/Common/ComplexBuiltinFP.h,
-	  include/Common/ComplexBuiltinInt.h, include/Common/ComplexC99.h,
-	  include/Common/ComplexStdFP.h, include/Common/ComplexStdInt.h,
-	  include/Common/DataConvert.h, include/Common/DataFormat.h,
-	  include/Common/Debug.h, include/Common/Exception.h,
-	  include/Common/HEADER.h, src/HEADER.h, include/Common/hexdump.h,
-	  include/Common/KeyParser.h, include/Common/KeyValue.h,
-	  include/Common/KeyValueMap.h, include/Common/lofar_algorithm.h,
-	  include/Common/lofar_complex.h, include/Common/lofar_datetime.h,
-	  include/Common/lofar_deque.h, include/Common/lofar_fstream.h,
-	  include/Common/lofar_global_symbol_warning.h,
-	  include/Common/lofar_iomanip.h, include/Common/lofar_iosfwd.h,
-	  include/Common/lofar_iostream.h, include/Common/lofar_list.h,
-	  include/Common/LofarLog4Cplus.h, include/Common/LofarLogCout.h,
-	  include/Common/LofarLogger.h, include/Common/lofar_map.h,
-	  include/Common/lofar_set.h, include/Common/lofar_sstream.h,
-	  include/Common/lofar_stack.h, include/Common/lofar_string.h,
-	  include/Common/lofar_strstream.h, include/Common/lofar_thread.h,
-	  include/Common/LofarTypedefs.h: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Common/src, creating new revision
-
-2005-10-04 11:42  diepen
-
-	* Makefile.am, src/Makefile.am, src/shmem/Makefile.am,
-	  test/Makefile.am: BugId: 396 Use $(top_srcdir)/Makefile.common
-
-2005-10-04 11:40  diepen
-
-	* configure.in: BugId: 396 Use lofar_GENERAL
-
-2005-10-04 09:04  diepen
-
-	* include/Common/BlobArray.tcc, src/BlobArray.tcc: BugID: 422
-	  arr.ndim() instead of ndim was used.
-
-2005-10-03 13:33  loose
-
-	* src/Makefile.am: BugID: 420
-
-	  Moved pkgdep.cc from LCS/Common to LCS/Tools.
-
-2005-10-03 12:40  cvs
-
-	* src/pkgdep.cc: %lofarcvsmv%: Moved to LOFAR/LCS/Tools/src
-
-2005-09-27 10:53  diepen
-
-	* src/Makefile.am: BugID: 407 Added lofar_datetime.h
-
-2005-09-21 17:01  loose
-
-	* package.doc: BugID: 394
-
-	  Fixed "bug" that caused description not to appear on doc page.
-
-2005-09-05 15:27  overeem
-
-	* include/Common/lofar_thread.h, src/Makefile.am,
-	  src/lofar_thread.h: BugID: 331 Lofar_threads makes use of boost
-	  threads easier.
-
-2005-09-02 17:18  loose
-
-	* configure.in: BugID: 326
-
-	  Prepare for release 2.3
-
-2005-09-02 16:01  loose
-
-	* ChangeLog, NEWS: BugID: 326
-
-	  Prepare for release 2.3
-
-2005-09-02 15:25  loose
-
-	* include/Common/Thread/deprecated_warning.h,
-	  src/Thread/deprecated_warning.h: BugID: 173
-
-	  Marked Thread.h and related header files deprecated. The user is
-	  encouraged to use Boost.Threads instead.
-
-2005-09-02 15:22  loose
-
-	* src/: Thread.h, Profiling/PerfProfile.h, Thread/Condition.h,
-	  Thread/Key.h, Thread/Mutex.h, Thread/SmartLock.h,
-	  Thread/Thread.h: BugID: 173
-
-	  Marked Thread.h and related header files deprecated. The user is
-	  encouraged to use Boost.Threads instead.
-
-2005-09-01 15:46  loose
-
-	* test/tNumeric.cc: BugID: 239 Fixed missing and redundant
-	  #include's.
-
-2005-08-24 11:10  romein
-
-	* src/Timer.h: BugID: 51 Added multi-threading support for i386 and
-	  x86_64.
-
-2005-08-16 17:19  zwart
-
-	* src/Net/Socket.cc: BugID: 270
-
-	  Added check to see if system call was interupted
-
-2005-08-08 23:27  overeem
-
-	* src/LofarLogger.cc: BugID: 146 Added "ImmediateFlush" to STDERR
-	  logger. (Log4Cplus 1.0.2)
-
-2005-08-04 16:50  romein
-
-	* src/: Timer.cc, Timer.h: BugID: 225 Added timer support for
-	  PowerPC/BlueGene and PowerPC/Linux with xlC and g++
-
-2005-08-04 12:44  loose
-
-	* test/tNumeric.cc: BugID: 239 Removed some dead code.
-
-2005-08-04 12:34  loose
-
-	* src/Makefile.am, src/Numeric.cc, src/Numeric.h, test/Makefile.am,
-	  test/tNumeric.cc, test/tNumeric.sh: BugID: 239
-
-	  First pretty rough version of some numeric functions, e.g.
-	  floating point comparison using a "distance" measure.
-
-2005-08-03 12:57  romein
-
-	* src/BlobHeader.h: BugID: 51 Remove explicit BlobHeader::
-	  qualification where it is not allowed; the xlc compiler is picky
-	  about it.
-
-2005-07-18 09:35  loose
-
-	* src/: ComplexBuiltinFP.h, ComplexC99.h: %[ER: 70]% clog cannot be
-	  used with PVSS
-
-2005-07-08 09:42  diepen
-
-	* src/: ComplexBuiltinFP.h, ComplexC99.h: %[ER: 70]% clog cannot be
-	  used with PVSS
-
-2005-07-06 15:44  romein
-
-	* src/: Timer.cc, Timer.h: %[ER: ]% - Added print-on-destruction
-	  option to constructor.  This simplifies profiling   how much time
-	  is spent in a region of code:
-
-	    void myFunction()
-	    {
-		static NSTimer timer("myFunction", true);
-		timer.start();
-		doWork();
-		timer.stop();
-	    }
-
-	    and the timer's results will be printed at program exit.
-
-	  - Added support for PathScale compiler
-
-2005-07-06 14:32  loose
-
-	* AUTHORS, COPYING, INSTALL, NEWS, README, configure.in: %[ER: 0]%
-
-	  Merged relevant changes from the release 2.2 branch into the main
-	  development line.
-
-2005-07-06 10:15  overeem
-
-	* src/: StringUtil.cc, StringUtil.h: %[ER:285]% Upgrade ACC 1.0 to
-	  1.1 ParameterSet is now in ACC/APS.  ProceControl is now in
-	  ACC/PLC.  ParameterSet getInt changed to getInt32.
-
-2005-07-01 18:16  loose
-
-	* test/tComplex.cc: %[ER: 247]%
-
-	  * Removed check for which header file to include, because this is
-	  now checked	by lofar_complex.h. Also uses make{d,f}complex
-	  macro now.  * Fixed memory leak.
-
-2005-07-01 16:25  loose
-
-	* src/ComplexBuiltinFP.h: %[ER: 247]%
-
-	  After `clog' had been added to the type definitions in
-	  lofar_iostream.h, a collision occurred between the clog()
-	  function and the clog global object. clog() and all other global
-	  functions now have an explicit global namespace indication.
-
-2005-07-01 16:16  loose
-
-	* src/LofarLogCout.cc: %[ER: 0]%
-
-	  It is better to use the buffered output stream clog, instead of
-	  the unbuffered stream cerr, because no locking is being done
-	  within the LofarLogCout routines when logging messages. Hence,
-	  the use of clog avoids two or more messages getting completely
-	  mixed up.
-
-2005-07-01 16:13  loose
-
-	* src/LofarLogCout.h: %[ER: 0]%
-
-	  The macro AUTO_FUNCTION_NAME should be used instead of
-	  __PRETTY_FUNCTION__, because the former is guaranteed to be
-	  defined, whereas the latter is not.
-
-2005-07-01 15:49  loose
-
-	* src/lofar_iostream.h: %[ER: 161]%
-
-	  Added missing clog declaration.
-
-2005-06-10 13:08  overeem
-
-	* src/lofar_datetime.h: %[ER:279]% Bring Boost date time into Lofar
-	  namespace.
-
-2005-06-10 12:18  loose
-
-	* configure.in: %[ER: 252]%
-
-	  Moved LimitExec.cc to LCS/Tools, so that it does not depend on,
-	  e.g., liblog4cplus.so. However, now LCS/Common depends on
-	  LCS/Tools.
-
-2005-06-10 11:52  loose
-
-	* src/Makefile.am: %[ER: 252]%
-
-	  Moved LimitExec.cc to LCS/Tools, so that it does not depend on,
-	  e.g., liblog4cplus.so.
-
-2005-06-09 15:36  loose
-
-	* src/LimitExec.cc: %[ER: 252]%
-
-	  Moved LimitExec.cc to LCS/Tools, so that it does not depend on,
-	  e.g., liblog4cplus.so.
-
-2005-06-01 17:01  loose
-
-	* src/shmem/dlmalloc.h: %[ER: 236]%
-
-	  Minor documentation bug fixes.
-
-2005-06-01 16:48  loose
-
-	* src/: LofarLogger.h, StringUtil.h, Thread.h: %[ER: 236]%
-
-	  Minor documentation bug fixes.
-
-2005-05-30 13:11  zwart
-
-	* src/LofarLog4Cplus.h: %[ER: 276]%
-
-	  fixed TRACER_ALIAS
-
-2005-05-25 14:42  loose
-
-	* src/LofarLog4Cplus.h: %[ER: 236]%
-
-	  Added warning section to documentation of ALLOC_TRACER_CONTEXT.
-
-2005-05-23 10:33  loose
-
-	* src/Profiling/PerfProfile.h: %[ER: 263]%
-
-	  PerfProfile is deprecated. Use the tinyCEP Profiler class
-	  instead.
-
-2005-05-23 10:05  loose
-
-	* test/Makefile.am: %[ER: 252]%
-
-	  Added export of LOFARROOT variable, which is needed to locate
-	  LimitExec.
-
-2005-05-23 09:57  loose
-
-	* src/: Net/backward/Socket.cc, Profiling/PerfProfile.cc,
-	  Thread/SmartLock.cc, Thread/Thread.cc, shmem/segbasemap.cc,
-	  shmem/shmem_alloc.cc: %[PR: 100]%
-
-	  Added #include <lofar_config.h> to source files (*.cc).
-
-2005-05-07 09:46  lofar
-
-	* test/tComplex.cc: define __INSURE__ in variants for insure builds
-	  (This is normally not needed because insure should do this for
-	  you, but for now it seems that it doesn't work for us. It is
-	  under investigation by us and parasoft
-
-2005-05-03 23:27  loose
-
-	* src/lofar_complex.h: %[PR: 100]%
-
-	  Merged changes from the main development line into
-	  LOFAR-PR100-task-branch.
-
-2005-05-03 23:22  loose
-
-	* src/: BlitzToAips.h, Lorrays.h, Profiling/PerfProfile.cc: %[PR:
-	  100]%
-
-	  Merged LOFAR-PR100-task-branch with main development line.
-
-2005-05-03 23:16  loose
-
-	* src/Profiling/PerfProfile.cc: %[PR: 100]%
-
-	  Added line '#include <lofar_config.h>' to .cc files.
-
-2005-05-03 15:00  lofar
-
-	* src/lofar_complex.h: %[ER: 71]% Insure doesn't seem to support or
-	  able to handle builtin complex types.  so added __INSURE__ flag
-	  test to determine what complex type can be used
-
-2005-04-29 16:11  broekema
-
-	* src/lofar_complex.h: %[ER: 247]% Add support for the Blue Gene
-	  compiler
-
-2005-04-20 11:23  loose
-
-	* src/: BlitzToAips.h, Lorrays.h: %[PR: 100]%
-
-	  Removed checks in .h files for preprocessor variables that are
-	  defined in config.h or lofar_config.h.
-
-2005-04-13 17:43  loose
-
-	* src/: LofarLog4Cplus.h, LofarLogCout.h: %[PR: 144]%
-
-	  Removed the line '#undef THROW'. If THROW were previously
-	  defined, we should consider this to be an error now.
-
-2005-04-13 17:39  loose
-
-	* src/: BlobField2.cc, Exception.cc, Exception.h, LofarLogger.h,
-	  Thread/SmartLock.cc: %[PR: 144]%
-
-	  Fixed. Definition of THROW and __HERE__ macros have been removed
-	  from Exception.h. __HERE__ is now defined in LofarLogger.h; THROW
-	  was already being defined in LofarLog{Cout|4Cplus}.h
-
-2005-04-13 16:33  loose
-
-	* configure.in, src/Allocator.cc, src/BlitzToAips.h,
-	  src/BlobArray.cc, src/BlobField.cc, src/BlobField2.cc,
-	  src/BlobFieldSet.cc, src/BlobHeader.cc, src/BlobIBufChar.cc,
-	  src/BlobIBufStream.cc, src/BlobIStream.cc, src/BlobOBufChar.cc,
-	  src/BlobOBufNull.cc, src/BlobOBufStream.cc,
-	  src/BlobOBufString.cc, src/BlobOStream.cc, src/BlobString.cc,
-	  src/BlobStringTraits.h, src/BlobStringType.cc,
-	  src/DataConvert.cc, src/DataFormat.h, src/Debug.cc, src/Debug.h,
-	  src/Exception.cc, src/Exception.h, src/KeyParser.cc,
-	  src/KeyParser.h, src/KeyValue.cc, src/KeyValue.h,
-	  src/KeyValueMap.cc, src/LimitExec.cc, src/LofarLog4Cplus.h,
-	  src/LofarLogCout.cc, src/LofarLogger.cc, src/LofarLogger.h,
-	  src/LofarTypes.h, src/Lorrays.h, src/RunOnNode.cc,
-	  src/RunOnNode.h, src/Stopwatch.cc, src/StringUtil.cc,
-	  src/Timer.cc, src/TypeNames.cc, src/hexdump.cc, src/hexdump.h,
-	  src/pkgdep.cc, src/Profiling/PerfProfile.h,
-	  src/shmem/shmem_alloc.h, test/tBlobArray.cc,
-	  test/tBlobArrayHeader.cc, test/tBlobField.cc,
-	  test/tBlobHeader.cc, test/tBlobStream.cc, test/tBlobString.cc,
-	  test/tComplex.cc, test/tDataConvert.cc, test/tDebug.cc,
-	  test/tHexdump.cc, test/tKeyValueMap.cc, test/tRunOnNode.cc,
-	  test/tStringUtil.cc, test/tTimer.cc, test/testLogger.cc: %[PR:
-	  100]%
-
-	  Removed #include <config.h> and #include <lofar_config.h> from
-	  header files (*.h and *.tcc). Added #include <lofar_config.h> to
-	  source files (*.cc).
-
-2005-04-12 14:20  loose
-
-	* src/shmem/: Makefile.am: %[PR: 150]%
-
-	  The header files of Common/shmem will now be installed in
-	  include/Common/shmem.
-
-2005-04-06 17:28  loose
-
-	* src/Net/Socket.cc: %[ER: 231]%
-
-	  Socket::shutdown() no longer closes the socket; this is now done
-	  by Socket::close(). Otherwise you would get an error when
-	  Socket::~Socket() calls Socket::close() to close an already
-	  closed socket.
-
-2005-04-05 10:09  loose
-
-	* src/Net/Socket.cc: %[PR: 148]%
-
-	  Fixed potential bug in Socket::errstr(), where the wrong system
-	  error code (errno) could be returned.
-
-2005-04-04 12:32  loose
-
-	* src/Net/: Socket.cc, Socket.h: %[ER: 231]%
-
-	  Added close() method.
-
-2005-03-23 12:22  diepen
-
-	* src/DataConvert.h: %[ER: 247]% Needed template<> for integer
-	  complex types if icc was used
-
-2005-03-23 11:37  romein
-
-	* test/: tStringUtil.cc, tStringUtil.out: %[ER: 220]% Fix 64-bit
-	  problems.
-
-2005-03-23 11:01  diepen
-
-	* test/: tComplex.cc, tComplex.out, tComplex.sh: %[ER: 247]% Added
-	  tComplex test program
-
-2005-03-23 10:57  romein
-
-	* test/tStringUtil.cc: %[ER: ]% include <cmath> for definition of
-	  M_E
-
-2005-03-23 10:54  romein
-
-	* src/BlobIStream.h: %[ER: ]% Fix typo and add #include
-
-2005-03-23 09:06  diepen
-
-	* src/Makefile.am: %[ER: 247]% Added new complex .h files
-
-2005-03-23 08:55  diepen
-
-	* src/: ComplexBuiltinFP.h, ComplexBuiltinInt.h, ComplexC99.h,
-	  ComplexStdFP.h, ComplexStdInt.h: %[ER: 247]% Definitions for
-	  builtin or std complex types
-
-2005-03-23 08:53  diepen
-
-	* src/: TypeNames.cc, TypeNames.h: %[ER: 247]% Use same type name
-	  for builtin and std complex (for easy interchange)
-
-2005-03-22 13:47  diepen
-
-	* src/BlobField.cc, src/BlobField.h, src/BlobField2.cc,
-	  src/BlobIStream.cc, src/BlobIStream.h, src/BlobOStream.cc,
-	  src/BlobOStream.h, src/DataConvert.h, src/KeyTokenize.ll,
-	  src/KeyValue.cc, src/LofarTypedefs.h, src/LofarTypes.h,
-	  src/TypeNames.cc, src/TypeNames.h, src/TypeNames.tcc,
-	  src/lofar_complex.h, test/Makefile.am, test/tBlobArray.cc,
-	  test/tBlobField.cc, test/tBlobStream.cc, test/tDataConvert.cc,
-	  test/tKeyValueMap.cc: %[ER: 247]% Use builtin complex
-
-2005-03-22 10:39  zwart
-
-	* src/: BlobField2.cc, DataConvert.h: %[ER: 242]%
-
-	  Added complex<int16>
-
-2005-03-18 15:26  loose
-
-	* src/StringUtil.h, test/tStringUtil.cc, test/tStringUtil.out:
-	  %[ER: 30]%
-
-	  Added methods for converting fundamental numeric types to string.
-
-2005-03-16 09:33  loose
-
-	* configure.in: %[ER: 30]%
-
-	  Updated version number to 2.1
-
-2005-03-15 08:09  diepen
-
-	* test/: tDataConvert.cc, tDataConvert.out: %[ER: 206]% Added a
-	  test for boolToBit and bitToBool
-
-2005-03-15 08:08  diepen
-
-	* src/: DataConvert.cc, DataConvert.h: %[ER: 206]% Added a startbit
-	  argument
-
-2005-03-11 16:44  loose
-
-	* package.doc: %[ER: 236]%
-
-	  Added group Common to group LCS.
-
-2005-03-11 16:40  loose
-
-	* src/Debug.h: %[ER: 236]%
-
-	  Added \deprecated line.
-
-2005-03-02 16:32  loose
-
-	* src/: lofar_fstream.h, lofar_iosfwd.h, lofar_set.h,
-	  lofar_sstream.h: %[ER: 161]%
-
-	  Added using declarations for missing types.
-
-2005-02-25 15:27  overeem
-
-	* src/Net/Socket.cc: %[ER:30]% Extra log message when reading from
-	  an UDP socket.
-
-2005-02-25 15:24  overeem
-
-	* src/: Makefile.am, Net/FdSet.cc, Net/FdSet.h: %[ER:30]% Make a
-	  class around the fd_set structure to do some boring bookkeeping.
-
-2005-02-25 12:04  lofar
-
-	* src/pkgdep.cc: %[ER: 71]% placed all needed images in their own
-	  image directory, so had to change the references to them.
-
-2005-02-18 17:07  overeem
-
-	* src/Net/Socket.cc: %[ER:30]% Explicitly setting itsErrno on
-	  several placed.
-
-2005-02-18 16:50  lofar
-
-	* src/pkgdep.cc: %[ER: 71]% changed place where images can be found
-
-2005-02-10 12:51  loose
-
-	* package.doc: %[ER: 236]%
-
-	  Enhanced the documentation: - Defined a number of groups within
-	  the package group "Common".  - Added (sub)grouping to several
-	  source files.  - Updated comment style to C++ // style.
-
-2005-02-10 11:40  loose
-
-	* src/: Allocator.h, BlitzToAips.h, BlobArray.h, BlobArrayHeader.h,
-	  BlobException.h, BlobField.h, BlobFieldSet.h, BlobHeader.h,
-	  BlobIBufChar.h, BlobIBufStream.h, BlobIBufString.h,
-	  BlobIBufVector.h, BlobIBuffer.h, BlobIStream.h, BlobOBufChar.h,
-	  BlobOBufNull.h, BlobOBufStream.h, BlobOBufString.h,
-	  BlobOBufVector.h, BlobOBuffer.h, BlobOStream.h, BlobString.h,
-	  BlobStringTraits.h, BlobStringType.h, CheckConfig.h,
-	  DataConvert.h, DataFormat.h, Debug.h, Exception.h, KeyParser.h,
-	  KeyValue.h, KeyValueMap.h, LofarLog4Cplus.h, LofarLogCout.h,
-	  LofarLogger.h, LofarTypedefs.h, LofarTypes.h, Lonumerics.h,
-	  Lorrays-Blitz.h, Lorrays.h, Makefile.am, RunOnNode.h,
-	  Stopwatch.h, StringUtil.cc, StringUtil.h, Thread.h, Timer.h,
-	  TypeNames.h, VectorUtil.h, hexdump.h, lofar_algorithm.h,
-	  lofar_complex.h, lofar_deque.h, lofar_fstream.h,
-	  lofar_global_symbol_warning.h, lofar_iomanip.h, lofar_iosfwd.h,
-	  lofar_iostream.h, lofar_list.h, lofar_map.h, lofar_sstream.h,
-	  lofar_stack.h, lofar_string.h, lofar_strstream.h, lofar_vector.h,
-	  Net/Socket.h, Net/backward/Socket.h, Profiling/PerfProfile.h,
-	  Thread/Condition.h, Thread/Key.h, Thread/Mutex.h,
-	  Thread/SmartLock.h, shmem/dlmalloc.h, shmem/segbasemap.h,
-	  shmem/shmem_alloc.h: %[ER: 236]%
-
-	  Enhanced the documentation: - Defined a number of groups within
-	  the package group "Common".  - Added (sub)grouping to several
-	  source files.  - Updated comment style to C++ // style.
-
-2005-02-09 17:09  loose
-
-	* src/: Allocator.h, BlitzToAips.h, BlobArray.h, BlobArrayHeader.h,
-	  BlobException.h, BlobField.h, BlobFieldSet.h, BlobHeader.h,
-	  BlobIBufChar.h, BlobIBufStream.h, BlobIBufString.h,
-	  BlobIBufVector.h, BlobIBuffer.h, BlobIStream.h, BlobOBufChar.h,
-	  BlobOBufNull.h, BlobOBufStream.h, BlobOBufString.h,
-	  BlobOBufVector.h, BlobOBuffer.h, BlobOStream.h, BlobString.h,
-	  BlobStringTraits.h, BlobStringType.h, CheckConfig.h,
-	  DataConvert.h, DataFormat.h, Debug.h, Exception.h, HEADER.h,
-	  KeyParser.h, KeyValue.h, KeyValueMap.h, LofarLog4Cplus.h,
-	  LofarLogCout.h, LofarLogger.h, LofarTypedefs.h, LofarTypes.h,
-	  Lonumerics.h, Lorrays-Blitz.h, Lorrays.h, RunOnNode.h,
-	  Stopwatch.h, StringUtil.h, Thread.h, Timer.h, TypeNames.h,
-	  VectorUtil.h, hexdump.h, lofar_algorithm.h, lofar_complex.h,
-	  lofar_fstream.h, lofar_global_symbol_warning.h, lofar_iomanip.h,
-	  lofar_iostream.h, lofar_list.h, lofar_map.h, lofar_sstream.h,
-	  lofar_stack.h, lofar_string.h, lofar_strstream.h, lofar_vector.h:
-	  %[ER: 236]%
-
-	  The \file command expects a complete filename, i.e. with the
-	  trailing ".h"
-
-2005-02-09 11:27  lofar
-
-	* src/: Allocator.h, BlitzToAips.h, BlobArray.h, BlobArrayHeader.h,
-	  BlobException.h, BlobField.h, BlobFieldSet.h, BlobHeader.h,
-	  BlobIBufChar.h, BlobIBufStream.h, BlobIBufString.h,
-	  BlobIBufVector.h, BlobIBuffer.h, BlobIStream.h, BlobOBufChar.h,
-	  BlobOBufNull.h, BlobOBufStream.h, BlobOBufString.h,
-	  BlobOBufVector.h, BlobOBuffer.h, BlobOStream.h, BlobString.h,
-	  BlobStringTraits.h, BlobStringType.h, CheckConfig.h,
-	  DataConvert.h, DataFormat.h, Debug.h, Exception.h, HEADER.h,
-	  KeyParser.h, KeyValue.h, KeyValueMap.h, LofarLog4Cplus.h,
-	  LofarLogCout.h, LofarLogger.h, LofarTypedefs.h, LofarTypes.h,
-	  Lonumerics.h, Lorrays-Blitz.h, Lorrays.h, RunOnNode.h,
-	  Stopwatch.h, StringUtil.h, Thread.h, Timer.h, TypeNames.h,
-	  VectorUtil.h, hexdump.h, lofar_algorithm.h, lofar_complex.h,
-	  lofar_deque.h, lofar_fstream.h, lofar_global_symbol_warning.h,
-	  lofar_iomanip.h, lofar_iosfwd.h, lofar_iostream.h, lofar_list.h,
-	  lofar_map.h, lofar_sstream.h, lofar_stack.h, lofar_string.h,
-	  lofar_strstream.h, lofar_vector.h: %[ER: 236]% added \addtogroup
-	  and \file comments for documentation also includeguard will
-	  include LOFAR_ now also in name
-
-2005-02-08 08:04  diepen
-
-	* src/Makefile.am: %[ER: 70]% Removed finddep which was added as a
-	  test
-
-2005-02-07 11:28  diepen
-
-	* src/Makefile.am: %[ER: 70]% Removed BlobField.cc from SOURCES
-
-2005-02-04 13:52  diepen
-
-	* src/LofarLogCout.h: %[ER: 70]% Qualify left with std:: (to fix
-	  problem in MeqJonesExpr)
-
-2005-01-31 15:39  romein
-
-	* src/shmem/: dlmalloc.c, shmem_alloc.cc: %[ER: 220]% Fixed 64-bit
-	  bugs.
-
-2005-01-31 15:38  romein
-
-	* src/: Timer.cc, Timer.h: %[ER: 220]% Added Itanium support.
-
-2005-01-25 08:39  diepen
-
-	* test/tKeyValueMap.out: %[ER: 206]% Added an extra test
-
-2005-01-24 11:40  diepen
-
-	* src/KeyTokenize.ll: %[ER: 206]% Removed debug statement
-
-2005-01-24 10:42  diepen
-
-	* test/: tKeyValueMap.cc, tKeyValueMap.in: %[ER: 206]% Added test
-	  for parsing from a file
-
-2005-01-24 10:42  diepen
-
-	* src/: KeyParser.cc, KeyParser.h, KeyTokenize.ll, KeyValue.cc:
-	  %[ER: 206]% Added parser from a file and improved the parser
-
-2005-01-21 13:24  diepen
-
-	* src/pkgdep.cc: %[ER: 207]% Fixed problem in display of flat tree
-
-2005-01-21 13:03  diepen
-
-	* src/pkgdep.cc: %[ER: 207]% Skip single parents if wanted Fixed a
-	  few little problems
-
-2005-01-20 11:42  loose
-
-	* src/Net/Socket.cc: %[PR: 141]%
-
-	  Socket destructor does not break connection anymore, but only
-	  closes its own socket descriptor (this was the original
-	  behaviour, before it was inadvertently changed in rev 1.3).
-
-2005-01-20 09:36  diepen
-
-	* src/pkgdep.cc: %[ER: 207]% Improved the XHTML output
-
-2005-01-19 15:18  diepen
-
-	* src/: Makefile.am, VectorUtil.h: %[ER: 206]% Created operator<<
-	  for a vector object
-
-2005-01-18 15:26  diepen
-
-	* src/pkgdep.cc: %[ER: 221]% Improved generated html pages
-
-2005-01-17 14:56  diepen
-
-	* src/pkgdep.cc: %[ER: 221]% Added header and footer for XHTML
-
-2005-01-14 14:46  broekema
-
-	* src/Net/Socket.cc: %[ER: 182]% BG/L crashed on  the fcntl call.
-	  Remove for BG/L for now, but this should be investigasted.
-
-2005-01-14 14:13  broekema
-
-	* src/Net/: Socket.cc, Socket.h: %[ER: 229]% moved the
-	  lofar_config.h include to the .cc file
-
-2005-01-13 15:44  overeem
-
-	* src/Net/Socket.cc: %[ER:30]% Also resetting internal errorcode to
-	  SK_OK when returning from setDefaults for BG.
-
-2005-01-13 15:35  romein
-
-	* src/KeyValue.cc: %[ER: 223]% Avoid icc (EM64T) compiler bug.
-
-2005-01-13 08:40  overeem
-
-	* src/Net/Socket.cc: %[ER:30]% Blue Gene does not have sockopt
-	  calls, made them dependent from the HAVE_BGL definition.  On
-	  read/write errors the socket is not immediately closed anymore
-	  allowing the user to get the SocketID from the Socket in trouble.
-	  Prevents redundant administration is several cases.
-
-2005-01-10 08:33  diepen
-
-	* src/: BlobArray.h, BlobField.h, BlobIStream.h: %[ER: 38]% Fixed
-	  doxygen tags
-
-2005-01-07 10:56  diepen
-
-	* configure.in: %[ER: 222]% Removed lofar_AIPSPP which was there as
-	  a test
-
-2005-01-07 08:56  diepen
-
-	* configure.in, src/BlitzToAips.h, src/BlobArray.h,
-	  src/BlobArray.tcc, src/Lorrays-Blitz.h: %[ER: 222]% Use AIPS++
-	  casa namespace
-
-2005-01-06 18:02  loose
-
-	* src/: Makefile.am, shmem/Makefile.am: %[ER: 177]%
-
-	  Shared memory can now be enabled or disabled using
-	  --with-shmem=[yes|no] during configure. Furthermore,
-	  --with-shmem=yes has been made the default for the standard
-	  variant (e.g. debug, opt, mpich, etc.); the bgl and fakebgl
-	  variants use --with-shmem=no by default.
-
-2005-01-03 16:06  overeem
-
-	* src/StringUtil.cc, src/StringUtil.h, test/tStringUtil.cc,
-	  test/tStringUtil.out: %[ER:30]% ltrim and rtrim functions allow
-	  other definitions of whitespace as the last parameter.
-
-2005-01-03 11:47  romein
-
-	* src/: Stopwatch.cc, Thread/Mutex.h: %[ER:220]% Various changes on
-	  behalf of x86_64 architecture
-
-2005-01-03 08:42  overeem
-
-	* src/: StringUtil.cc, StringUtil.h: %[ER:30]% Added ltrim and
-	  rtrim functions for removing leading or trailing whitespace from
-	  C strings or C++ strings.
-
-2005-01-03 08:41  overeem
-
-	* test/: tStringUtil.cc, tStringUtil.out: %[ER:30]% Update to test
-	  ltrim and rtrim also.
-
-2004-12-27 15:59  diepen
-
-	* src/pkgdep.cc: %[ER: 70]% Added a few options
-
-2004-12-24 16:02  diepen
-
-	* src/pkgdep.cc: %[ER: 70]% Added ability to write JavaScript
-	  output
-
-2004-12-24 15:12  broekema
-
-	* src/Thread/Mutex.h: %[ER: 182]% BG doesn't know pthreads.
-
-2004-12-24 15:09  diepen
-
-	* src/BlobStringTraits.h: %[ER: 70]% Also compile for BlueGene
-
-2004-12-24 15:05  diepen
-
-	* src/: BlobField2.cc, DataConvert.h: %[ER: 38]% Added BlobField
-	  instantiation for complex<uint16>
-
-2004-12-24 13:26  lofar
-
-	* src/pkgdep.cc: %[ER:71 ]% removed root packages check by request
-	  of Ger van Diepen
-
-2004-12-23 08:55  diepen
-
-	* src/BlobOStream.h: %[PR: 134]% Implemented size function
-
-2004-12-15 14:16  overeem
-
-	* src/LofarLogger.cc: %[ER:30]% The function readlink may return -1
-	  which caused a segfault when the link that was read does not
-	  exist.
-
-2004-12-15 14:13  overeem
-
-	* src/Net/Socket.cc: %[ER:30]% Updated Socket to the Blue Gene
-	  which has no netdb.h functions. Embellished the logging messages
-	  and made sure the sockets use the right blockingmode directly
-	  after creation.
-
-	  Modified TH_Socket to implement real non-blocking
-	  connect/accept/read-calls.
-
-2004-12-15 00:19  schaaf
-
-	* src/Net/Socket.cc: %[ER: 181]% make use of netdb functionality
-	  optinal for compatibility with BGL
-
-2004-12-14 13:28  overeem
-
-	* src/Net/: Socket.cc, Socket.h: %[ER:30]% Update for Sun OS.
-
-2004-12-09 15:47  overeem
-
-	* src/: StringUtil.cc, StringUtil.h: %[ER:30]% Added timeString
-	  function to create a humna readable time of a time_t value.
-
-2004-12-09 15:07  diepen
-
-	* test/tBlobField.in_le: %[ER: 38]% Checked in proper little-endian
-	  file
-
-2004-12-09 15:01  diepen
-
-	* src/DataConvert.h: %[ER: 38]% Added function for char and uchar
-	  (to 'convert' version in BlobHeader)
-
-2004-12-09 15:00  diepen
-
-	* src/BlobArray.cc: %[ER: 38]% Fixed alignment problem Do not
-	  assume that ndim is aligned (got segv on SUN)
-
-2004-12-09 14:59  diepen
-
-	* src/KeyValue.cc: %[ER: 38]% Problem on SUN with tellg (returns
-	  -1)
-
-2004-12-09 14:58  diepen
-
-	* test/: tBlobField.cc, tBlobField.in_be, tBlobField.in_le,
-	  tBlobStream.in_le: %[ER: 38]% Have some real bigendian test files
-
-2004-12-06 11:50  diepen
-
-	* test/testLogger.cc: %[ER: 70]% getDebugContext changed into
-	  getLFDebugContext
-
-2004-12-06 11:13  zwart
-
-	* src/: BlobArray.h, BlobField2.cc, BlobIStream.cc, BlobIStream.h,
-	  BlobOStream.cc, BlobOStream.h, DataConvert.h, LofarTypedefs.h,
-	  LofarTypes.h, Lonumerics.h, TypeNames.cc, TypeNames.h: %[ER:
-	  182]%
-
-	  Remove scomplex type
-
-2004-12-06 09:57  overeem
-
-	* src/LofarLogger.cc: %[ER:30]% libgen contains prototype for
-	  basename call.
-
-2004-12-06 09:49  overeem
-
-	* src/BlobField.cc: %[ER:30]% Typecast to size_t iso unsinged int
-	  to be more platform compatible.
-
-2004-12-02 17:49  loose
-
-	* configure.in: %[ER: 30]%
-
-	  Updated version number in automake initialization macro; added
-	  no-define avoiding the definition of PACKAGE and VERSION.
-
-2004-12-01 16:52  zwart
-
-	* src/: BlobArray.h, BlobField2.cc, BlobIStream.cc, BlobIStream.h,
-	  BlobOStream.cc, BlobOStream.h, DataConvert.h, LofarTypedefs.h,
-	  LofarTypes.h, Lonumerics.h, TypeNames.cc, TypeNames.h: %[ER:
-	  182]%
-
-	  Added a new type: complex<short> a.k.a. scomplex
-
-2004-12-01 14:01  loose
-
-	* src/: LofarLog4Cplus.h, LofarLogCout.h, LofarLogger.h: %[ER:
-	  119]%
-
-	  Redefined the logger macros so that they now use the full package
-	  name LOFARLOGGER_FULLPACKAGE, which is the concatenation of the
-	  package name LOFARLOGGER_PACKAGE (as derived by lofarconf) and an
-	  optional user-defined sub-package name LOFARLOGGER_SUBPACKAGE.
-
-2004-11-30 10:06  diepen
-
-	* src/: Makefile.am, pkgdep.cc: %[ER: 207]% Program to show the
-	  package dependency tree
-
-2004-11-29 13:50  smirnov
-
-	* src/: Debug.cc, backward/Debug.cc: %[ER: 16]% More "fixes"(???)
-	  to Debug.cc
-
-2004-11-29 11:12  noordam
-
-	* src/backward/Debug.cc: %[ER: 16]% Added using namespace std
-	  declaration because it wouldn't compile otherwise
-
-2004-11-29 11:08  diepen
-
-	* src/LofarLogCout.h: %[ER: 70]% Rename getDebugContext to
-	  getLFDebugContext to avoid confusion with Debug.h
-
-2004-11-26 16:19  diepen
-
-	* src/LofarLogCout.h: %[ER: 70]% Improved comments
-
-2004-11-26 16:17  diepen
-
-	* src/: LofarLogCout.cc, LofarLogCout.h: %[ER: 70]% Removed all
-	  obsolete functions Changed namespace to LFDebug to avoid problems
-	  with normal Debug.h
-
-2004-11-26 16:16  diepen
-
-	* src/LofarLogger.h: %[ER: 70]% Standardised include guard
-
-2004-11-26 14:04  smirnov
-
-	* src/Thread/Thread.h: %[ER: 16]% Updated Thread to use namespace
-	  LOFAR
-
-2004-11-23 10:17  schaaf
-
-	* test/: tRunOnNode.cc, tRunOnNode.out: %[ER: 119]% replaced logger
-	  output with cout
-
-2004-11-22 11:28  loose
-
-	* test/tRunOnNode.out: %[PR: 119]%
-
-	  Removed. It only contained information from the logger, which
-	  should always be discarded, because it might differ between build
-	  variants and even run-time environments.
-
-2004-11-22 09:54  loose
-
-	* src/LofarLogCout.h: %[ER: 161]%
-
-	  Stupid mistake: forgot to include lofar_sstream.h. The code
-	  compiled fine with threads enabled, because in that case,
-	  Thread.h would be included, which would, in turn, include
-	  lofar_sstream.h. This obviously failed miserably when configured
-	  without thread support.
-
-2004-11-22 09:51  loose
-
-	* src/backward/Debug.cc: %[ER: 161]%
-
-	  Added warning comment.
-
-2004-11-19 15:44  loose
-
-	* src/LimitExec.cc: %[PR: 118]%
-
-	  Fixed. LimitExec now returns -1 when the child was terminated by
-	  a signal; else it returns the child's exit status.
-
-2004-11-19 15:08  loose
-
-	* src/LofarLogCout.h: %[ER: 161]%
-
-	  * Fixed name clash with preprocessor macro Debug.  * Added
-	  explicit LOFAR::Debug specification in some macros.  * Reversed
-	  trace level numbering in output message, in order to comply with
-	   the trace level numbering of log4cplus.  * Fixed formatting bug
-	  in Debug::stream_time().  * Reordered code because ssprintf() was
-	  used before being declared.
-
-2004-11-19 14:59  loose
-
-	* src/backward/Debug.cc: %[ER: 161]%
-
-	  * Removed explicit std:: namespace specifications.  * Removed
-	  spurious ends in an ostringstream.  * Tracer::startMsg() and
-	  Tracer::endMsg() now use "TRACE" instead of "trace",	 in order
-	  to be compliant with the LofarLogger format.
-
-2004-11-19 14:53  loose
-
-	* src/Debug.h: %[ER: 161]%
-
-	  * Added deprecated warning.  * Fixed formatting bug in
-	  Debug::stream_time() * Reordered code, because ssprintf() was
-	  used before being declared.
-
-2004-11-18 17:49  loose
-
-	* src/Makefile.am: %[ER: 161]%
-
-	  Added lofar_iomanip.h.
-
-2004-11-18 17:47  loose
-
-	* src/lofar_iomanip.h: %[ER: 161]%
-
-	  Initial version.
-
-2004-11-18 13:04  diepen
-
-	* src/Timer.cc, src/Timer.h, test/tTimer.cc: %[ER: 146]% Renamed to
-	  NSTimer (to avoid AIPS++ confusion)
-
-2004-11-18 13:03  diepen
-
-	* src/KeyValue.cc: %[ER: 146]% Add possibility to retrieve a vector
-	  from a vector of KeyValue
-
-2004-11-17 23:46  loose
-
-	* src/LofarLogCout.h: %[ER: 30]%
-
-	  Oops! Added line that we lost between rev. 1.4 and 1.5.
-
-2004-11-17 13:25  romein
-
-	* src/Makefile.am, src/Timer.cc, src/Timer.h, test/Makefile.am,
-	  test/tTimer.cc: %[ER: 199]% Low-overhead, high-precision timer
-	  for i386 and x86_64 architecture.
-
-2004-11-15 12:49  diepen
-
-	* src/Makefile.am: %[ER: 70]% Make KeyParse before KeyParser
-
-2004-11-15 12:21  diepen
-
-	* src/lofar_complex.h: %[ER: 70]% Needed use std::conj for
-	  ParmTableAIPS
-
-2004-11-15 10:47  loose
-
-	* src/Net/Socket.cc: %[ER: 30]%
-
-	  Reverted to the previous version. Throwing an exception was
-	  causing too much trouble. Besides, the error reporting facilities
-	  were too limiting, because only one type of exception was being
-	  thrown, whereas the status code provides a much richer source of
-	  information.
-
-2004-11-11 17:20  loose
-
-	* src/Makefile.am: %[PR: 109]%
-
-	  Fixed. In order to make tracing of missing .h or .cc files
-	  easier, I've put every filename on a single line.
-
-2004-11-11 14:20  loose
-
-	* src/Makefile.am: %[PR: 109]%
-
-	  Added lofar_global_warning_symbol.h to INSTHDRS.
-
-2004-11-10 14:30  loose
-
-	* test/Makefile.am: %[PR: 110]%
-
-	  Added XFAIL_TESTS for tLorrays_test.sh, so it will be recognized
-	  as an expected failure. This is necessary, until the Blitz++
-	  "problem" with version 0.7 has been solved.
-
-2004-11-05 18:03  loose
-
-	* src/Net/Socket.cc: %[ER: 30]%
-
-	  Socket constructor now throws an exception when initServer() or
-	  initClient() fails.
-
-2004-11-02 11:34  loose
-
-	* src/BlobArray.tcc: %[ER: 38]%
-
-	  Another typo in the c'tor of a blitz Array. Most of these error
-	  surface now, because LCS/Common did not have HAVE_BLITZ defined
-	  before.
-
-2004-10-29 15:47  loose
-
-	* configure.in: %[ER: 184]%
-
-	  Re-added the line check_LONG_LONG -- it was used by PL o.a. --
-	  and it was considered so common that it deserves its place here
-	  and not in PL.
-
-2004-10-29 11:40  loose
-
-	* configure.in: %[ER: 30]%
-
-	  Added check for log4cplus and Blitz++; removed check for
-	  long-long (it was not used).
-
-2004-10-26 14:10  diepen
-
-	* src/Makefile.am: %[ER: 70]% Change such that make install works
-	  correctly
-
-2004-10-26 14:07  loose
-
-	* src/BlobArray.tcc: %[ER: 38]%
-
-	  Fixed bug in call of c'tor for TinyVector.
-
-2004-10-26 12:52  diepen
-
-	* src/BlobArray.tcc: %[ER: 38]% Fixed typo in blitz part
-
-2004-10-21 16:50  smirnov
-
-	* src/: Thread/Thread.h, backward/Debug.cc: %[ER: 16]% More fixes
-	  to accomodate namespace LOFAR (specifically related to Thread)
-
-2004-10-21 14:57  loose
-
-	* src/LofarLog4Cplus.h: %[ER: 161]%
-
-	  Removed using declarations. It does not belong in a header file.
-
-2004-10-21 14:56  loose
-
-	* src/lofar_complex.h: %[ER: 161]%
-
-	  Oops! The symbols to be made global should be from namespace
-	  LOFAR, not from namespace std.
-
-2004-10-21 14:55  loose
-
-	* src/Thread/Thread.h: %[ER: 161]%
-
-	  You cannot say 'using LOFAR::Thread', because 'Thread' is a
-	  namespace. Hence, we needed another trick to make the LOFAR
-	  "symbol" 'Thread' global: we introduced a new global namespace
-	  'Thread' which "imports" the namespace 'LOFAR::Thread'.
-
-2004-10-20 15:41  overeem
-
-	* src/Net/Socket.cc: %[ER:30]% Changed loglevel of some messages.
-
-2004-10-20 14:19  loose
-
-	* src/: HEADER.cc, HEADER.h: %[PR: 100]%
-
-	  Changed the template files according to the aforementioned
-	  problem report.
-
-2004-10-20 12:22  loose
-
-	* test/tBlobField.cc: %[PR: 99]%
-
-	  Fixed. Moved the #include<Common/BlobField.cc> line past the
-	  implementation of dataConvert() for type XX.
-
-2004-10-20 10:20  schaaf
-
-	* src/Net/Socket.cc: %[ER: 164]% layout
-
-2004-10-20 00:00  loose
-
-	* test/testLogger.cc: %[ER: 89]%
-
-	  Fixed bug: Quoted string should be in double quotes, not single
-	  quotes.
-
-2004-10-19 21:55  broekema
-
-	* test/testLogger.cc: %[ER: 160]% INIT_TRACER_CONTEXT is only valid
-	  if ENABLE_TRACER is defined. Added a guard to protect against
-	  this.
-
-2004-10-19 16:31  schaaf
-
-	* test/: Makefile.am, tRunOnNode.cc, tRunOnNode.log_prop,
-	  tRunOnNode.out, tRunOnNode.sh: %[ER: 163]% initial version; test
-	  basis functionality
-
-2004-10-19 16:30  schaaf
-
-	* src/: Makefile.am, RunOnNode.cc, RunOnNode.h: %[ER: 163]% Initial
-	  version of RunOnNode; see test directory for usage example
-
-2004-10-19 15:49  diepen
-
-	* src/lofar_complex.h: %[ER: 70]% Outcommented conj (otherwise
-	  MeqMatrix does not compile)
-
-2004-10-19 12:00  loose
-
-	* src/Debug.h: %[ER: 161]%
-
-	  Solved ambiguity problems when both Debug.h and LofarLogCout.h
-	  were included and "using namespace LOFAR" was used. The macros in
-	  Debug.h now explicitly use "::Debug" instead of "Debug".
-
-2004-10-19 10:06  loose
-
-	* src/shmem/segbasemap.cc: %[ER: 161]%
-
-	  Whoops! Forgot the using LOFAR::map declaration.
-
-2004-10-19 10:04  loose
-
-	* src/shmem/segbasemap.cc: %[ER: 161]%
-
-	  Changed header comment tokens.
-
-2004-10-18 16:57  overeem
-
-	* test/Makefile.am: %[ER:30]% Added testSocket.
-
-2004-10-18 16:56  overeem
-
-	* test/testSocket.cc: %[ER:30]% Added deletion of used sockets.
-
-2004-10-18 15:49  loose
-
-	* configure.in: %[ER: 161]%
-
-	  Added the optional external package "log4cplus" again. The
-	  fallback scenario in LofarLogger should now handle things
-	  properly (using LofarLogCout).
-
-2004-10-18 15:47  loose
-
-	* src/Thread/Thread.h: %[ER: 161]%
-
-	  * Debug was moved back into the global namespace.  * Added using
-	  declaration for with backward compatibility.
-
-2004-10-18 15:45  loose
-
-	* src/shmem/shmem_alloc.cc: %[ER: 161]%
-
-	  Minor.
-
-2004-10-18 15:44  loose
-
-	* src/shmem/Makefile.am: %[ER: 161]%
-
-	  Removed the AM_CPPFLAGS line. Backward compatibility is no longer
-	  needed.
-
-2004-10-18 15:42  loose
-
-	* src/: Stopwatch.cc, Stopwatch.h, Profiling/PerfProfile.cc,
-	  Profiling/PerfProfile.h: %[ER: 161]%
-
-	  Moved code into namespace LOFAR.
-
-2004-10-18 15:41  loose
-
-	* src/Lorrays-Blitz.h: %[ER: 161]%
-
-	  The Lorray-types (incl. LoVec, LoMat and LoCube) now reside in
-	  namespace LOFAR. Use the compiler directive
-	  MAKE_LOFAR_SYMBOLS_GLOBAL for backward compatibility.
-
-2004-10-18 15:37  loose
-
-	* src/Lorrays.h: %[ER: 161]%
-
-	  Removed include of <config.h>. Only <lofar_config.h> should be
-	  included.
-
-2004-10-18 15:35  loose
-
-	* src/Lonumerics.h: %[ER: 161]%
-
-	  Removed spurious semicolon in macro definition.
-
-2004-10-18 15:34  loose
-
-	* src/Makefile.am: %[ER: 161]%
-
-	  Added the LofarLogger "specialization" files LofarLogCout.{h,cc}
-	  and LofarLog4Cplus.{h,cc}.
-
-2004-10-18 15:32  loose
-
-	* src/: Debug.cc, Debug.h, LofarLogCout.cc, backward/Debug.cc:
-	  %[ER: 161]%
-
-	  * Removed Debug from namespace LOFAR, because it caused trouble
-	  in combination   with LofarLogCout, which mimics the behaviour of
-	  Debug. The common part of   the Debug.cc file has been moved to
-	  the directory Common/backward and is	 included by Debug.cc and
-	  LofarLogCout.cc in the Common directory
-
-2004-10-18 13:18  overeem
-
-	* src/LofarLogCout.h: %[ER:30]% Renamed internal macros to avoid
-	  nameclash with old Debug.cc
-
-2004-10-18 11:26  overeem
-
-	* src/Net/Socket.cc: %[ER:30]% Name of UNIX socket was not always
-	  cleared before fill.	Unix Socket was not always removed properly
-	  in destructor.
-
-2004-10-18 08:58  overeem
-
-	* test/testSocket.cc: %[ER:30]% Testprogram for manually testing
-	  the Socket class.
-
-2004-10-15 18:26  smirnov
-
-	* configure.in, src/BlitzToAips.h, src/Net/Socket.cc: %[ER: 16]%
-	  Socket currently broken for UNIX sockets, still fixing VArious
-	  modifications for namespace LOFAR
-
-2004-10-15 17:10  loose
-
-	* src/LimitExec.c: %[ER: 30]%
-
-	  A C++ version of the same program was already present, so this
-	  file can moved to the proverbial attic.
-
-2004-10-15 12:09  overeem
-
-	* test/: tBlobArray.cc, tBlobArrayHeader.cc, tBlobField.cc,
-	  tBlobHeader.cc, tBlobStream.cc, tBlobString.cc, tDataConvert.cc,
-	  tHexdump.cc, tKeyValueMap.cc, tStringUtil.cc, testLogger.cc:
-	  %[ER:30]% Update for name of logfile.
-
-2004-10-15 12:07  overeem
-
-	* src/LofarLogCout.h: %[ER:30]% Solved bug in INIT_LOGGER macro
-	  that caused segmentation fault.
-
-2004-10-15 09:41  loose
-
-	* src/LofarLogCout.h: %[ER:30]%
-
-	  Autoappend ".debug" when filename does not contain it.
-
-2004-10-14 18:25  broekema
-
-	* src/BlobFieldSet.cc: %[ER: 160]% INIT_TRACER_CONTEXT should be
-	  guarded, since it is only available when ENABLE_TRACER is
-	  defined.
-
-2004-10-14 17:00  overeem
-
-	* src/LofarLog4Cplus.h: %[ER:30]% Autoappend ".log_prop" when
-	  filename does not contain it.
-
-2004-10-14 15:42  overeem
-
-	* src/: LofarLog4Cplus.h, LofarLogger.h: %[ER:30]% Moved inclusion
-	  of StringUtil from log4cplus version to global version.
-
-2004-10-14 14:28  overeem
-
-	* src/Net/backward/: Socket.cc, Socket.h: %[ER:30]% Former version
-	  of Socket class. For backward compatibility.
-
-2004-10-14 14:27  overeem
-
-	* src/Net/: Socket.cc, Socket.h: %[ER:30]% Renewed implementation
-	  of Socket class. See mail of 14/10/04.  Full support of
-	  blocking/non-blocking and LofarLogger.
-
-2004-10-14 12:23  loose
-
-	* test/tLorrays.cc: %[ER: 161]%
-
-	  Moved the 'using namespace LOFAR' line outside the #ifdef.
-
-2004-10-14 12:22  loose
-
-	* test/Makefile.am: %[ER: 161]%
-
-	  Removed the AM_CXXFLAGS line.
-
-2004-10-14 12:21  loose
-
-	* src/: BlitzToAips.h, LofarTypes.h, Lorrays-Blitz.h: %[ER: 161]%
-
-	  Moved all declarations into namespace LOFAR.
-
-2004-10-14 12:20  loose
-
-	* src/CheckConfig.h: Added standard LOFAR header
-
-2004-10-14 12:18  loose
-
-	* src/: BlobException.h, Exception.h: Changed include guard
-
-2004-10-13 16:43  loose
-
-	* src/lofar_global_symbol_warning.h: %[ER: 161]%
-
-	  * Almost all code in the 'Common' package now resides in the
-	  namespace LOFAR.    Work is still in progress.  * The lofar_*.h
-	  files (like lofar_string.h) now make the using declarations of
-	  the standard types in the namespace LOFAR, instead of the global
-	  namespace.	For backward compatibility, the compiler
-	  MAKE_LOFAR_SYMBOLS_GLOBAL can be    used. It is recommended that
-	  you use these lofar_*.h header files instead of    the standard
-	  header files.  * The line 'AM_CPPFLAGS =
-	  MAKE_LOFAR_SYMBOLS_GLOBAL' has been added to most of	 the
-	  Makefile.am files. The packages that are currently being built in
-	    the weekly build are known to compile using the new 'Common'
-	  package when	 backward compatibility is enabled. Where
-	  necessary, source code or header   files were modified. This
-	  usually meant adding a line like e.g.    'using LOFAR::Thread'.
-
-2004-10-13 14:02  loose
-
-	* src/lofar_sstream.h: %[ER: 161]%
-
-	  Initial version.
-
-2004-10-13 14:00  loose
-
-	* src/: Makefile.am, blitz_array-impl.h: %[ER: 161]%
-
-	  Removed blitz_array-impl.h; it was not used anywhere.
-
-2004-10-13 11:49  loose
-
-	* src/BlitzToAips.h, src/Debug.cc, src/Debug.h, src/Exception.cc,
-	  src/KeyParse.yy, src/LofarLog4Cplus.h, src/LofarLogCout.h,
-	  src/LofarLogger.cc, src/LofarLogger.h, src/Stopwatch.cc,
-	  src/Thread.h, src/lofar_algorithm.h, src/lofar_complex.h,
-	  src/lofar_deque.h, src/lofar_fstream.h, src/lofar_iosfwd.h,
-	  src/lofar_iostream.h, src/lofar_list.h, src/lofar_map.h,
-	  src/lofar_stack.h, src/lofar_string.h, src/lofar_strstream.h,
-	  src/lofar_vector.h, src/Net/Socket.cc, src/Net/Socket.h,
-	  src/Thread/Condition.h, src/Thread/Key.h, src/Thread/Mutex.h,
-	  src/Thread/SmartLock.cc, src/Thread/SmartLock.h,
-	  src/Thread/Thread.cc, src/Thread/Thread.h, src/shmem/Makefile.am,
-	  src/shmem/segbasemap.cc, src/shmem/shmem_alloc.cc,
-	  test/Makefile.am: %[ER: 161]%
-
-	  * Almost all code in the 'Common' package now resides in the
-	  namespace LOFAR.    Work is still in progress.  * The lofar_*.h
-	  files (like lofar_string.h) now make the using declarations of
-	  the standard types in the namespace LOFAR, instead of the global
-	  namespace.	For backward compatibility, the compiler
-	  MAKE_LOFAR_SYMBOLS_GLOBAL can be    used. It is recommended that
-	  you use these lofar_*.h header files instead of    the standard
-	  header files.  * The line 'AM_CPPFLAGS =
-	  MAKE_LOFAR_SYMBOLS_GLOBAL' has been added to most of	 the
-	  Makefile.am files. The packages that are currently being built in
-	    the weekly build are known to compile using the new 'Common'
-	  package when	 backward compatibility is enabled. Where
-	  necessary, source code or header   files were modified. This
-	  usually meant adding a line like e.g.    'using LOFAR::Thread'.
-
-2004-10-13 10:12  diepen
-
-	* test/: Makefile.am, tLorrays.cc: %[ER: 70]% Made tLorrays run
-
-2004-10-13 08:57  diepen
-
-	* test/tHexdump.cc: %[ER: 70]% Use coorect filename in INIT_LOGGER
-	  Use standard file name for test output
-
-2004-10-11 13:25  overeem
-
-	* test/Makefile.am: %[ER:30]% Added tHexdump.
-
-2004-10-11 12:22  overeem
-
-	* test/: tHexdump.cc, tHexdump.log_prop, tHexdump_test.sh:
-	  %[ER:30]% Test program for testing hexdump.cc.
-
-2004-10-11 12:20  overeem
-
-	* src/Makefile.am: %[ER:30]% Added hexdump files.
-
-2004-10-11 12:19  overeem
-
-	* src/: hexdump.cc, hexdump.h: %[ER:30]% New utility to create a
-	  hexdump of a given area of memory.  The destination can be
-	  stdout, a file, a char* or a string.
-
-2004-10-08 12:18  loose
-
-	* test/tDebug.cc: %[ER: 30]%
-
-	  Debug class now resides in namespace LOFAR.
-
-2004-10-06 09:42  diepen
-
-	* src/LofarLogCout.h: %[ER: 70]% Removed argv from INIT_LOGGER
-	  macro
-
-2004-09-30 14:45  overeem
-
-	* src/lofar_strstream.h: %[ER: ]% Test on GNU_MINOR was wrong, it
-	  should test on 1 iso 3.
-
-2004-09-30 09:36  diepen
-
-	* src/: BlobField.cc, BlobField2.cc, Makefile.am: %[ER: 38]% Moved
-	  non-templated code to BlobField2.cc (otherwise duplicate symbols
-	  when BlobField.cc is included elsewhere)
-
-2004-09-14 16:49  overeem
-
-	* test/testLogger.debug: %[ER:89]% Property file to be used with
-	  testLogger when 'Debug' implementation is used in stead of the
-	  log4cplus implementation.
-
-2004-09-14 16:47  overeem
-
-	* test/testLogger.cc: %[ER:89]% Update for split in LofarLogger
-	  implementation for Log4Cplus and Debug.
-
-2004-09-14 16:45  overeem
-
-	* src/: LofarLog4Cplus.h, LofarLogCout.h: %[ER:89]% Package
-	  dependant implementation of the LofarLogger macro's.
-
-2004-09-14 16:44  overeem
-
-	* src/: LofarLogger.cc, LofarLogger.h: %[ER:89]% The macro's of the
-	  LofarLogger are now moved to two other headerfiles:
-	  LofarLog4Cplus.h and LofarLogCout.h The first one implements the
-	  macro's for use with log4Cplus, the latter implements them on the
-	  'Debug' way.
-
-	  Function 'formatString' is moved to Common/StringUtil because it
-	  belongs the more than in the LofarLogger.
-
-2004-09-14 16:38  overeem
-
-	* src/: StringUtil.cc, StringUtil.h: %[ER:89]% Moved function
-	  'formatString' from LofarLogger source to this place because this
-	  is were it belongs.
-
-2004-09-01 10:14  smirnov
-
-	* src/Lorrays-Blitz.h: %[ER: 16]% Changed min() to std::min()
-
-2004-08-31 09:02  diepen
-
-	* src/: BlitzToAips.h, BlobArray.h, BlobArray.tcc, Lorrays-Blitz.h:
-	  %[ER: 70]% Changed for new AIPS++ structure
-
-2004-08-30 12:50  diepen
-
-	* src/BlobOBufString.cc, src/BlobString.cc, test/tBlobString.cc:
-	  %[ER: 38]% cater for fact that std::string can use counted
-	  reference
-
-2004-08-24 13:52  diepen
-
-	* src/BlobFieldSet.cc, src/BlobFieldSet.h, src/BlobIStream.cc,
-	  src/BlobIStream.h, src/BlobOBufChar.cc, src/BlobOBufChar.h,
-	  src/BlobOBufString.cc, src/BlobOBufString.h, src/BlobString.cc,
-	  src/BlobString.h, src/LofarLogger.cc, test/tBlobField.cc,
-	  test/tBlobString.cc: %[ER: 38]% Added the possibility to add a
-	  blob to a BlobFieldSet (for Transport)
-
-2004-08-20 14:04  smirnov
-
-	* src/: Debug.cc, Debug.h: %[ER: 16]% Disabled debug output in
-	  optimized builds (i.e. when LOFAR_DEBUG is not defined)
-
-2004-08-20 13:53  smirnov
-
-	* src/Debug.h: %[ER: 16]% Disabled debug output for optimized
-	  builds
-
-2004-07-16 10:58  diepen
-
-	* src/: BlobOBufChar.cc, BlobOBufChar.h, BlobOStream.h: %[ER: 38]%
-	  Added clear function
-
-2004-07-13 09:24  diepen
-
-	* src/LofarLogger.h: %[ER: 70]% Make sure LOFARLOGGER_PACKAGE is
-	  always defined
-
-2004-07-09 09:31  diepen
-
-	* src/: BlobField.h, BlobIBufChar.h, BlobOBufChar.h: %[ER: 70]%
-	  Fixed few compile errors found by gcc-3.4
-
-2004-07-07 12:24  smirnov
-
-	* src/Debug.h: %[ER: 16]% Added another LocalDebugContext: for
-	  namespaces
-
-2004-07-05 12:20  coolen
-
-	* src/LofarLogger.cc, src/LofarLogger.h, test/testLogger.cc: %[ER:
-	  70]% log4cplus is not required anymore , if log4cplus not
-	  available tracing will go t o stdout
-
-2004-07-05 12:19  coolen
-
-	* configure.in: %[ER: 70]% log4cplus is not required anymore , if
-	  log4cplus not available tracing will go to stdout
-
-2004-06-23 09:16  coolen
-
-	* test/Makefile.am: %[ER: 70]% Added CHECKTOOLPROGS line to create
-	  possibilites for extra checkbuilds like valgrind
-
-2004-06-21 16:17  diepen
-
-	* src/LofarLogger.h: %[PR: 76]% Make it possible to use in
-	  single-threaded mode
-
-2004-06-11 10:54  wierenga
-
-	* src/: LofarTypedefs.h, LofarTypes.h: %[PR:81 ]%
-
-	  Added int8/uint8 type definitions.
-
-2004-05-19 12:08  diepen
-
-	* src/LofarLogger.h: %[ER: 70]% Fixed the problem in case one does
-	  not do "using namespace LOFAR"
-
-2004-04-26 15:37  diepen
-
-	* src/LofarLogger.h: %[ER: 105]% Renamed AssertError to ASSERTError
-	  to avoid collision with Debug.h
-
-2004-04-26 15:29  diepen
-
-	* test/: Makefile.am, tBlobField.cc, tBlobField.in_be,
-	  tBlobField.in_le, tBlobStream.cc, tBlobStream.in_be,
-	  tBlobStream.in_le, tBlobStream.out: %[ER: 38]% Removed
-	  tBlob(Array)Header Changed test program for changes in classes
-
-2004-04-26 15:28  diepen
-
-	* src/: BlobArray.cc, BlobArray.h, BlobArray.tcc,
-	  BlobArrayHeader.h, BlobException.h, BlobField.cc,
-	  BlobFieldSet.cc, BlobHeader.cc, BlobHeader.h, BlobHeader.tcc,
-	  BlobIStream.cc, BlobIStream.h, BlobOStream.cc, BlobOStream.h,
-	  Makefile.am: %[ER: 38]% Removed obsolete template
-	  Blob(Array)Header Added option to skip objecttype in header Use
-	  THROW and BlobException everywhere
-
-2004-04-23 16:01  diepen
-
-	* configure.in, src/BlobArray.cc, src/BlobArray.tcc,
-	  src/BlobArrayHeader.h, src/BlobField.cc, src/BlobFieldSet.cc,
-	  src/BlobFieldSet.h, src/BlobHeader.tcc, src/BlobIBufChar.cc,
-	  src/BlobIBufChar.h, src/BlobIStream.cc, src/BlobOBufChar.cc,
-	  src/BlobOBufChar.h, src/BlobOBufString.h, src/BlobOBufVector.h,
-	  src/BlobOStream.cc, src/BlobString.cc, src/KeyValue.cc,
-	  src/LofarLogger.h, src/Makefile.am, test/Makefile.am,
-	  test/tBlobArray.cc, test/tBlobArrayHeader.cc, test/tBlobField.cc,
-	  test/tBlobHeader.cc, test/tBlobStream.cc, test/tBlobString.cc,
-	  test/tDataConvert.cc, test/tKeyValueMap.cc, test/tStringUtil.cc,
-	  test/testLogger.cc, test/testLogger_test.sh: %[ER: 38]% Use
-	  LofarLogger everywhere
-
-2004-04-22 14:19  diepen
-
-	* test/: testLogger.cc, testLogger.log_prop, testlogger.properties:
-	  %[ER: 38]% Renamed log properties file to log_prop (as used in
-	  runtest.sh)
-
-2004-04-21 13:51  diepen
-
-	* src/: BlobOBufChar.cc, BlobOBufChar.h: %[ER: 70]% Set
-	  itsReservedSize in reserve and made it out-of-line Renamed
-	  expandIfNeeded to resizeIfNeeded
-
-2004-04-19 11:26  loose
-
-	* src/: HEADER.cc, HEADER.g, HEADER.h, HEADER.pl, HEADER.sh: %[ER:
-	  30]%
-
-	  Updated copyright line.
-
-2004-04-01 13:17  diepen
-
-	* src/BlobFieldSet.h: %[ER: 38]% Added function version
-
-2004-03-15 10:35  wierenga
-
-	* src/Makefile.am: %[ER:70]%
-
-	  Cannot use if HAVE_LOG4CPLUS because its definition from
-	  autoconf_share/lofar_external.m4 is not recognised by older
-	  versions of autoconf/automake.
-
-2004-03-12 13:02  wierenga
-
-	* src/LofarLogger.h: %[ER:70 ]% Add #undef THROW before #define
-	  THROW to undefine the definition from Exception.h.
-
-2004-03-12 09:45  wierenga
-
-	* src/LimitExec.cc: %[ER: 70]%
-
-	  Renamed LimitExec.c to LimitExec.cc to make sure it is compiled
-	  with the c++ compiler.
-
-2004-03-12 09:44  wierenga
-
-	* src/Makefile.am: %[ER:70 ]%
-
-	  Removed use of += within LOG4CPLUS condition. It doesn't work on
-	  older automake versions.  Renamed LimitExec.c to LimitExec.cc
-	  because the gcc compiler could not link with the c++ log4cplus
-	  library! This is a problem caused by the fact that for any
-	  configured packages all libraries are unconditionally added to
-	  LDADD. What we should really have is a LOG4CPLUS_LDADD which can
-	  then be used as needed.
-
-2004-03-11 14:21  wierenga
-
-	* configure.in, src/Makefile.am: %[ER:70]%
-
-	  Compile in LofarLogger only when log4cplus is correctly
-	  configured.
-
-2004-03-10 08:45  diepen
-
-	* test/: tBlobArray.cc, tBlobField.cc: %[ER: 38]% Added
-	  useBlobHeader tests
-
-2004-03-10 08:44  diepen
-
-	* src/: BlobField.cc, BlobField.h, BlobFieldSet.cc, BlobFieldSet.h:
-	  %[ER: 38]% Added control of useBlobHeader and fixedShape
-
-2004-03-10 08:38  diepen
-
-	* src/: BlobArray.cc, BlobArray.h, BlobArray.tcc: %[ER: 38]%
-	  Specialise to handle a vector of bools correctly Added argument
-	  useBlobHeader to avoid a header for each array
-
-2004-03-10 08:30  diepen
-
-	* src/: BlobIStream.cc, BlobIStream.h, BlobOStream.cc,
-	  BlobOStream.h: %[ER: 38]% Added a function to handle a vector of
-	  bools without its length
-
-2004-03-01 16:28  diepen
-
-	* test/: tKeyValueMap.cc, tKeyValueMap.out: %[ER: 72]% Added tests
-	  of H:M:S and D.M.S
-
-2004-03-01 16:28  diepen
-
-	* src/: KeyTokenize.ll, KeyValue.cc, KeyValue.h: %[ER: 72]% Support
-	  specification of values as H:M:S or D.M.S
-
-2004-02-23 09:20  diepen
-
-	* src/BlobFieldSet.h: %[ER: 38]% Improved comments
-
-2004-02-23 08:51  diepen
-
-	* src/BlobField.h, src/BlobFieldSet.cc, src/BlobIStream.cc,
-	  src/BlobIStream.h, src/BlobOStream.cc, src/BlobOStream.h,
-	  src/BlobString.h, test/tBlobArray.cc, test/tBlobArrayHeader.cc,
-	  test/tBlobStream.cc, test/tKeyValueMap.cc: %[ER: 38]% Removed
-	  pointer from BlobStream arguments (to be consistent with others)
-
-2004-02-23 08:50  diepen
-
-	* test/tBlobField.cc: %[ER: 38]% Added a few more tests to handle
-	  unconverted data
-
-2004-02-18 16:30  diepen
-
-	* src/: BlobArray.cc, BlobArray.h, BlobField.cc, BlobField.h,
-	  BlobHeader.h: %[ER: 38]% Take care that array header gets
-	  converted when field set is converted
-
-2004-02-18 15:36  diepen
-
-	* test/tBlobField.in_be: %[ER: 38]% Proper big endian version
-
-2004-02-18 15:22  diepen
-
-	* src/: BlobField.cc, BlobField.h: %[ER: 38]% Do type check using
-	  type_info instead of typeNames
-
-2004-02-18 15:22  diepen
-
-	* src/LofarTypes.h: %[ER: 38]% Always include sys/types.h (there
-	  were problems on SUN)
-
-2004-02-18 13:57  diepen
-
-	* test/tBlobStream.in_be: %[ER: 38]% Improved version
-
-2004-02-18 13:12  diepen
-
-	* src/DataFormat.h: %[ER: 38]% Needed to include lofar_config.h
-
-2004-02-18 12:18  diepen
-
-	* test/tBlobStream.in_be: %[ER: 38]% Big-endian version of the file
-
-2004-02-18 11:19  diepen
-
-	* src/BlobOBufChar.h: %[ER: 38]% Added reserve function
-
-2004-02-18 11:18  diepen
-
-	* src/BlobIBufChar.h: %[ER: 38]% Added getBuffer and size function
-
-2004-02-18 11:16  diepen
-
-	* src/LofarTypes.h: %[ER: 38]% Added some indentation to ifdef
-
-2004-02-18 11:15  diepen
-
-	* src/DataConvert.h: %[ER: 72]% Added conversion functions for
-	  arrays of all native data types
-
-2004-02-18 11:14  diepen
-
-	* src/Makefile.am: %[ER: 38]% Added BlobField(Set)
-
-2004-02-18 11:13  diepen
-
-	* src/: BlobArray.h, BlobArray.tcc: %[ER: 38]% Removed align
-	  argument from set/getSpace functions; align is now always done by
-	  means of the putStart in setSpace
-
-2004-02-18 11:11  diepen
-
-	* src/: BlobArrayHeader.h, BlobHeader.h, BlobHeader.tcc: %[ER: 38]%
-	  Changed following comments from review - added end-of-blob marker
-
-2004-02-18 11:10  diepen
-
-	* src/: BlobIStream.cc, BlobIStream.h: %[ER: 38]% Changed following
-	  comments from review - get can only be done after a getStart -
-	  keep mustConvert and dataFormat
-
-2004-02-18 11:08  diepen
-
-	* src/: BlobOStream.cc, BlobOStream.h: %[ER: 38]% Changed following
-	  comments from review - added end-of-blob - replaced header8
-	  constructor argument by putStart align argument - put can only be
-	  done after a putStart
-
-2004-02-18 11:06  diepen
-
-	* src/: BlobField.cc, BlobField.h, BlobFieldSet.cc, BlobFieldSet.h:
-	  %[ER: 72]% Classes to define a 'static' blob in a dynamic way
-
-2004-02-18 11:05  diepen
-
-	* test/: Makefile.am, tBlobArray.cc, tBlobArrayHeader.cc,
-	  tBlobField_test.sh, tBlobHeader.cc, tBlobStream.cc,
-	  tBlobStream.in_be, tBlobStream.in_le, tBlobStream.out,
-	  tBlobString.cc, tDataConvert.cc: %[ER: 38]% Changed following the
-	  comments in the review
-
-2004-02-18 11:04  diepen
-
-	* test/: tBlobField.cc, tBlobField.in_be, tBlobField.in_le: %[ER:
-	  72]% Tests for class BlobField(Set)
-
-2004-02-13 12:29  overeem
-
-	* test/testlogger.properties: %[ER:89]% Propertiesfile to be used
-	  by the testLogger.
-
-2004-02-13 12:27  overeem
-
-	* test/testLogger.cc: %[ER:89]% Demo/test program to demonstrate
-	  the use of the lofar logger.
-
-2004-02-13 12:25  overeem
-
-	* src/: LofarLogger.h, LofarLogger.cc: %[ER:89]% Version for tryout
-	  by others.
-
-2004-02-10 11:57  diepen
-
-	* test/: Makefile.am, tBlobArrayHeader_test.sh, tBlobArray_test.sh,
-	  tBlobHeader_test.sh, tBlobString_test.sh, tDataConvert_test.sh:
-	  %[ER: 70]% Added scripts for upcoming LofarLogger change
-
-2004-02-10 10:07  diepen
-
-	* src/shmem/: dlmalloc.c, dlmalloc.h: %[ER: 70]% Renamed mstate to
-	  mstate_shm for gcc-2.96
-
-2004-02-10 09:48  diepen
-
-	* src/KeyParser.cc: %[ER: 72]% Moved KeyTokenize outside LOFAR
-	  namespace
-
-2004-02-09 16:35  diepen
-
-	* src/KeyParser.h: %[ER: 64]% Moved forward declaration of
-	  KeyTokenizewrap out of LOFAR namespace
-
-2004-02-09 12:14  diepen
-
-	* src/Makefile.am: %[ER: 70]% Renamed include_HEADERS to
-	  pkginclude_HEADERS
-
-2004-02-03 14:49  diepen
-
-	* test/tBlobArrayHeader.cc: %[ER: 38]% Delete data at the end to
-	  avoid leak
-
-2004-02-03 10:09  loose
-
-	* src/fwd/PL.h: %[ER: 65]%
-
-	  Moved forward declarations to PL directory. This is a more
-	  logical location.
-
-2004-02-02 13:10  diepen
-
-	* src/: Allocator.h, BlobArray.h, BlobIBufChar.h, BlobIBufStream.h,
-	  BlobIBufVector.h, BlobIBuffer.h, BlobIStream.h, BlobOBufChar.h,
-	  BlobOBufString.h, BlobOBufVector.h, BlobOStream.h, BlobString.h,
-	  BlobStringTraits.h, BlobStringType.h, DataConvert.h,
-	  DataFormat.h, LofarTypedefs.h, LofarTypes.h, TypeNames.h: %[ER:
-	  38]% Updated comments for doxygen
-
-2004-02-02 13:10  diepen
-
-	* src/BlobArray.cc: %[ER: 38]% Fixed bug (no elements allocated in
-	  vector)
-
-2004-01-30 13:37  smirnov
-
-	* src/: Common-Model.cat, Debug.cc, Debug.h: %[ER: 16]% Added
-	  option to redirect debug output into a file.	Use the
-	  Debug::redirectOutput() function, or "-d:filename" on the command
-	  line.
-
-2004-01-30 12:33  diepen
-
-	* test/tDataConvert.cc: %[ER: 70]% Removed compiler errors for
-	  gcc-3.3
-
-2004-01-30 12:16  diepen
-
-	* test/tDebug.out: %[ER: 70]% It needed one more line
-
-2004-01-29 09:07  diepen
-
-	* src/Makefile.am: %[ER: 89]% Temporarily removed LofarLogger from
-	  compile
-
-2004-01-28 17:05  smirnov
-
-	* src/Lorrays.h: %[ER: 16]% Added include config.h
-
-2004-01-28 16:25  overeem
-
-	* src/Makefile.am: %[ER:89]% Added LofarLogger to makefile
-
-2004-01-28 16:18  overeem
-
-	* src/LofarLogger.cc: [%ER:89]% First version of the library part
-
-2004-01-28 16:18  overeem
-
-	* src/LofarLogger.h: [%ER:89]% First version of the preprocessor
-	  API's
-
-2004-01-28 08:40  diepen
-
-	* src/BlobString.cc, src/BlobString.h, test/tBlobArray.cc: %[ER:
-	  38]% Added flag to BlobString to prevent extension
-
-2004-01-26 09:56  smirnov
-
-	* src/Thread/Mutex.h: %[ER: 16]% Fixed bug with copy-constructor of
-	  unattached Mutex::Lock
-
-2004-01-26 09:51  diepen
-
-	* src/KeyParser.cc: %[ER: 72]% stdio.h is needed on lofar3
-
-2004-01-21 12:08  smirnov
-
-	* src/Common-Model.cat: %[ER: 16]% brought the Rose model
-	  up-to-date; this got a bunch of IDs inserted into the sources,
-	  hence the massive update.
-
-2004-01-19 14:52  diepen
-
-	* src/BlobArrayHeader.h, src/BlobHeader.h, src/BlobHeader.tcc,
-	  src/BlobIBufChar.cc, src/BlobIBufChar.h, src/BlobIBufStream.cc,
-	  src/BlobIBufStream.h, src/BlobIBufString.h, src/BlobIBufVector.h,
-	  src/BlobIBuffer.h, src/BlobIStream.cc, src/BlobIStream.h,
-	  src/BlobOBufChar.cc, src/BlobOBufChar.h, src/BlobOBufNull.cc,
-	  src/BlobOBufNull.h, src/BlobOBufStream.cc, src/BlobOBufStream.h,
-	  src/BlobOBufString.cc, src/BlobOBufString.h,
-	  src/BlobOBufVector.h, src/BlobOBuffer.h, src/BlobOStream.cc,
-	  src/BlobOStream.h, src/BlobString.cc, src/BlobString.h,
-	  src/BlobStringTraits.h, src/BlobStringType.cc,
-	  src/BlobStringType.h, src/Debug.h, src/KeyParse.yy,
-	  src/KeyParser.cc, src/KeyParser.h, src/KeyTokenize.ll,
-	  src/KeyValue.cc, src/KeyValue.h, src/KeyValueMap.cc,
-	  src/KeyValueMap.h, src/LofarTypedefs.h, src/LofarTypes.h,
-	  test/tBlobArray.cc, test/tBlobArrayHeader.cc,
-	  test/tBlobHeader.cc, test/tBlobStream.cc, test/tBlobString.cc,
-	  test/tKeyValueMap.cc: %[ER: 38]% Put Blobs in namespace LOFAR
-
-2004-01-16 12:25  diepen
-
-	* src/KeyParser.cc: %[ER: 72]% Allow empty string
-
-2004-01-15 16:48  smirnov
-
-	* src/Debug.h, test/tDebug.cc: %[ER: 16]% Changed default
-	  definition of sdebug() to return the Debug context name
-
-2004-01-12 16:21  diepen
-
-	* src/KeyParse.yy, src/KeyParser.cc, src/KeyParser.h,
-	  src/KeyTokenize.ll, src/Makefile.am, test/tKeyValueMap.cc,
-	  test/tKeyValueMap.out: %[ER: 72]% Added scanner/parser for
-	  key=value line
-
-2003-12-23 11:25  loose
-
-	* test/: Makefile.am, tStringUtil.cc, tStringUtil.out,
-	  tStringUtil_test.sh: %[ER: 30]% Added StringUtil class. This
-	  class contains useful string utilities. It is meant to be a class
-	  containing static methods only (it's a bit like a namespace).
-
-2003-12-23 11:13  loose
-
-	* src/: Makefile.am, StringUtil.cc, StringUtil.h: %[ER: 30]% Added
-	  StringUtil class. This class contains useful string utilities. It
-	  is meant to be a class containing static methods only (it's a bit
-	  like a namespace).
-
-2003-12-22 12:08  diepen
-
-	* src/: BlobStringTraits.h, Debug.h, Exception.h, HEADER.h,
-	  KeyValue.h, Lorrays.h, Profiling/PerfProfile.h, fwd/PL.h,
-	  shmem/shmem_alloc.h: %[ER: 70]% Alas lofar_config.h is needed
-	  because Make may create new config.h
-
-2003-12-19 13:26  diepen
-
-	* src/fwd/PL.h: %[ER: 70]% Use config.h instead of lofar_config.h
-
-2003-12-19 11:12  diepen
-
-	* src/: BlobStringTraits.h, Debug.h, HEADER.h, KeyValue.h,
-	  Lorrays.h, Profiling/PerfProfile.h, shmem/shmem_alloc.h: %[ER:
-	  70]% Include config.h again instead of lofar_config.h
-
-2003-12-17 16:18  diepen
-
-	* src/: BlobArray.tcc, BlobStringTraits.h, DataFormat.h, Debug.h,
-	  HEADER.h, KeyValue.h, KeyValueMap.h, Lorrays.h,
-	  Profiling/PerfProfile.cc, Profiling/PerfProfile.h, fwd/PL.h,
-	  shmem/shmem_alloc.cc, shmem/shmem_alloc.h: %[ER: 70]% Include
-	  lofar_config.h instead of config.h
-
-2003-12-17 16:17  diepen
-
-	* configure.in: %[ER: 70]% Test for LONG_LONG
-
-2003-12-16 14:52  loose
-
-	* src/fwd/PL.h: %[ER: 61]% Added file with forward class
-	  declarations. This file can be used when someone needs to forward
-	  declare a class from the PL package, but does not want to include
-	  the associated PL header file. In this way, we can keep compile
-	  time dependencies between packaging minimal.
-
-2003-12-12 16:29  smirnov
-
-	* src/Debug.h: %[ER: 16]% Small fixes to make debug contexts better
-	  compatible with namespaces
-
-2003-12-12 16:09  diepen
-
-	* src/BlobString.cc, test/tBlobString.cc: %[ER: 38]% Do not use
-	  DbgAssert anymore in BlobString::resize; instead always resize
-
-2003-12-12 15:25  brentjens
-
-	* src/LofarTypes.h: %[PR: 53]%
-
-	  Added #if(HAVE_QT) directive to prevent nameclash with QT
-	  definitions of uchar. If QT is present, load qglobal.h, else
-	  maintain original "using" declarations.
-
-	  In order to prevent future namclashes, the using declarations
-	  should be moved to the .cc files that need them. Ideally, there
-	  should not be any "using" declarations in any .h file.
-
-2003-12-11 07:59  diepen
-
-	* src/BlobStringTraits.h: %[ER: 38]% Include dtl_config, otherwise
-	  specialization may not be known in time
-
-2003-12-11 07:58  diepen
-
-	* src/BlobArray.tcc: %[ER: 38]% Fixed problem with AIPS++ arrays;
-	  IPosition does not have a data function
-
-2003-12-09 12:31  diepen
-
-	* src/lofar_strstream.h: %[ER: 62]% Do not include strstream for
-	  gcc version 3.3 and higher
-
-2003-12-09 12:09  diepen
-
-	* src/: BlobHeader.h, BlobIStream.cc, BlobOStream.cc: %[ER: 38]%
-	  Added class BlobHeaderBase for ease of use
-
-2003-12-09 08:25  diepen
-
-	* src/: BlobArray.h, BlobArray.tcc: %[ER: 38]% Added align argument
-	  to set/getSpaceBlobArray
-
-2003-12-09 08:24  diepen
-
-	* src/BlobIStream.cc: %[ER: 38]% Fixed problem in reading back ints
-	  when conversion was needed
-
-2003-12-09 08:23  diepen
-
-	* test/: tBlobStream.in_be, tBlobStream.in_le: %[ER: 38]% Test
-	  input for tBlobStream with different byte ordenings
-
-2003-12-09 07:54  diepen
-
-	* test/: tBlobStream.cc, tBlobStream.out: %[ER: 38]% Added test of
-	  all possible data types
-
-2003-12-09 07:53  diepen
-
-	* src/: BlobIStream.cc, BlobIStream.h, BlobOStream.cc,
-	  BlobOStream.h, DataConvert.cc, DataConvert.h: %[ER: 38]% Added
-	  functionality to store bools as bits
-
-2003-12-08 10:01  diepen
-
-	* test/tBlobArray.cc: %[ER: 38]% Added test of align
-
-2003-12-08 10:00  diepen
-
-	* src/: BlobArray.h, BlobArray.tcc: %[ER: 38]% Renamed reserve to
-	  setSpace and find to getSpace
-
-2003-12-08 09:59  diepen
-
-	* src/: BlobIStream.cc, BlobIStream.h, BlobOStream.cc,
-	  BlobOStream.h: %[ER: 38]% Renamed reserve to setSpace and skip to
-	  getSpace Added align function Removed itsCanGet and itsCanPut
-
-2003-12-08 08:48  diepen
-
-	* src/BlobIBufStream.cc, src/BlobOBufStream.cc, src/LofarTypes.h,
-	  test/tBlobStream.cc: %[ER: 38]% Make it compile with gcc-2.95.3
-
-2003-12-03 13:52  diepen
-
-	* src/: BlobArray.h, Debug.h: %[ER: 38]% Fixed typo in
-	  documentation
-
-2003-12-03 13:51  diepen
-
-	* src/: KeyValue.h, KeyValueMap.h: %[ER: 38]% Updated comments
-
-2003-12-03 12:03  loose
-
-	* src/: HEADER.cc, HEADER.h: %[ER: 30]% Added "namespace LOFAR" to
-	  template .cc and .h files.
-
-2003-12-01 15:18  diepen
-
-	* test/: Makefile.am, tKeyValueMap.cc, tKeyValueMap.out,
-	  tKeyValueMap_test.sh: %[ER: 38]% Added test program for
-	  KeyValueMap
-
-2003-12-01 15:17  diepen
-
-	* test/tBlobStream.cc: %[ER: 38]% Added test of BlobOBufNull
-
-2003-12-01 15:15  diepen
-
-	* src/: Allocator.h, BlobOBufNull.cc, BlobOBufNull.h, KeyValue.cc,
-	  KeyValue.h, KeyValueMap.cc, KeyValueMap.h, Makefile.am: %[ER:
-	  38]% Added a few new classes
-
-2003-12-01 13:48  loose
-
-	* src/Debug.h, src/Exception.cc, src/Exception.h, test/tDebug.cc:
-	  %[ER: 61]% Moved Exception class from namespace LCS to namespace
-	  LOFAR.
-
-2003-12-01 13:47  diepen
-
-	* src/: BlobString.cc, BlobString.h: %[ER: 38]% Added constructor
-	  and getString
-
-2003-11-28 15:44  diepen
-
-	* src/Allocator.cc, src/Allocator.h, src/BlobArray.cc,
-	  src/BlobArray.h, src/BlobArray.tcc, src/BlobArrayHeader.h,
-	  src/BlobHeader.cc, src/BlobHeader.h, src/BlobHeader.tcc,
-	  src/BlobIBufChar.cc, src/BlobIBufChar.h, src/BlobIBufStream.cc,
-	  src/BlobIBufStream.h, src/BlobIBufString.h, src/BlobIBufVector.h,
-	  src/BlobIBuffer.h, src/BlobIStream.cc, src/BlobIStream.h,
-	  src/BlobOBufChar.cc, src/BlobOBufChar.h, src/BlobOBufStream.cc,
-	  src/BlobOBufStream.h, src/BlobOBufString.cc,
-	  src/BlobOBufString.h, src/BlobOBufVector.h, src/BlobOBuffer.h,
-	  src/BlobOStream.cc, src/BlobOStream.h, src/BlobString.cc,
-	  src/BlobString.h, src/BlobStringTraits.h, src/BlobStringType.cc,
-	  src/BlobStringType.h, src/DataConvert.cc, src/DataConvert.h,
-	  src/DataFormat.h, src/LofarTypedefs.h, src/Makefile.am,
-	  src/TypeNames.cc, src/TypeNames.h, src/TypeNames.tcc,
-	  test/Makefile.am, test/tBlobArray.cc, test/tBlobArrayHeader.cc,
-	  test/tBlobHeader.cc, test/tBlobStream.cc, test/tBlobStream.out,
-	  test/tBlobStream_test.sh, test/tBlobString.cc,
-	  test/tDataConvert.cc, test/tDebug.cc: %[ER: 38]% First version of
-	  classes to create blobs
-
-2003-11-19 09:23  diepen
-
-	* src/lofar_fstream.h: %[ER: 55]% Use fstream instead of fstream.h
-
-2003-11-17 15:47  diepen
-
-	* src/: LofarTypedefs.h, LofarTypes.h, Lonumerics.h: %[ER: 55]%
-	  Added convenience typedefs to LofarTypes and removed from
-	  Lonumerics Use namespace only in LofarTypes
-
-2003-11-17 13:51  loose
-
-	* src/HEADER.h: %[ER: 19]% Added conditional include of <config.h>
-
-2003-10-29 14:54  smirnov
-
-	* src/Debug.h, test/tDebug.cc: %[ER: 16]% Cleaned up debug context
-	  definition macros
-
-2003-10-08 17:20  diepen
-
-	* src/BlitzToAips.h: %[ER: 30]% Fixed ifdef (BLITZ was used instead
-	  of AIPSPP)
-
-2003-10-08 17:11  diepen
-
-	* src/: LofarTypes.h, Makefile.am: %[ER: 30]% Added LofarTypes.h
-
-2003-09-30 13:31  smirnov
-
-	* src/Debug.cc, src/Debug.h, test/tDebug.out: %[ER: 16]% Tied the
-	  debug stream to cerr rather than cout. This necessitated a change
-	  to the dprintf() macro.  Throw() now dumps the exception message
-	  to the debug stream at level 1.
-
-2003-09-30 12:38  loose
-
-	* src/Debug.h: %[ER: 19]% Forgot to modify one instance of
-	  HAVE___FUNCTION__. Did it now.
-
-2003-09-29 18:00  loose
-
-	* src/: Exception.cc, Exception.h: %[ER: 19]% Now this is rather
-	  awkward... The THROW macro does not work with stringstream.  It
-	  never did, and never could. I was so eager to minimize
-	  compile-time dependencies that I did not want to include
-	  <sstream>. But my approach failed miserably, because you cannot
-	  construct a stringstream using a number of arguments glued
-	  together using operator<<. You really must shift these arguments
-	  into the stringstream within the THROW macro. Hence, I got rid of
-	  the extra constructor taking an ostringstream as its first
-	  argument, for I don't see any use for it anymore. Sigh! I really
-	  need to do better unit testing.
-
-2003-09-29 17:44  smirnov
-
-	* src/Debug.h, test/tDebug.cc: %[ER: 16]% Based Debug (and Assert)
-	  errors off of LCS::Exception.  Cleaned up Assert macros.
-
-2003-09-19 15:40  loose
-
-	* configure.in: %[ER: 30]% Added check for PRETTY_FUNCTION.
-
-2003-09-19 15:39  loose
-
-	* src/HEADER.h: %[ER: 30]% Changed definition of include guard.
-	  Doxygen only ignores #ifndef and not #if !defined(), and we do
-	  not want our include guards documented, do we?
-
-2003-09-19 15:31  loose
-
-	* src/Exception.h: %[ER: 19]% Added documentation.
-
-2003-09-19 15:23  loose
-
-	* src/Debug.h: %[ER: 19]% Changed check for HAVE___FUNCTION__ into
-	  check for both HAVE_PRETTY_FUNCTION and HAVE_FUNCTION which are
-	  defined by configure.
-
-2003-09-15 12:39  smirnov
-
-	* src/: Makefile.am, debug_methods.g: %[ER: 16]% Moved
-	  debug_methods.g to CEP/CPA/GlishUtil
-
-2003-08-27 15:13  diepen
-
-	* src/Lorrays.h: Removed erronous CVS diff lines
-
-2003-08-22 12:15  loose
-
-	* src/Exception.h: Moved macro definitions outside of namespace
-	  LCS. It doesn't matter to the compiler, cause preprocessor macros
-	  are global by definition, but it might confuse the human reader.
-	  Removed the macro EXCEPTION, because it cannot be used outside
-	  namespace LCS.
-
-2003-08-21 18:25  loose
-
-	* src/Makefile.am: Added Exception.{h,cc}
-
-2003-08-21 18:24  loose
-
-	* src/: Exception.cc, Exception.h: Initial version
-
-2003-08-21 18:21  loose
-
-	* src/: HEADER.cc, HEADER.h: Changed comment '//' into '//#'.
-	  Doxygen will be told to ignore the latter type of comment.
-
-2003-08-21 13:20  diepen
-
-	* Makefile.am, bootstrap, configure.in, src/BlitzToAips.h,
-	  src/CheckConfig.h, src/Common-Model.cat, src/Debug.cc,
-	  src/Debug.h, src/HEADER.cc, src/HEADER.g, src/HEADER.h,
-	  src/HEADER.pl, src/HEADER.sh, src/LimitExec.c, src/Lonumerics.h,
-	  src/Lorrays-Blitz.h, src/Lorrays.h, src/Makefile.am,
-	  src/Stopwatch.cc, src/Stopwatch.h, src/Thread.h,
-	  src/blitz_array-impl.h, src/debug_methods.g,
-	  src/lofar_algorithm.h, src/lofar_complex.h, src/lofar_deque.h,
-	  src/lofar_fstream.h, src/lofar_iosfwd.h, src/lofar_iostream.h,
-	  src/lofar_list.h, src/lofar_map.h, src/lofar_stack.h,
-	  src/lofar_string.h, src/lofar_strstream.h, src/lofar_vector.h,
-	  src/Net/Socket.cc, src/Net/Socket.h,
-	  src/Profiling/PerfProfile.cc, src/Profiling/PerfProfile.h,
-	  src/Thread/Condition.h, src/Thread/Key.h, src/Thread/Mutex.h,
-	  src/Thread/SmartLock.cc, src/Thread/SmartLock.h,
-	  src/Thread/Thread.cc, src/Thread/Thread.h, src/shmem/Makefile.am,
-	  src/shmem/dlmalloc.c, src/shmem/dlmalloc.h,
-	  src/shmem/segbasemap.cc, src/shmem/segbasemap.h,
-	  src/shmem/shmem_alloc.cc, src/shmem/shmem_alloc.h,
-	  test/Makefile.am, test/tDebug.cc, test/tDebug.out,
-	  test/tDebug_test.sh, test/tLorrays.cc, test/tLorrays.out,
-	  test/tLorrays_test.sh: Moved Common to LCS
-
diff --git a/LCS/Common/Common.spec.in b/LCS/Common/Common.spec.in
deleted file mode 100644
index 502ea6a501ca5589fc454ce93ba6ce3265242f78..0000000000000000000000000000000000000000
--- a/LCS/Common/Common.spec.in
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Common.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Common is the common LOFAR software package
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Common is the package containing the common LOFAR classes.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/Common/INSTALL b/LCS/Common/INSTALL
deleted file mode 100644
index 981649eaad600578a69b9a7f3a05b66aa5c56d8c..0000000000000000000000000000000000000000
--- a/LCS/Common/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building a LOFAR package
-========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to the package root directory (i.e. LCS/Common).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/LCS/Common/Makefile.am b/LCS/Common/Makefile.am
deleted file mode 100644
index e187fa18ba118589655daae05fecb96fe26a9586..0000000000000000000000000000000000000000
--- a/LCS/Common/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      Common.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Common/NEWS b/LCS/Common/NEWS
deleted file mode 100644
index ee5153ca7b61a67cd567a13f7ea2ba2cab90cc12..0000000000000000000000000000000000000000
--- a/LCS/Common/NEWS
+++ /dev/null
@@ -1,203 +0,0 @@
-LCS/Common: Version 3.0, date: 2006/01/30
-=========================================
-
-All Blob related stuff has been moved into the new LCS/Blob package.
-Deprecated stuff -- Debug, Thread and Profiling -- has been removed.
-Blitz support has been moved into the LCS/Math package.
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 146 : LofarLogger segfaults when used in statically initialized objects
-        Created patch for log4cplus 1.0.2.
-
-# 396 : Support of rpm builds
-        Make it possibe to build an rpm from a package. Also support spec.in
-        files in rub to find dependent packages.
-
-# 420 : Move programs/scripts to derive package dependencies to LCS/Tools
-        The script makedep.sh and the C++ code pkgdep.cc have both been moved
-        to the LCS/Tools directory. The respective Makefile.am files have been
-        updated as well.
-
-# 500 : NSTimer doesn't have ostream& operator<<
-        Made operator<< public. Added functions getElapsed and getCount
-
-# 538 : Add alignment control to BlobField
-        Added alignment argument to BlobField, BlobString and BlobArray
-        functions.  Changed BlobArray such that alignment > 8 bytes is
-        possible.
-
-# 548 : Interupted accept call on socket is not repeated
-        If the accept call returns EWOULDBLOCK, EAGAIN or EINTR the call is
-        repeated.
-
-# 556 : move blob to Blob
-        Blob code moved to a separate package
-
-# 557 : Remove all deprecated stuff
-        The following stuff is deprecated and has been removed: Debug,
-        Profiling, Thread and Blitz and some backward compatibility stuff
-        (e.g. Net/backward).
-
-# 596 : Remove all occurrences of nobase_ from all Makefile.am files
-        Reason for banning the use of nobase_ is that automake will use
-        install-sh instead of /usr/bin/install when installing nobase_ header
-        files. Because install-sh does not support the -C option, the header
-        files will always be copied to the installation directory, even if
-        they haven't been modified. This will trigger a lot of useless
-        compilations of dependent sources.
-
-# 602 : Bit order incorrect in dataConvert
-        The order of the bits in a byte should be swapped when converting
-        to/from bools to make it the same as AIPS++.
-
-
-
-LCS/Common: Version 2.4, date: 2005/11/16
-=========================================
-
-In preparation of making package distributable as rpm package, all header
-files that must be installed have been moved from the `src' directory to the
-`inclucde/<package>' directory (ref. BugID #396).
-
-Furthermore, some changes to the build environment require the use of
-autoconf_share 2.4 (or later). 
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 331 : make includefiles for boost.
-        Added lofar_*.h files for Boost.Date_Time and Boost.Threads.
-
-# 394 : Update documentation
-        General updates to the Doxygen documentation, e.g., add missing
-        Doxygen tags like \ingroup, \defgroup, and \addtogroup.
-
-# 407 : lofar_datetime.h is not installed after "make install"
-        Added lofar_datetime.h to Makefile.am
-
-# 422 : Reading back AIPS++ array fails
-        Reading back an AIPS++ array from a blob gives an invalid IPosition
-        exception.
-
-# 472 : ::shutdown() not implemented in BG/L
-        The shutdown socket syscall is not implemented on Blue Gene/L. This is
-        not critical, since a shutdown() is often followed by a close(), but
-        it currently fills stderr with non-fatal failure messages. I propose
-        having Socket::shutdown() always succeed on Blue Gene/L (I'll attach a
-        patch shortly).
-
-# 488 : ALLOC_TRACER_ALIAS does not work correctly without log4cplus
-        There is a difference in the implementation of ALLOC_TRACER_ALIAS
-        between LofarLogCout and LofarLog4Cplus. The method getLogger is
-        public for Log4Cplus. For LogCout it is not defined if it is public,
-        private or protected.
-
-
-
-LCS/Common: Version 2.3, date: 2005/09/02
-=========================================
-
-The following BugIDs have been resolved
----------------------------------------
-
-#  51 : Profile the BBS code and optimize as much as possible
-
-        Added multi-threading support for i386 and x86_64 in Timer class.
-
-# 173 : Deprecate Thread and Profiling in LCS
-
-        Marked Thread.h and PerfProfile.h as deprecated.
-
-# 225 : update polyphase filter
-
-        Added timer support for PowerPC/BlueGene and PowerPC/Linux 
-        with xlC and g++
-
-
-# 239 : Add support for floating point comparison
-
-        First pretty rough version of some numeric functions, e.g. floating
-        point comparison using a "distance" measure.
-
-
-# 270 : integration of TFlopCorrelator parts
-
-        Added check to see if system call was interupted in Socket.cc
-
-
-The following Enhancement Requests have been implemented
---------------------------------------------------------
-
-ER  70 : autoconf_share        : Track external dependencies
-
-         clog cannot be used with PVSS
-
-ER 161 : Common                : Place code in namespace LOFAR
-
-         Added missing clog declaration.
-
-ER 247 : Common                : Use builtin complex 
-
-         Fixed collision between std::clog and clog()
-
-ER 285 : ACC                   : Extend ACC with array support
-
-         Upgrade ACC 1.0 to 1.1 ParameterSet is now in ACC/APS.  
-         ProceControl is now in ACC/PLC.  
-         ParameterSet getInt changed to getInt32.
-
-
-
-LCS/Common: Version 2.2, date: 2005/06/15
-=========================================
-
-
-The following Enhancement Requests have been implemented
---------------------------------------------------------
-
-ER 220 : Build environment     : Compile on 64 bit machine 
-
-         Code has been modified in order to compiler properly on 64 bit
-         machines, like AMD Opterons.
-
-ER 236 : LOFAR SW development  : preparations for Package documentation 
-
-         The documentation of each LOFAR package should be put into a separate
-         Doxygen group (or module). This makes the documentation more
-         accessible and offers a way to quickly browse to different packages.
-         Preparations have been made for several packages, including
-         LCS/Common.
-
-ER 247 : Common                : Use builtin complex 
-
-         The GNU compiler suite comes with a builtin complex type. Whenever
-         possible this builtin type will be used, because performance almost
-         triples compared to the std::complex type.
-
-ER 252 : Build environment     : Add 'limit exec' to runtest.sh
-
-         Some test programs occasionally "hang" waiting for a mutex lock, or
-         in a blocking I/O operation. In order to not hamper a (system) build
-         these suspicious programs should be killed after a predefined
-         run-time. This feature has been added to runtest.sh /
-         assay. Currently, it will not work when a .run file is used.
-
-
-The following Problem Reports have been fixed
----------------------------------------------
-
-PR 100 : LOFAR SW development  : Neither config.h nor lofar_config.h should
-                                 be included in header files
-
-         Inclusion of either config.h or lofar_config.h in a distributed
-         header file is problematic, because the config files themselves
-         cannot be distributed; they contain system specific definitions. It
-         is therefore unwise to include either of these files in a header
-         file.
-
-         Note: This Problem Report is closely related to Enhancement Request
-               ER 229.
diff --git a/LCS/Common/bootstrap b/LCS/Common/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/Common/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/Common/config.h.cmake b/LCS/Common/config.h.cmake
deleted file mode 100644
index 291391d8a4d65b37c4106c5acf9179c3da64bbd6..0000000000000000000000000000000000000000
--- a/LCS/Common/config.h.cmake
+++ /dev/null
@@ -1,148 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-#cmakedefine AC_APPLE_UNIVERSAL_BUILD 1
-
-/* Define as __PRETTY_FUNCTION__, __FUNCTION__, or "<unknown>" */
-#cmakedefine AUTO_FUNCTION_NAME 1
-
-/* Define if DbgAssert is enabled */
-#cmakedefine ENABLE_DBGASSERT 1
-
-/* Define if TRACER is enabled */
-#cmakedefine ENABLE_TRACER 1
-
-/* Define if backtrace() is available */
-#cmakedefine HAVE_BACKTRACE 1
-
-/* Define if libbfd is available */
-#cmakedefine HAVE_BFD 1
-
-/* Define if MPICH is installed */
-#cmakedefine HAVE_BGLMPICH 1
-
-/* Define if BOOST is installed */
-#cmakedefine HAVE_BOOST 1
-
-/* Define to 1 if you have the `cplus_demangle' function. */
-#cmakedefine HAVE_CPLUS_DEMANGLE 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#cmakedefine HAVE_DLFCN_H 1
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#cmakedefine HAVE_DOPRNT 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H 1
-
-/* Define if LAM is installed */
-#cmakedefine HAVE_LAM 1
-
-/* Define if LOG4CPLUS is installed */
-#cmakedefine HAVE_LOG4CPLUS 1
-
-/* Define if LOG4CXX is installed */
-#cmakedefine HAVE_LOG4CXX 1
-
-/* Define if `long long' is supported */
-#cmakedefine HAVE_LONG_LONG 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine HAVE_MEMORY_H 1
-
-/* Define if we have an MPI implementation installed */
-#cmakedefine HAVE_MPI 1
-
-/* Define if MPICH is installed */
-#cmakedefine HAVE_MPICH 1
-
-/* Define if MPI profiler should be enabled */
-#cmakedefine HAVE_MPI_PROFILER 1
-
-/* Define if using Rational Purify */
-#cmakedefine HAVE_PURIFY 1
-
-/* Define if ScaMPI is installed */
-#cmakedefine HAVE_SCAMPI 1
-
-/* Defined if shared memory is used */
-#cmakedefine HAVE_SHMEM 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-/* Define if TOOLS is installed */
-#cmakedefine HAVE_TOOLS 1
-
-/* Define if `uint' is supported */
-#cmakedefine HAVE_UINT 1
-
-/* Define if `ulong' is supported */
-#cmakedefine HAVE_ULONG 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H 1
-
-/* Define if `ushort' is supported */
-#cmakedefine HAVE_USHORT 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#cmakedefine HAVE_VPRINTF 1
-
-/* Define if we are compiling with debugging information */
-#cmakedefine LOFAR_DEBUG 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#cmakedefine LT_OBJDIR 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT 1
-
-/* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME 1
-
-/* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING 1
-
-/* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME 1
-
-/* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION 1
-
-/* Define RPM release nr */
-#cmakedefine RPM_RELEASE 1
-
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine STDC_HEADERS 1
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#cmakedefine WORDS_BIGENDIAN 1
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-#cmakedefine YYTEXT_POINTER 1
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#cmakedefine const 1
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#cmakedefine size_t 1
diff --git a/LCS/Common/configure.in b/LCS/Common/configure.in
deleted file mode 100644
index 5db09eab63a25c587345be7c15f54e8cc812839b..0000000000000000000000000000000000000000
--- a/LCS/Common/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Common, 3.3, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR general things
-dnl
-lofar_GENERAL
-lofar_MPI
-lofar_INTERNAL(LCS/Tools,Tools,,,,"")
-lofar_EXTERNAL(boost,1,boost/config.hpp,"")
-lofar_EXTERNAL(readline,0,readline/readline.h,,,,,,"-lncurses")
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/Common/Makefile
-include/Common/shmem/Makefile
-src/Makefile
-src/shmem/Makefile
-test/Makefile
-Makefile
-Common.spec
-)
diff --git a/LCS/Common/include/Common/Makefile.am b/LCS/Common/include/Common/Makefile.am
deleted file mode 100644
index ea27a84d65a6b40d77705e7f42b3ee8160dc6ee8..0000000000000000000000000000000000000000
--- a/LCS/Common/include/Common/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-if HAVE_SHMEM
-SUBDIRS	= shmem .
-endif
-
-if USE_BACKTRACE
-backtrace_HDRS = AddressTranslator.h SymbolTable.h
-endif
-
-pkginclude_Netdir = $(pkgincludedir)/Net
-
-pkginclude_HEADERS = Package__Version.h  \
-	Allocator.h \
-	Backtrace.h \
-	CheckConfig.h \
-	ComplexBuiltinFP.h \
-	ComplexBuiltinInt.h \
-	ComplexC99.h \
-	ComplexStdFP.h \
-	ComplexStdInt.h \
-	DataConvert.h \
-	DataFormat.h \
-	Exception.h \
-	Exceptions.h \
-	FileLocator.h \
-	hexdump.h \
-	i4complex.h \
-	KVpair.h \
-	lofar_algorithm.h \
-	lofar_bitset.h \
-	LofarConstants.h \
-	lofar_complex.h \
-	lofar_datetime.h \
-	lofar_deque.h \
-	lofar_fstream.h \
-	lofar_iomanip.h \
-	lofar_iosfwd.h \
-	lofar_iostream.h \
-	lofar_list.h \
-	LofarLocators.h \
-	LofarLog4Cplus.h \
-	LofarLog4Cxx.h \
-	LofarLogCout.h \
-	LofarLogger.h \
-	lofar_map.h \
-	lofar_math.h \
-	lofar_numeric.h \
-	lofar_set.h \
-	lofar_smartptr.h \
-	lofar_sstream.h \
-	lofar_stack.h \
-	lofar_string.h \
-	lofar_thread.h \
-	lofar_tribool.h \
-	lofar_typeinfo.h \
-	LofarTypedefs.h \
-	LofarTypes.h \
-	lofar_vector.h \
-	Numeric.h \
-	ObjectFactory.h \
-	ParameterValue.h \
-	ParameterSet.h \
-	ParameterSetImpl.h \
-	PrettyUnits.h \
-	Process.h \
-	ReadLine.h \
-	RunOnNode.h \
-	Semaphore.h \
-	Singleton.h \
-	Stopwatch.h \
-	StreamUtil.h \
-	StringUtil.h \
-	SystemUtil.h \
-	Timer.h \
-	TypeNames.h \
-	TypeNames.tcc \
-	Version.h 
-
-pkginclude_Net_HEADERS = \
-	Net/FdSet.h \
-	Net/Socket.h 
-
-noinst_HEADERS = $(backtrace_HDRS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Common/include/Common/shmem/Makefile.am b/LCS/Common/include/Common/shmem/Makefile.am
deleted file mode 100644
index ab4ee3501cbaceece6f77ad7f6f7e3d5f19cca53..0000000000000000000000000000000000000000
--- a/LCS/Common/include/Common/shmem/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-pkginclude_shmemdir = $(pkgincludedir)/shmem
-
-pkginclude_shmem_HEADERS = \
-	segbasemap.h	\
-	dlmalloc.h	\
-	shmem_alloc.h
-
-noinst_HEADERS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Common/include/Makefile.am b/LCS/Common/include/Makefile.am
deleted file mode 100644
index a5dee49bc72e41939cb74836ed876b7614b14481..0000000000000000000000000000000000000000
--- a/LCS/Common/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= Common
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Common/src/Makefile.am b/LCS/Common/src/Makefile.am
deleted file mode 100644
index eccb0900099019be086a3aa82dc20c7aef67806c..0000000000000000000000000000000000000000
--- a/LCS/Common/src/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-if HAVE_SHMEM
-SUBDIRS	= shmem .
-endif
-
-if USE_BACKTRACE
-backtrace_SRCS = AddressTranslator.cc Backtrace.cc SymbolTable.cc
-endif
-
-lib_LTLIBRARIES 	= libcommon.la
-
-libcommon_la_SOURCES 	= Package__Version.cc \
-	Allocator.cc \
-	DataConvert.cc \
-	Exception.cc \
-	FileLocator.cc \
-	hexdump.cc \
-	KVpair.cc \
-	lofar_bitset.cc \
-	LofarLogCout.cc \
-	LofarLogger.cc \
-	Numeric.cc \
-	ParameterSet.cc \
-	ParameterSetImpl.cc \
-	ParameterValue.cc \
-	PrettyUnits.cc \
-	Process.cc \
-	ReadLine.cc \
-	RunOnNode.cc \
-	Stopwatch.cc \
-	StreamUtil.cc \
-	StringUtil.cc \
-	SystemUtil.cc \
-	Timer.cc \
-	TypeNames.cc \
-	Version.cc \
-	Net/FdSet.cc \
-	Net/Socket.cc
-
-libcommon_la_SOURCES	+= $(backtrace_SRCS)
-
-if HAVE_SHMEM
-libcommon_la_LIBADD	= shmem/libshmem.la
-endif
-
-bin_PROGRAMS = versioncommon getparsetvalue
-
-versioncommon_SOURCES      = versioncommon.cc
-versioncommon_LDADD        = libcommon.la
-versioncommon_DEPENDENCIES = libcommon.la $(LOFAR_DEPEND)
-
-getparsetvalue_SOURCES      = getparsetvalue.cc
-getparsetvalue_LDADD        = libcommon.la
-getparsetvalue_DEPENDENCIES = libcommon.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Common/src/shmem/Makefile.am b/LCS/Common/src/shmem/Makefile.am
deleted file mode 100644
index fa7fe72ae65ea730715b16b2cf6c888fdf3238ae..0000000000000000000000000000000000000000
--- a/LCS/Common/src/shmem/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# automake specification for TH_ShMem transport.
-#
-
-# Definition of target library
-lib_LTLIBRARIES = \
-	libshmem.la
-
-AM_CPPFLAGS = \
-	-DUSE_PUBLIC_MALLOC_WRAPPERS \
-	-DUSE_DL_PREFIX \
-	-DHAVE_MMAP=0 \
-	-DMORECORE=shmbrk \
-	-DMORECORE_CONTIGUOUS=0 \
-	-DMORECORE_CANNOT_TRIM=1 \
-	-DSHMEM_ALLOC \
-	-DHAVE_USR_INCLUDE_MALLOC_H 
-
-libshmem_la_SOURCES = 				\
-	$(DOCHDRS)				\
-	segbasemap.cc				\
-	dlmalloc.c				\
-	shmem_alloc.cc
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Common/test/Makefile.am b/LCS/Common/test/Makefile.am
deleted file mode 100644
index 8f648ab81afcdfb9826fe16d03981178ecc24b5b..0000000000000000000000000000000000000000
--- a/LCS/Common/test/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-# programs to run through supplied checktools
-CHECKTOOLPROGS	=	testLogger tAllocator tDataConvert tTypeNames \
-			tFileLocator tStringUtil tStreamUtil \
-			tHexdump testSocket tComplex tProcess \
-			tRunOnNode tTimer tNumeric tSingleton \
-			tObjectFactory tSystemUtil tSaxpy tPrettyUnits \
-			tParameterValue tParameterSet tParameterSetPerf \
-			tBacktrace tReadLine
-
-check_PROGRAMS	=	$(CHECKTOOLPROGS)
-
-TESTSCRIPTS	= 	testLogger.sh tAllocator.sh tDataConvert.sh tTypeNames.sh \
-			tFileLocator.sh tStringUtil.sh tStreamUtil.sh \
-			tHexdump.sh testSocket.sh tComplex.sh tProcess.sh \
-			tRunOnNode.sh tTimer.sh tNumeric.sh tSingleton.sh \
-			tObjectFactory.sh tPrettyUnits.sh \
-			tParameterValue.sh tParameterSet.sh \
-			tParameterSetPerf.sh tgetparsetvalue.sh \
-			tReadLine.sh
-
-TESTS		=	$(TESTSCRIPTS)
-
-EXTRA_DIST	=	$(TESTSCRIPTS) \
-			testLogger.log_prop testLogger.debug \
-			testLogger.in_log4cxx.log_prop \
-			tDataConvert.stdout \
-			tStringUtil.stdout \
-			tStreamUtil.stdout \
-			tHexdump.log_prop tHexdump.run tHexdump.stdout \
-			testSocket.run \
-			tComplex.stdout \
-			tProcess.log_prop tProcess.run tProcess.stdout \
-			tRunOnNode.log_prop tRunOnNode.stdout \
-			tNumeric.run tNumeric.stdout \
-			tObjectFactory.stdout tPrettyUnits.stdout \
-			tParameterSet.in_merge_nocase \
-			tParameterSet.in_merge_normal \
-			tParameterSet.in_param_nocase \
-			tParameterSet.in_param_normal \
-			tParameterSet.stdout \
-			tParameterSetPerf.run \
-			tgetparsetvalue.parset \
-			tgetparsetvalue.run \
-			tgetparsetvalue.stdout \
-			tReadLine.run tReadLine.in tReadLine.stdout
-
-testLogger_SOURCES		= testLogger.cc
-tAllocator_SOURCES		= tAllocator.cc
-tDataConvert_SOURCES		= tDataConvert.cc
-tTypeNames_SOURCES		= tTypeNames.cc
-tFileLocator_SOURCES		= tFileLocator.cc
-tStringUtil_SOURCES		= tStringUtil.cc
-tStreamUtil_SOURCES		= tStreamUtil.cc
-tHexdump_SOURCES		= tHexdump.cc
-testSocket_SOURCES		= testSocket.cc
-tComplex_SOURCES		= tComplex.cc
-tProcess_SOURCES		= tProcess.cc
-tRunOnNode_SOURCES		= tRunOnNode.cc
-tTimer_SOURCES			= tTimer.cc
-tNumeric_SOURCES		= tNumeric.cc
-tSingleton_SOURCES		= tSingleton.cc
-tObjectFactory_SOURCES		= tObjectFactory.cc \
-				  Shapes.h Shapes.cc \
-				  Coordinates.h Coordinates.cc
-tSystemUtil_SOURCES		= tSystemUtil.cc
-tSaxpy_SOURCES			= tSaxpy.cc
-tPrettyUnits_SOURCES		= tPrettyUnits.cc
-tBacktrace_SOURCES		= tBacktrace.cc
-tParameterValue_SOURCES		= tParameterValue.cc
-tParameterSet_SOURCES		= tParameterSet.cc
-tParameterSetPerf_SOURCES	= tParameterSetPerf.cc
-tReadLine_SOURCES		= tReadLine.cc
-
-LDADD				= ../src/libcommon.la
-DEPENDENCIES			= ../src/libcommon.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Stream/Makefile.am b/LCS/Stream/Makefile.am
deleted file mode 100644
index 55d7566e80b59f93541b599cae1e1d36f6ba5c6c..0000000000000000000000000000000000000000
--- a/LCS/Stream/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix) \
-      --with-blob=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      Stream.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Stream/Stream.spec.in b/LCS/Stream/Stream.spec.in
deleted file mode 100644
index ebe7010f2c631952c663d70b4de1affe42aa75a9..0000000000000000000000000000000000000000
--- a/LCS/Stream/Stream.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Transport.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Transport is the common LOFAR software package handling the transport of node in various ways (Socket, MPI, shared memory).
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 3.0
-Requires: Blob >= 1.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Transport is the package handling the data transport in LOFAR.
-In a transparant way it handles the data transport over sockets, MPI,
-shared memory, etc..
-In a 'derived' package TransportPL it can also handle data transport
-via a database (using the LCS/databases/PL package).
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/Stream/bootstrap b/LCS/Stream/bootstrap
deleted file mode 100755
index 0e2ea4eaa84e50d11ae6299f3a2285936340baeb..0000000000000000000000000000000000000000
--- a/LCS/Stream/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
\ No newline at end of file
diff --git a/LCS/Stream/configure.in b/LCS/Stream/configure.in
deleted file mode 100644
index 6541ee32d17797398243109f78f612a0f1615ba7..0000000000000000000000000000000000000000
--- a/LCS/Stream/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Stream, 0.1, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/Stream/Makefile
-src/Makefile
-test/Makefile
-Makefile
-Stream.spec
-)
diff --git a/LCS/Stream/include/Makefile.am b/LCS/Stream/include/Makefile.am
deleted file mode 100644
index 208e19f5fcc9baffb8717ebf4384958bda34b47c..0000000000000000000000000000000000000000
--- a/LCS/Stream/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= Stream
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Stream/include/Stream/Makefile.am b/LCS/Stream/include/Stream/Makefile.am
deleted file mode 100644
index 33f43d60d1f989b61e7a45c3962c2b89ef5a446f..0000000000000000000000000000000000000000
--- a/LCS/Stream/include/Stream/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	FileDescriptorBasedStream.h \
-	FileStream.h \
-	NullStream.h \
-	SocketStream.h \
-	Stream.h \
-	SystemCallException.h
-
-noinst_HEADERS = 
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/Stream/src/Makefile.am b/LCS/Stream/src/Makefile.am
deleted file mode 100644
index 5b0d3288203e4cc0121441068b88aca31255bbd5..0000000000000000000000000000000000000000
--- a/LCS/Stream/src/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-lib_LTLIBRARIES			= libstream.la 
-
-libstream_la_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-libstream_la_SOURCES		= Package__Version.cc  \
-	FileDescriptorBasedStream.cc \
-	FileStream.cc \
-	NullStream.cc \
-	SocketStream.cc \
-	Stream.cc \
-	SystemCallException.cc
-
-bin_PROGRAMS = versionstream
-
-versionstream_SOURCES      = versionstream.cc
-versionstream_LDADD        = libstream.la
-versionstream_DEPENDENCIES = libstream.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/Stream/test/Makefile.am b/LCS/Stream/test/Makefile.am
deleted file mode 100644
index 871d914767cbe6dae73f50e4ec6140bbdfd247b7..0000000000000000000000000000000000000000
--- a/LCS/Stream/test/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AM_CPPFLAGS = 
-
-CHECKTOOLPROGS		  = 
-
-check_PROGRAMS		  = 
-
-LDADD			  = ../src/libstream.la 
-DEPENDENCIES		  = ../src/libstream.la $(LOFAR_DEPEND)
-
-TESTSCRIPTS =
-
-TESTS = $(TESTSCRIPTS)
-
-
-EXTRA_DIST =
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Tools/AUTHORS b/LCS/Tools/AUTHORS
deleted file mode 100644
index 5e6fc5b63bb5582ab4791c93623a2c42d620126e..0000000000000000000000000000000000000000
--- a/LCS/Tools/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Marcel Loose            <loose@astron.nl>
-
-
-Contributors:
-============
-
-        Arthur Coolen           <coolen@astron.nl>
-        Ger van Diepen          <diepen@astron.nl>
diff --git a/LCS/Tools/COPYING b/LCS/Tools/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/LCS/Tools/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LCS/Tools/ChangeLog b/LCS/Tools/ChangeLog
deleted file mode 100644
index effb252ce40d31ee846fc172b0a4714113e7d724..0000000000000000000000000000000000000000
--- a/LCS/Tools/ChangeLog
+++ /dev/null
@@ -1,459 +0,0 @@
-2006-01-18 11:57  loose
-
-	* src/Makefile.am: BugID: 596
-
-	  Removed any references to nobase_. Removed unused "local"
-	  variables.
-
-2006-01-02 11:03  loose
-
-	* src/makedoc: BugID: 423
-
-	  Added OUTPUT_DIRECTORY to the generated doxygen.cfg file, so
-	  that, if doxygen is run (again) directly using the doxygen.cfg
-	  config file, the generated files will end up in the same
-	  directory as before (when using makedoc).
-
-2005-12-27 11:02  loose
-
-	* src/templates/: header.h_template, templated_header.h_template:
-	  BugID: 394
-
-	  Removed argument to the Doxygen \file command. It caused subtle
-	  documentation bugs and it defaults to the current filename
-	  anyway.
-
-2005-12-15 11:05  loose
-
-	* src/makedoc: BugID: 423
-
-	  Added a few keywords with doxygen runtime specific settings (e.g.
-	  IMAGE_PATH).	Removed a few keywords with static settings (e.g.
-	  RECURSIVE); these will be added to doxygen.cfg in the
-	  autoconf_share directory.
-
-2005-12-13 16:31  diepen
-
-	* src/: makeClass.py, templates/header.cc_template,
-	  templates/header.h_template,
-	  templates/templated_header.cc_template,
-	  templates/templated_header.h_template,
-	  templates/templated_header.tcc_template: BugID: 528 Put templated
-	  class code in template file Added _ in include guard Check
-	  correctly on existence of class
-
-2005-11-22 09:37  loose
-
-	* AUTHORS, ChangeLog, NEWS, README, configure.in: BugID: 324
-
-	  Merged relevant changes in release 1.2 with the main development
-	  line.
-
-2005-11-18 17:58  loose
-
-	* NEWS: BugID: 324
-
-	  Added extra release info for release 1.2
-
-2005-11-16 16:05  loose
-
-	* AUTHORS, ChangeLog, NEWS, README, configure.in: BugID: 324
-
-	  Prepare for release 1.2
-
-2005-10-31 09:18  diepen
-
-	* src/lofarinit.sh: BugID: 396 Clean up temporary variables
-
-2005-10-26 15:19  diepen
-
-	* src/lofarinit.sh: BugID: 396 Check if new LOFARROOT is valid
-
-2005-10-24 16:18  diepen
-
-	* src/: Makefile.am, makedep.sh: BugID: 455 Moved finddep from
-	  autoconf_share to LCS/Tools
-
-2005-10-24 16:14  cvs
-
-	* src/finddep: %lofarcvsmv%: Moved from LOFAR/autoconf_share,
-	  creating new revision
-
-2005-10-24 14:54  diepen
-
-	* src/makedep.sh: BugID: 455 Improved searching pkgdep
-
-2005-10-24 14:21  lofar
-
-	* src/makePackage.py: BugID: 271 package.doc files renamed to
-	  package.dox
-
-2005-10-18 13:22  diepen
-
-	* src/: Makefile.am, makedep.sh, remote_lofarcvsmv: BugID: 455
-	  Install makedep.sh Run pkgdep from Tools instead of Common if it
-	  cannot be found
-
-2005-10-14 10:03  diepen
-
-	* src/makeClass.py: BugID: 396 Create .h and .tcc files in include
-	  directory if present
-
-2005-10-13 15:21  diepen
-
-	* src/lofarcvsmv: BugID: 396 First do ssh-add if needed
-
-2005-10-13 11:46  diepen
-
-	* src/makedoc: BugID: 445 Use directory doc/html and rename if
-	  existing Added option to specify target directory Try to find
-	  doxygen path in variants file Use standard doxygen.cfg from
-	  autoconf_share
-
-2005-10-07 13:55  diepen
-
-	* src/finddep: BugID: 396 Ignore lofar_GENERAL lines
-
-2005-10-07 13:52  diepen
-
-	* src/pkgdep.cc: BugID: 429 Check if depth>50
-
-2005-10-07 08:51  diepen
-
-	* src/: Makefile.am, makePackage.py,
-	  templates/include_makefile.am_template,
-	  templates/include_pkg_makefile.am_template,
-	  templates/package_spec.in_template,
-	  templates/src_makefile.am_template,
-	  templates/test_makefile.am_template: BugID: 396 Changed all
-	  templates for new structure Added templates for
-	  include/Makefile.am, include/PKG/Makefile.am, PKG.spec.in
-
-2005-10-04 15:31  diepen
-
-	* src/templates/: package_configure.in_template,
-	  package_makefile.am_template, src_makefile.am_template,
-	  test_makefile.am_template: BugID: 396 Changed templates for the
-	  new build structure
-
-2005-10-04 11:57  diepen
-
-	* Tools.spec.in: BugID: 396 New file for rpm build
-
-2005-10-04 11:56  diepen
-
-	* Makefile.am, configure.in: BugID: 396 Added EXTRA_DIST for
-	  distcheck
-
-2005-10-04 11:42  diepen
-
-	* Makefile.am, src/Makefile.am, test/Makefile.am: BugId: 396 Use
-	  $(top_srcdir)/Makefile.common
-
-2005-10-04 11:40  diepen
-
-	* configure.in: BugId: 396 Use lofar_GENERAL
-
-2005-10-04 09:46  diepen
-
-	* src/Makefile.am: BugID: 424 Remove the .tmp files during the
-	  install and added a uninstall-local target.
-
-2005-10-04 09:08  diepen
-
-	* src/makedoc: BugID: 423 Create class documentation using doxygen
-
-2005-10-03 16:06  cvs
-
-	* src/makedep.sh: %lofarcvsmv%: Moved from LOFAR/autoconf_share,
-	  creating new revision
-
-2005-10-03 13:33  loose
-
-	* src/Makefile.am: BugID: 420
-
-	  Moved pkgdep.cc from LCS/Common to LCS/Tools.
-
-2005-10-03 12:40  cvs
-
-	* src/pkgdep.cc: %lofarcvsmv%: Moved from LOFAR/LCS/Common/src,
-	  creating new revision
-
-2005-09-20 11:41  diepen
-
-	* src/remote_lofarcvsmv: BugID: 350 Keep protections of moved files
-
-2005-09-20 10:48  diepen
-
-	* src/: lofarcvsmv, lofarcvsx: BugID: 350 Make it operational by
-	  sending command to cvs.astron.nl
-
-2005-09-14 12:01  diepen
-
-	* src/Makefile.am: BugID: 350 Added lofarcvsmv and lofarcvsx
-
-2005-09-13 12:17  diepen
-
-	* src/lofarcvsx: BugID: 350 Possibility to set or clear x-bit of a
-	  file
-
-2005-09-13 12:05  diepen
-
-	* src/remote_lofarcvsmv: BugID: 350 Added setx and clearx commands
-
-2005-09-13 11:09  diepen
-
-	* src/: lofarcvsmv, remote_lofarcvsmv: BugID: 350 Made it more
-	  robust.
-
-2005-09-12 14:40  diepen
-
-	* src/lofarcvsmv: BugID: 350 Added omitted quote
-
-2005-09-12 14:33  diepen
-
-	* src/: lofarcvsmv, remote_lofarcvsmv: BugID: 350 First version.
-
-2005-07-20 12:52  coolen
-
-	* src/: lofarinit.csh, lofarinit.sh: BugID:193
-
-	  Solved
-
-2005-07-06 14:43  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in:
-	  %[ER: 0]%
-
-	  Merged relevant changes from the 1.0 release branch into the main
-	  development line.
-
-2005-06-24 15:42  lofar
-
-	* configure.in: changed lofar_INTERNAL entry
-
-2005-06-13 16:29  loose
-
-	* src/: LimitExec.c, LimitExec.cc, Makefile.am: %[ER: 252]%
-
-	  Undid rename. For some obscure reason the IBM/XLC C compiler
-	  chokes on the code, whereas the C++ compiler does not.
-
-2005-06-10 12:24  loose
-
-	* src/: LimitExec.c, LimitExec.cc, Makefile.am: %[ER: 252]%
-
-	  Renamed LimitExec.cc to LimitExec.c, so that it is now compiled
-	  by gcc instead of g++; this reduces the runtime dependencies on
-	  shared object libraries.
-
-2005-06-09 17:40  loose
-
-	* src/LimitExec.cc: %[ER: 252]%
-
-	  Improved diagnostics when program was terminated by a signal
-	  (e.g. SEGV).	Some minor code changes.
-
-2005-06-09 15:39  loose
-
-	* src/: LimitExec.cc, Makefile.am: %[ER: 252]%
-
-	  Moved LimitExec.cc from LCS/Common to LCS/Tools.
-
-2005-05-27 17:03  coolen
-
-	* configure.in: %[ER: 273]%
-
-	  Changed lofar_PACKAGE into lofar_INTERNAL.
-
-2005-05-04 18:02  loose
-
-	* src/makeClass.py: %[ER: 241]%
-
-	  Fixed bug in bug fix (which should have fixed problem with wrong
-	  insertion of backslash after "=")
-
-2005-05-04 17:20  loose
-
-	* src/templates/package_bootstrap_template: %[ER: 241]%
-
-	  Fixed bug in bootstrap template.
-
-2005-05-04 17:19  loose
-
-	* src/makePackage.py: %[ER: 241]%
-
-	  Set the executable bits of the generated bootstrap file.
-
-2005-04-13 16:33  loose
-
-	* src/pkgdep.cc: %[PR: 100]%
-
-	  Removed #include <config.h> and #include <lofar_config.h> from
-	  header files (*.h and *.tcc). Added #include <lofar_config.h> to
-	  source files (*.cc).
-
-2005-04-08 13:31  lofar
-
-	* src/makeClass.py: %[ER:71 ]% if Makefile contained INSTHDRS = \
-	  the script went wrong with insertions solved now.
-
-2005-04-08 12:54  loose
-
-	* src/lofarinit.csh: %[ER: 253]%
-
-	  Added check for valid $a_root. Fixed bug when cd is an alias.
-
-2005-04-08 12:46  diepen
-
-	* src/lofarinit.sh: %[ER: 253]% Check if root directory exists
-
-2005-04-08 12:30  diepen
-
-	* src/lofarinit.csh: %[ER: 253]% Fixed little bug
-
-2005-04-08 12:23  diepen
-
-	* src/: lofarinit.csh, lofarinit.sh: %[ER: 253]% Use LOFARROOT
-	  instead of LOFARPATH
-
-2005-04-08 09:48  diepen
-
-	* src/: Makefile.am, lofarinit.csh, lofarinit.sh: %[ER: 253]%
-	  Improved comments
-
-2005-04-08 09:03  diepen
-
-	* src/: lofarinit.csh, lofarinit.sh: %[ER: 253]% Also try to strip
-	  new LOFARPATH
-
-2005-04-08 08:33  diepen
-
-	* src/: Makefile.am, lofarinit.csh, lofarinit.sh: %[ER: 253]% Added
-	  lofarinit.sh and .csh
-
-2005-02-25 14:51  lofar
-
-	* test/Makefile.am: %[ER: 71]% another bunch of required files for
-	  Tools
-
-2005-02-25 13:58  coolen
-
-	* Makefile.am, bootstrap, configure.in: added all buildfiles for
-	  this new package
-
-2005-02-25 13:50  coolen
-
-	* src/Makefile.am: New Makefile to handle the tools in LOFAR/LCS
-
-2005-02-25 12:04  lofar
-
-	* src/pkgdep.cc: %[ER: 71]% placed all needed images in their own
-	  image directory, so had to change the references to them.
-
-2005-02-22 09:34  diepen
-
-	* src/finddep: %[ER: 70]% Use -e before file name in sed command
-
-2005-02-21 16:30  coolen
-
-	* src/: makeClass.py, makePackage.py, makeTest.py,
-	  templates/header.cc_template, templates/header.h_template,
-	  templates/main.cc_template, templates/package_bootstrap_template,
-	  templates/package_configure.in_template,
-	  templates/package_lofarconf.in_template,
-	  templates/package_makefile.am_template,
-	  templates/src_makefile.am_template,
-	  templates/templated_header.cc_template,
-	  templates/templated_header.h_template,
-	  templates/templated_header.tcc_template,
-	  templates/test.cc_template, templates/test.in_template,
-	  templates/test.out_template, templates/test.sh_template,
-	  templates/test_makefile.am_template: %[ER: 241]% created Tools
-	  directory and added make* python scripts + templates
-
-2005-02-18 16:50  lofar
-
-	* src/pkgdep.cc: %[ER: 71]% changed place where images can be found
-
-2005-02-18 16:28  lofar
-
-	* src/makedep.sh: %[ER: 71]% added scriptsdirectory for php scripts
-
-2005-01-27 09:21  loose
-
-	* src/makedep.sh: %[ER: 30]%
-
-	  * Added standard header and, more importantly, #!/bin/sh line.  *
-	  Added check for existence of pkgdep program.
-
-2005-01-21 15:38  lofar
-
-	* src/makedep.sh: %[ER:71]% Script to make all package tree files
-	  and html pages that show LOFAR dependencies
-
-2005-01-21 13:24  diepen
-
-	* src/pkgdep.cc: %[ER: 207]% Fixed problem in display of flat tree
-
-2005-01-21 13:03  diepen
-
-	* src/pkgdep.cc: %[ER: 207]% Skip single parents if wanted Fixed a
-	  few little problems
-
-2005-01-20 09:36  diepen
-
-	* src/pkgdep.cc: %[ER: 207]% Improved the XHTML output
-
-2005-01-18 15:27  diepen
-
-	* src/finddep: %[ER: 221]% Add LOFAR to package tree
-
-2005-01-18 15:26  diepen
-
-	* src/pkgdep.cc: %[ER: 221]% Improved generated html pages
-
-2005-01-17 14:56  diepen
-
-	* src/pkgdep.cc: %[ER: 221]% Added header and footer for XHTML
-
-2005-01-03 09:56  diepen
-
-	* src/finddep: %[ER: 70]% Added -all files
-
-2004-12-27 16:00  diepen
-
-	* src/finddep: %[ER: 70]% Added creation of finddep.pkg (for
-	  package tree)
-
-2004-12-27 15:59  diepen
-
-	* src/pkgdep.cc: %[ER: 70]% Added a few options
-
-2004-12-24 16:02  diepen
-
-	* src/pkgdep.cc: %[ER: 70]% Added ability to write JavaScript
-	  output
-
-2004-12-24 13:26  lofar
-
-	* src/pkgdep.cc: %[ER:71 ]% removed root packages check by request
-	  of Ger van Diepen
-
-2004-11-30 11:29  diepen
-
-	* src/finddep: %[ER: 207]% Removed debug echo statement
-
-2004-11-30 10:32  diepen
-
-	* src/finddep: %[ER: 207]% Added argument to specify root directory
-
-2004-11-30 10:08  diepen
-
-	* src/finddep: %[ER: 207]% Find the packages used by other packages
-
-2004-11-30 10:06  diepen
-
-	* src/pkgdep.cc: %[ER: 207]% Program to show the package dependency
-	  tree
-
diff --git a/LCS/Tools/INSTALL b/LCS/Tools/INSTALL
deleted file mode 100644
index 502e81310af4296d3e5e9c09639cb75365d4f079..0000000000000000000000000000000000000000
--- a/LCS/Tools/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building a LOFAR package
-========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to the package root directory (i.e. LCS/Tools).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/LCS/Tools/Makefile.am b/LCS/Tools/Makefile.am
deleted file mode 100644
index a7eb63b02655458e0fadf4840277aedf0ce3cb56..0000000000000000000000000000000000000000
--- a/LCS/Tools/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      Tools.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Tools/NEWS b/LCS/Tools/NEWS
deleted file mode 100644
index 9ebb9beeca05e28f42666b18a4b417ba81cd06e0..0000000000000000000000000000000000000000
--- a/LCS/Tools/NEWS
+++ /dev/null
@@ -1,100 +0,0 @@
-LCS/Tools: Version 1.3, date: 2006/01/30
-========================================
-
-No major changes have been made to the LCS/Tools package.
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 423 : Create a makedoc script for doxygen
-        Added some fixes.
-
-# 528 : makeClass does not work correctly
-        There is a missing _ in the template for a normal .h file.
-        Furthermore the template skeletons are generated by makeClass.py
-        instead of being defined in a template file.
-        Finally the check if a class exists fails if the class is templated,
-        thus without .cc file.
-
-# 596 : Remove all occurrences of nobase_ from all Makefile.am files
-        Reason for banning the use of nobase_ is that automake will use
-        install-sh instead of /usr/bin/install when installing nobase_ header
-        files. Because install-sh does not support the -C option, the header
-        files will always be copied to the installation directory, even if
-        they haven't been modified. This will trigger a lot of useless
-        compilations of dependent sources.
-
-
-
-LCS/Tools: Version 1.2, date: 2005/11/16
-========================================
-
-In preparation of making package distributable as rpm package, all header
-files that must be installed have been moved from the `src' directory to the
-`inclucde/<package>' directory (ref. BugID #396).
-
-Furthermore, some changes to the build environment require the use of
-autoconf_share 2.4 (or later). 
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 350 : Add ability to move files in CVS 
-        Make it possible to move files in the CVS repository, while keeping
-        the CVS history.
-        `lofarcvsmv' and `lofarcvsx' have been implemented and deployed.
-
-# 420 : Move programs/scripts to derive package dependencies to LCS/Tools
-        Moved the script makedep.sh and the C++ code pkgdep.cc to the
-        LCS/Tools directory; updated Makefile.am.
-
-# 423 : Create a makedoc script for doxygen
-        A makedoc script would be very handy to build the doxygen
-        documentation.  It avoids the need to configure, build, and install
-        all software.
-        New script `makedoc' has been added.
-
-# 424 : make distcheck does not work 
-        Remove the .tmp files during the install and added a uninstall-local
-        target.
-
-# 429 : Endless recusion in finddep 
-        The result of finddep enters an endless loop which is only stopped
-        because the output file gets too large.
-
-# 445 : makedoc removes non-empty ./doc directory 
-        Use directory doc/html and rename if existing. Added option to specify
-        target directory. Try to find doxygen path in variants file. Use
-        standard doxygen.cfg from autoconf_share. Made the script more
-        flexible and robust.
-
-# 455 : makedep does not work
-        makedep.sh cannot find pkgdep anymore.  Furthermore it has to be run
-        from the src directory.
-
-
-
-LCS/Tools 1.1, 2005/09/02
-=========================
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 193:  LOFARDATAROOT should be an environment variable that can be accessed
-        by other LOFAR programs and or builds
-
-
-
-LCS/Tools 1.0, 15-06-2005
-=========================
-
-Associated Enhancement Requests and Problem Reports
----------------------------------------------------
-
-ER 241: add Tools tree
-ER 252: Add 'limit exec' to runtest.sh
-ER 253: make lofarinit
-ER 273: Change from lofar_PACKAGE to lofar_INTERNAL
-
diff --git a/LCS/Tools/Tools.spec.in b/LCS/Tools/Tools.spec.in
deleted file mode 100644
index 3a105c613becd94c26c9de2ec2b5f1951dd03ab1..0000000000000000000000000000000000000000
--- a/LCS/Tools/Tools.spec.in
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Tools.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Tools is the LOFAR software package containing general tools
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Tools is the LOFAR software package containing general tools
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/Tools/bootstrap b/LCS/Tools/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/Tools/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/Tools/config.h.cmake b/LCS/Tools/config.h.cmake
deleted file mode 100644
index 8a6af90a2312b4eac6d37e6870c97aa6df6b0fc6..0000000000000000000000000000000000000000
--- a/LCS/Tools/config.h.cmake
+++ /dev/null
@@ -1,124 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-#cmakedefine AC_APPLE_UNIVERSAL_BUILD
-
-/* Define as __PRETTY_FUNCTION__, __FUNCTION__, or "<unknown>" */
-#cmakedefine AUTO_FUNCTION_NAME
-
-/* Define if DbgAssert is enabled */
-#cmakedefine ENABLE_DBGASSERT
-
-/* Define if TRACER is enabled */
-#cmakedefine ENABLE_TRACER
-
-/* Define if backtrace() is available */
-#cmakedefine HAVE_BACKTRACE
-
-/* Define if libbfd is available */
-#cmakedefine HAVE_BFD
-
-/* Define to 1 if you have the `cplus_demangle' function. */
-#cmakedefine HAVE_CPLUS_DEMANGLE
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#cmakedefine HAVE_DLFCN_H
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#cmakedefine HAVE_DOPRNT
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H
-
-/* Define if LOG4CPLUS is installed */
-#cmakedefine HAVE_LOG4CPLUS
-
-/* Define if LOG4CXX is installed */
-#cmakedefine HAVE_LOG4CXX
-
-/* Define if `long long' is supported */
-#cmakedefine HAVE_LONG_LONG
-
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine HAVE_MEMORY_H
-
-/* Define if using Rational Purify */
-#cmakedefine HAVE_PURIFY
-
-/* Defined if shared memory is used */
-#cmakedefine HAVE_SHMEM
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H
-
-/* Define if `uint' is supported */
-#cmakedefine HAVE_UINT
-
-/* Define if `ulong' is supported */
-#cmakedefine HAVE_ULONG
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H
-
-/* Define if `ushort' is supported */
-#cmakedefine HAVE_USHORT
-
-/* Define to 1 if you have the `vprintf' function. */
-#cmakedefine HAVE_VPRINTF
-
-/* Define if we are compiling with debugging information */
-#cmakedefine LOFAR_DEBUG
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#cmakedefine LT_OBJDIR
-
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION
-
-/* Define RPM release nr */
-#cmakedefine RPM_RELEASE
-
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine STDC_HEADERS
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#cmakedefine WORDS_BIGENDIAN
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-#cmakedefine YYTEXT_POINTER
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#cmakedefine const
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#cmakedefine size_t
diff --git a/LCS/Tools/configure.in b/LCS/Tools/configure.in
deleted file mode 100644
index 68d40f26fac3d6f73ee729a27c98fe8e776f5f7a..0000000000000000000000000000000000000000
--- a/LCS/Tools/configure.in
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Tools, 1.3, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-Tools.spec
-)
diff --git a/LCS/Tools/src/Makefile.am b/LCS/Tools/src/Makefile.am
deleted file mode 100644
index a58abb5ee45602c9feb579d22c85272631f450ae..0000000000000000000000000000000000000000
--- a/LCS/Tools/src/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-sbin_PROGRAMS     = LimitExec pkgdep
-
-LimitExec_SOURCES = LimitExec.cc
-pkgdep_SOURCES    = pkgdep.cc
-
-scriptdir = $(sbindir)
-dist_script_SCRIPTS = lofarcvsmv lofarcvsx makedep.sh finddep makedoc checkrun \
-		      fillreview makecov \
-		      countalllines countlines countpurecode countpurecodecomm
-
-glishdir = $(libexecdir)/glish
-dist_glish_SCRIPTS = 
-
-pythondir = $(sbindir)
-dist_python_SCRIPTS = makePackage.py \
-		      makeClass.py \
-                      makeTest.py \
-		      processgcov
-
-templatedir = $(datadir)/templates
-dist_template_DATA  = templates/header.cc_template \
-		      templates/header.h_template \
-		      templates/main.cc_template \
-		      templates/package_bootstrap_template \
-		      templates/package_configure.in_template \
-		      templates/package_spec.in_template \
-		      templates/package_lofarconf.in_template \
-		      templates/package_makefile.am_template \
-		      templates/include_makefile.am_template \
-		      templates/include_pkg_makefile.am_template \
-		      templates/src_makefile.am_template \
-	              templates/templated_header.cc_template \
-		      templates/templated_header.h_template \
-		      templates/templated_header.tcc_template \
-		      templates/test.cc_template \
-		      templates/test.in_template \
-		      templates/test.out_template \
-		      templates/test.sh_template \
-		      templates/test_makefile.am_template
-
-# Install lofarinit without execute permissions.
-# They have to be sourced; fill in the correct path. 
-install-data-local:
-	@for FIL in lofarinit.sh lofarinit.csh; do \
-	  sed -e "s%[@]prefix[@]%$(prefix)%" -e "s%[@]libdir[@]%$(libdir)%" $(lofar_top_srcdir)/$$FIL.in > $$FIL.tmp; \
-	  echo "$(INSTALL_DATA) $$FIL.tmp $(prefix)/$$FIL"; \
-	  $(INSTALL_DATA) $$FIL.tmp $(prefix)/$$FIL; \
-	  $(RM) $$FIL.tmp; \
-	done
-
-uninstall-local:
-	@$(RM) $(prefix)/lofarinit.sh $(prefix)/lofarinit.csh
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Tools/test/Makefile.am b/LCS/Tools/test/Makefile.am
deleted file mode 100644
index 8630aa893dd0f8344d3e53c22b6c47f7cd9af13a..0000000000000000000000000000000000000000
--- a/LCS/Tools/test/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-TESTS	              =
-
-XFAIL_TESTS           =
-
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Transport/AUTHORS b/LCS/Transport/AUTHORS
deleted file mode 100644
index 3906376cddf954794e25b5de54f7e2f4a752f9c4..0000000000000000000000000000000000000000
--- a/LCS/Transport/AUTHORS
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Ellen van Meijeren      <meijeren@astron.nl>
-
-
-Contributors:
-============
-
-        Chris Broekema          <broekema@astron.nl>
-        Arthur Coolen           <coolen@astron.nl>
-        Ger van Diepen          <diepen@astron.nl>
-        Edwin de Lang           <lang@astron.nl>
-        Marcel Loose            <loose@astron.nl>
-        Ruud Overeem            <overeem@astron.nl>
-        John Romein             <romein@astron.nl>
-        Walther Zwart           <zwart@astron.nl>
diff --git a/LCS/Transport/COPYING b/LCS/Transport/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/LCS/Transport/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LCS/Transport/ChangeLog b/LCS/Transport/ChangeLog
deleted file mode 100644
index db059603bce5691dbfe8f1052651cf39ed3d7bfb..0000000000000000000000000000000000000000
--- a/LCS/Transport/ChangeLog
+++ /dev/null
@@ -1,1069 +0,0 @@
-2006-01-18 11:45  loose
-
-	* Makefile.am, include/Transport/Makefile.am: BugID: 596
-
-	  * Removed any references to nobase_.	* Removed "local" variable
-	  INSTHDRS as it is not useful anymore.  * Added few missing
-	  --with-<package>=$(prefix) lines.
-
-2006-01-02 13:03  diepen
-
-	* Transport.spec.in, configure.in,
-	  include/Transport/DataBlobExtra.h,
-	  include/Transport/DataHolder.h, src/DataBlobExtra.cc,
-	  src/DataHolder.cc, src/TH_ShMem.cc, src/TransportHolder.cc,
-	  test/ExampleBlMem.cc, test/ExampleEthernet.cc,
-	  test/ExampleMPI.cc, test/ExampleMem.cc,
-	  test/ExampleNonBlocking.cc, test/ExampleShMem.cc,
-	  test/ExampleVarBuf.cc: BugID: 556 Blob code has been moved to a
-	  separate package
-
-2005-12-27 11:02  loose
-
-	* include/Transport/: CSConnection.h, Connection.h,
-	  ConnectionPool.h, DataBlobExtra.h, DataHolder.h, TH_Ethernet.h,
-	  TH_File.h, TH_MPI.h, TH_Mem.h, TH_Null.h, TH_ShMem.h,
-	  TH_Socket.h, TransportHolder.h: BugID: 394
-
-	  Removed argument to the Doxygen \file command. It caused subtle
-	  documentation bugs and it defaults to the current filename
-	  anyway.
-
-2005-12-16 10:06  diepen
-
-	* include/Transport/DataHolder.h, src/DataHolder.cc: BugID: 537
-	  Added alignment argument to function addField.
-
-2005-12-12 10:47  zwart
-
-	* src/TH_Ethernet.cc: BugID: 524
-
-	  Splitted init routines, changed remote and own mac to src and
-	  dest mac
-
-2005-12-12 10:45  zwart
-
-	* include/Transport/TH_Ethernet.h: BugID: 514
-
-	  Splitted init routine
-
-2005-11-30 16:38  zwart
-
-	* include/Transport/Makefile.am, include/Transport/TH_Ethernet.h,
-	  include/Transport/TH_Null.h, src/TH_Ethernet.cc: BugID: 514
-
-	  The size of the socketbuffers can be given to the constructor.
-	  They will be set during init.
-
-	  Also added TH_Null. This is useful if you do not want a
-	  connection but you do need an TH-object.
-
-2005-11-28 12:00  meijeren
-
-	* src/TH_MPI.cc: BugID:480
-
-	  Changed type.
-
-2005-11-25 10:54  romein
-
-	* src/TH_MPI.cc: BugID: 225 Use MPI_Get_count instead of reading
-	  private field (which does not work on newer mpiches).
-
-2005-11-22 09:44  loose
-
-	* ChangeLog, NEWS, configure.in: BugID: 327
-
-	  Merged relevant changes in release 2.2 with the main development
-	  line.
-
-2005-11-18 18:02  loose
-
-	* NEWS: BugID: 327
-
-	  Added extra release info for release 2.2
-
-2005-11-16 17:15  loose
-
-	* configure.in: BugID: 327
-
-	  Prepare for release 2.2
-
-2005-11-16 17:12  loose
-
-	* ChangeLog, NEWS, configure.in: BugID: 327
-
-	  Prepare for release 2.2
-
-2005-10-27 12:29  loose
-
-	* ChangeLog, NEWS, configure.in: BugID: 327
-
-	  Merged relevant changes of the 2.1 release branch into the main
-	  development line.
-
-2005-10-24 14:15  lofar
-
-	* package.doc, package.dox: BugID: 271 moved al doxygen related
-	  .doc file to .dox
-
-2005-10-07 09:30  diepen
-
-	* Transport.spec.in: BugID: 396 Transport does not depend on a
-	  specific Common version
-
-2005-10-04 14:19  diepen
-
-	* Makefile.am, Transport.spec.in, configure.in,
-	  include/Makefile.am, include/Transport/Makefile.am,
-	  src/Makefile.am, test/Makefile.am: BugID: 396 Changed files for
-	  makedistcheck and rpm
-
-2005-10-04 14:15  cvs
-
-	* src/: BaseSim.h, Connection.h, ConnectionPool.h, CSConnection.h,
-	  DataBlobExtra.h, DataHolder.h, TH_Ethernet.h, TH_File.h,
-	  TH_Mem.h, TH_MPI.h, TH_ShMem.h, TH_Socket.h, TransportHolder.h:
-	  %lofarcvsmv%: Moved to LOFAR/LCS/Transport/include/Transport
-
-2005-10-04 14:15  cvs
-
-	* include/Transport/: BaseSim.h, Connection.h, ConnectionPool.h,
-	  CSConnection.h, DataBlobExtra.h, DataHolder.h, TH_Ethernet.h,
-	  TH_File.h, TH_Mem.h, TH_MPI.h, TH_ShMem.h, TH_Socket.h,
-	  TransportHolder.h: %lofarcvsmv%: Moved from
-	  LOFAR/LCS/Transport/src, creating new revision
-
-2005-10-04 11:42  diepen
-
-	* Makefile.am, src/Makefile.am, test/Makefile.am: BugId: 396 Use
-	  $(top_srcdir)/Makefile.common
-
-2005-10-04 11:40  diepen
-
-	* configure.in: BugId: 396 Use lofar_GENERAL
-
-2005-09-28 17:03  loose
-
-	* src/TH_Socket.cc: BugID: 405
-
-	  Socket is now always destroyed when it is "owned", after peer has
-	  closed the connection.
-
-2005-09-26 17:16  loose
-
-	* src/TH_Socket.cc: BugID: 405
-
-	  Socket is now always destroyed when it is "owned", after peer has
-	  closed the connection.
-
-2005-09-19 13:34  loose
-
-	* test/ExampleSocket.cc: BugID: 349
-
-	  When HAVE_BGL is defined, the test program exits with code 3
-	  (meaning: test skipped).
-
-2005-08-16 12:40  zwart
-
-	* src/: TH_Socket.cc, TH_Socket.h: BugID: 272
-
-	  Added argument to constructor that determines if the socket is
-	  made in the constructor.  MPI-CEPFrame applications can use this
-	  argument to postpone the creation of the socket until
-	  TH_Socket::init() is called.
-
-2005-08-01 11:48  zwart
-
-	* test/ExampleEthernet.cc: BugID: 238
-
-	  Included an empty main. Now ExampleEthernet compiles for fakebgl
-
-2005-08-01 11:46  zwart
-
-	* test/ExampleEthernet.cc: BugID: 238
-
-	  Disabled raw ethernet test on BGL
-
-2005-07-28 11:27  diepen
-
-	* src/: DataHolder.cc, DataHolder.h: BugID: 147 Removed implicit
-	  call to createDataBlock; use DBGASSERT where applicable
-
-2005-07-25 15:04  zwart
-
-	* test/: DH_Ethernet.cc, DH_Ethernet.h, ExampleEthernet.cc,
-	  Makefile.am: BugID: 195
-
-	  Ported ExampleEthernet to the new libTransport
-
-2005-07-25 14:00  diepen
-
-	* src/DataHolder.cc: BugID: 147 Also test of itsData in
-	  resizeBuffer
-
-2005-07-22 11:42  diepen
-
-	* src/: DataHolder.cc, DataHolder.h: BugID: 147 Improved by calling
-	  createDataBlock if not done yet
-
-2005-07-22 11:30  diepen
-
-	* src/DataHolder.cc: BugID: 147 Assert that itsData is set
-
-2005-07-05 15:37  loose
-
-	* src/TH_Socket.cc: %[PR: 174]%
-
-	  Added assertion for OK status of data socket in the TH_Socket
-	  constructor.	Otherwise, we might erroneously assume that socket
-	  creation was successful.
-
-2005-07-05 15:32  loose
-
-	* test/ExampleSocket.run: %[PR: 174]%
-
-	  Run script now correctly returns a non-zero return status.
-
-2005-06-27 15:50  loose
-
-	* configure.in: %[ER: 0]%
-
-	  Merged changes on LCS-Transport-2_0-release-branch with main
-	  development line.
-
-2005-06-27 15:45  loose
-
-	* src/Makefile.am: %[PR: 173]%
-
-	  Moved CyclicBuffer stuff to CEP/CEPFrame, because it uses
-	  threads.
-
-2005-06-24 17:21  loose
-
-	* src/: CyclicBuffer.h, Lock.h: %[PR: 173]%
-
-	  Re-added CyclicBufferTest to CEP/CEPFrame. Solved the dead-lock;
-	  it turns out it probably is a bug in the NPTL, not in our code.
-
-2005-06-24 15:42  lofar
-
-	* configure.in: changed lofar_INTERNAL entry
-
-2005-06-24 11:57  loose
-
-	* configure.in: %[ER: 0]%
-
-	  Prepare for release 2.0 Fixed incorrect usage of lofar_INTERNAL
-	  macro.
-
-2005-06-23 16:01  loose
-
-	* INSTALL: %[ER: 0]%
-
-	  Prepare for release 2.0
-
-2005-06-23 15:11  loose
-
-	* src/: CyclicBuffer.cc, CyclicBuffer.h, Lock.h, Makefile.am: %[ER:
-	  0]%
-
-	  Preparation for release 2.0.	Moved CyclicBuffer stuff to
-	  CEP/CEPFrame, because it uses threads.
-
-2005-06-17 17:24  loose
-
-	* AUTHORS, COPYING, ChangeLog, NEWS, README: %[ER: 0]%
-
-	  Prepare for release 2.0
-
-2005-06-17 16:46  meijeren
-
-	* NEWS, README: %[ER: 0]% Added some more info.
-
-2005-06-17 14:33  loose
-
-	* AUTHORS, INSTALL: %[ER: 0]%
-
-	  Prepare for release 2.0
-
-2005-06-17 12:23  loose
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README, configure.in:
-	  %[ER: 0]%
-
-	  Prepare for release 2.0
-
-2005-06-15 13:57  overeem
-
-	* test/ExampleSocket.cc: %[ER:231]% Deleting Listener Socket after
-	  test has finished.
-
-2005-06-14 14:45  meijeren
-
-	* src/: CSConnection.h, Connection.h, Lock.h: %[ER: 231]% Added
-	  doxygen tags.
-
-2005-06-13 11:31  meijeren
-
-	* src/: TH_MPI.cc, TransportHolder.h: %[ER: 231]% Added code to
-	  readTotalMsgLengthNonBlocking.
-
-2005-06-10 16:41  loose
-
-	* test/: ExampleBlMem_test.sh, ExampleMPI_test.sh,
-	  ExampleMem_test.sh, ExampleNonBlocking_test.sh,
-	  ExampleShMem_test.sh, ExampleSocket_test.sh,
-	  ExampleVarBuf_test.sh, Example_test.sh,
-	  TestBidirectional_test.sh: %[ER: 231]%
-
-	  Removed some remnants of an unintentional merge with development
-	  code
-
-2005-06-08 14:34  lang
-
-	* src/: Makefile.am, TH_Ethernet.cc, TH_Ethernet.h: %[ER:231]%
-	  Merge with branch ER231_development.
-
-2005-06-08 11:20  meijeren
-
-	* test/TestBidirectional.cc: %[ER: 231]% Added comment.
-
-2005-06-07 14:01  meijeren
-
-	* src/: TH_ShMem.cc, TH_ShMem.h: %[ER: ]% Added an #ifdef
-	  HAVE_SHMEM.
-
-2005-06-06 15:46  broekema
-
-	* src/TH_Mem.cc: %[ER: 160]% Don't return a value in a void
-	  function. This only shows up when threads are not used.
-
-2005-06-06 12:12  meijeren
-
-	* configure.in, src/BaseSim.h, src/CSConnection.cc,
-	  src/CSConnection.h, src/Connection.cc, src/Connection.h,
-	  src/ConnectionPool.cc, src/ConnectionPool.h, src/CyclicBuffer.h,
-	  src/DataBlobExtra.cc, src/DataBlobExtra.h, src/DataHolder.cc,
-	  src/DataHolder.h, src/Lock.h, src/Makefile.am, src/Socket.cc,
-	  src/Socket.h, src/TH_Ethernet.cc, src/TH_Ethernet.h,
-	  src/TH_File.cc, src/TH_File.h, src/TH_MPI.cc, src/TH_MPI.h,
-	  src/TH_Mem.cc, src/TH_Mem.h, src/TH_ShMem.cc, src/TH_ShMem.h,
-	  src/TH_Socket.cc, src/TH_Socket.h, src/TransportHolder.cc,
-	  src/TransportHolder.h, src/Transporter.cc, src/Transporter.h,
-	  test/DH_Example.cc, test/DH_Example.h, test/DH_ExampleExtra.cc,
-	  test/DH_ExampleExtra.h, test/DH_Socket.cc, test/DH_Socket.h,
-	  test/DH_VarBuf.cc, test/DH_VarBuf.h, test/Example.cc,
-	  test/ExampleBlMem.cc, test/ExampleBlMem_test.sh,
-	  test/ExampleMPI.cc, test/ExampleMPI_test.sh, test/ExampleMem.cc,
-	  test/ExampleMem_test.sh, test/ExampleNonBlocking.cc,
-	  test/ExampleNonBlocking_test.sh, test/ExampleShMem.cc,
-	  test/ExampleShMem.run, test/ExampleShMem_test.sh,
-	  test/ExampleSocket.cc, test/ExampleSocket_test.sh,
-	  test/ExampleVarBuf.cc, test/ExampleVarBuf_test.sh,
-	  test/Example_test.sh, test/Makefile.am,
-	  test/TestBidirectional.cc, test/TestBidirectional_test.sh,
-	  test/tClient.cc, test/tServer.cc: %[ER: 231]% Merge with branch
-	  ER231_development.
-
-2005-06-03 12:00  overeem
-
-	* src/: CSConnection.cc, TH_Socket.cc: %[ER:231]% Solved bug in
-	  internal administration of TH_Socket in combi with CSConnection.
-
-2005-06-02 09:37  meijeren
-
-	* src/DataHolder.h: %[ER: 231]% Made pack() and unpack() methods
-	  virtual.
-
-2005-06-01 17:16  meijeren
-
-	* src/: CSConnection.h, Connection.h, CyclicBuffer.h,
-	  DataBlobExtra.h, DataHolder.h, Lock.h, TH_Ethernet.h, TH_File.h,
-	  TH_MPI.h, TH_Mem.h, TH_ShMem.h, TH_Socket.h, TransportHolder.h:
-	  %[ER: 231]% Updated guard.
-
-2005-06-01 14:25  diepen
-
-	* configure.in: Added check for LONG_LONG and LOG4CPLUS
-
-2005-05-30 09:42  lang
-
-	* src/TH_Ethernet.cc, src/TH_Ethernet.h, test/ExampleEthernet.cc:
-	  %[ER:269 'dataholder headersize offset' deleted (will not be used
-	  anymore) ]%
-
-2005-05-27 17:03  coolen
-
-	* configure.in: %[ER: 273]%
-
-	  Changed lofar_PACKAGE into lofar_INTERNAL.
-
-2005-05-18 16:59  meijeren
-
-	* src/DataHolder.cc: %[ER: 231]% Added check on null pointer.
-
-2005-05-18 15:25  meijeren
-
-	* src/TH_ShMem.cc, test/DH_Example.cc, test/DH_Example.h,
-	  test/ExampleMem.cc, test/ExampleShMem.cc, test/ExampleShMem.run:
-	  %[ER: 231]% Added a test of reset functionality in ExampleMem and
-	  ExampleShMem
-
-2005-05-18 15:18  meijeren
-
-	* src/DataHolder.cc: %[ER: 231]% Fixed bug in copy constructor.
-
-2005-05-18 13:29  meijeren
-
-	* src/Connection.h, src/TH_File.cc, src/TH_File.h, src/TH_MPI.h,
-	  src/TH_Mem.cc, src/TH_Mem.h, src/TH_ShMem.cc, src/TH_ShMem.h,
-	  src/TH_Socket.h, src/TransportHolder.h, test/ExampleMPI.cc,
-	  test/ExampleShMem.cc, test/ExampleShMem.run: %[ER: 231]% -
-	  removed MPI dependency from TH_ShMem - added reset method to
-	  TransportHolders
-
-2005-05-18 12:31  meijeren
-
-	* src/: DataHolder.cc, DataHolder.h: %[ER: 231]% Fixed bug in
-	  copying of BlobStringType.
-
-2005-05-13 16:52  overeem
-
-	* src/CSConnection.cc, src/CSConnection.h, src/Connection.cc,
-	  src/Connection.h, src/DataHolder.cc, src/DataHolder.h,
-	  src/Makefile.am, src/TH_Ethernet.h, src/TH_File.cc,
-	  src/TH_File.h, src/TH_MPI.cc, src/TH_MPI.h, src/TH_Mem.cc,
-	  src/TH_Mem.h, src/TH_ShMem.cc, src/TH_ShMem.h, src/TH_Socket.cc,
-	  src/TH_Socket.h, src/TransportHolder.h, test/ExampleBlMem.cc,
-	  test/ExampleBlMem_test.sh, test/ExampleMPI_test.sh,
-	  test/ExampleMem_test.sh, test/ExampleNonBlocking.cc,
-	  test/ExampleNonBlocking_test.sh, test/ExampleShMem_test.sh,
-	  test/ExampleSocket_test.sh, test/ExampleVarBuf_test.sh,
-	  test/Example_test.sh, test/TestBidirectional_test.sh: %[ER:231]%
-	  Connection was split into Connection and CSConnection due to
-	  PR154.  The new Connection is like the old Connection: as
-	  unidirectional 'pipe'.  The new CSConnection can be used for
-	  ClientServer (multiple non-blocking reads on a connection). The
-	  CSConnection needs to be redefined in the very near future to
-	  better meet the requirements for ClientServer. The CSConnection
-	  is for now almost equal to Connection.
-
-2005-05-13 11:44  coolen
-
-	* configure.in, package.doc, src/BaseSim.h, src/Connection.cc,
-	  src/Connection.h, src/ConnectionPool.cc, src/ConnectionPool.h,
-	  src/CyclicBuffer.h, src/DataBlobExtra.cc, src/DataBlobExtra.h,
-	  src/DataHolder.cc, src/DataHolder.h, src/Makefile.am,
-	  src/Socket.cc, src/Socket.h, src/TH_Ethernet.cc,
-	  src/TH_Ethernet.h, src/TH_File.cc, src/TH_File.h, src/TH_MPI.cc,
-	  src/TH_MPI.h, src/TH_Mem.cc, src/TH_Mem.h, src/TH_ShMem.cc,
-	  src/TH_ShMem.h, src/TH_Socket.cc, src/TH_Socket.h,
-	  src/TransportHolder.cc, src/TransportHolder.h,
-	  src/Transporter.cc, src/Transporter.h, test/DH_Ethernet.cc,
-	  test/DH_Ethernet.h, test/DH_Example.cc, test/DH_Example.h,
-	  test/DH_ExampleExtra.cc, test/DH_ExampleExtra.h,
-	  test/DH_Socket.cc, test/DH_Socket.h, test/DH_VarBuf.cc,
-	  test/DH_VarBuf.h, test/Example.cc, test/ExampleBlMem.cc,
-	  test/ExampleEthernet.cc, test/ExampleEthernet.run,
-	  test/ExampleEthernet_test.sh, test/ExampleMPI.cc,
-	  test/ExampleMem.cc, test/ExampleNonBlocking.cc,
-	  test/ExampleShMem.cc, test/ExampleSocket.cc,
-	  test/ExampleSocketPerf.cc, test/ExampleVarBuf.cc,
-	  test/Makefile.am, test/StopWatch.cc, test/StopWatch.h,
-	  test/TestBidirectional.cc, test/tClient.cc, test/tServer.cc,
-	  test/tTH_Socket.cc: all changes so far for the lofar_PACKAGE to
-	  lofar_INTERNAL step.	beware!!!  this branch also contains the
-	  ER231 changes , and those are NOT wanted in the main development
-	  tree....  Only take the configure.in stuff
-
-2005-05-10 15:56  meijeren
-
-	* configure.in, src/Makefile.am, src/Corba/BS_Corba.cc,
-	  src/Corba/BS_Corba.h, src/Corba/CorbaControl.cc,
-	  src/Corba/CorbaControl.idl, src/Corba/CorbaController.cc,
-	  src/Corba/CorbaController.h, src/Corba/CorbaMonitor.cc,
-	  src/Corba/CorbaMonitor.h, src/Corba/CorbaTransport.cc,
-	  src/Corba/CorbaTransport.h, src/Corba/CorbaTransportIn.cc,
-	  src/Corba/CorbaTransportIn.h,
-	  src/Corba/CorbaTransportInterface.cc,
-	  src/Corba/CorbaTransportInterface.idl,
-	  src/Corba/CorbaTransportOut.cc, src/Corba/CorbaTransportOut.h,
-	  src/Corba/MTCircularBuffer.h, src/Corba/Makefile.am,
-	  src/Corba/TH_Corba.cc, src/Corba/TH_Corba.h: %[PR: 163]% Removed
-	  Corba related stuff
-
-2005-05-10 14:29  meijeren
-
-	* src/: CyclicBuffer.h, Lock.h, Makefile.am: %[ER: 231]% Removed
-	  (identical) CyclicBuffer and Lock.h from CEPFrame package. Added
-	  Lock.h, this is needed by the CyclicBuffer.
-
-2005-05-09 13:53  coolen
-
-	* src/: BaseSim.h, DataBlobExtra.h, DataHolder.h, TH_Ethernet.h,
-	  TH_File.h, TH_MPI.h, TH_Mem.h, TH_Socket.h, TransportHolder.h,
-	  Transporter.h: %[ER: 273]% added LOFAR_ to include guard to make
-	  code compatible with ER 231
-
-2005-05-09 10:56  coolen
-
-	* configure.in: %[ER: 273]% minor bugs removed && PACKAGE ..
-	  INTERNAL changed in configure.in files
-
-2005-05-02 14:53  meijeren
-
-	* src/: TH_MPI.cc, TH_MPI.h: %[ER: 231]% Fixed omission of const.
-
-2005-05-02 13:13  loose
-
-	* configure.in, src/Makefile.am, src/Corba/BS_Corba.cc,
-	  src/Corba/BS_Corba.h, src/Corba/CorbaControl.cc,
-	  src/Corba/CorbaControl.idl, src/Corba/CorbaController.cc,
-	  src/Corba/CorbaController.h, src/Corba/CorbaMonitor.cc,
-	  src/Corba/CorbaMonitor.h, src/Corba/CorbaTransport.cc,
-	  src/Corba/CorbaTransport.h, src/Corba/CorbaTransportIn.cc,
-	  src/Corba/CorbaTransportIn.h,
-	  src/Corba/CorbaTransportInterface.cc,
-	  src/Corba/CorbaTransportInterface.idl,
-	  src/Corba/CorbaTransportOut.cc, src/Corba/CorbaTransportOut.h,
-	  src/Corba/MTCircularBuffer.h, src/Corba/Makefile.am,
-	  src/Corba/TH_Corba.cc, src/Corba/TH_Corba.h: %[PR: 163]%
-
-	  Removed antiquated Corba stuff.
-
-2005-04-29 13:04  loose
-
-	* src/DataBlobExtra.cc, src/DataHolder.cc, src/Makefile.am,
-	  src/Socket.cc, src/TH_File.cc, src/TH_Mem.cc, src/TH_Socket.cc,
-	  src/TransportHolder.cc, src/Transporter.cc,
-	  src/Corba/BS_Corba.cc, src/Corba/CorbaControl.cc,
-	  src/Corba/CorbaController.cc, src/Corba/CorbaMonitor.cc,
-	  src/Corba/CorbaTransport.cc, src/Corba/CorbaTransportIn.cc,
-	  src/Corba/CorbaTransportInterface.cc,
-	  src/Corba/CorbaTransportOut.cc, src/Corba/TH_Corba.cc,
-	  test/DH_Ethernet.cc, test/DH_Example.cc, test/DH_Socket.cc,
-	  test/DH_VarBuf.cc, test/Example.cc, test/ExampleBlMem.cc,
-	  test/ExampleEthernet.cc, test/ExampleMPI.cc, test/ExampleMem.cc,
-	  test/ExampleNonBlocking.cc, test/ExampleShMem.cc,
-	  test/ExampleSocket.cc, test/ExampleSocketPerf.cc,
-	  test/ExampleVarBuf.cc, test/StopWatch.cc,
-	  test/TestBidirectional.cc, test/tTH_Socket.cc: %[PR: 100]%
-
-	  Merged changes of development branch into main development line.
-
-2005-04-29 12:39  loose
-
-	* src/: TH_Ethernet.cc, TH_Ethernet.h, TH_ShMem.cc: %[PR: 100]%
-
-	  Merged changes of the main development line into the branch.
-
-2005-04-28 12:32  loose
-
-	* src/TH_Socket.cc, src/Corba/BS_Corba.cc,
-	  src/Corba/CorbaController.cc, src/Corba/CorbaMonitor.cc,
-	  src/Corba/CorbaTransport.cc, src/Corba/CorbaTransportIn.cc,
-	  src/Corba/CorbaTransportOut.cc, src/Corba/TH_Corba.cc,
-	  test/DH_Ethernet.cc, test/DH_Example.cc, test/DH_Socket.cc,
-	  test/DH_VarBuf.cc: %[PR: 100]%
-
-	  Repaired result of stupid bug in sed script which caused multiple
-	  insertions of the line '#include <lofar_config.h>'
-
-2005-04-28 09:53  lang
-
-	* src/: TH_Ethernet.cc, TH_Ethernet.h: %[PR:159]% ifndef HAVE_BGL
-	  added for compiling on BlueGene
-
-2005-04-27 17:56  loose
-
-	* src/DataBlobExtra.cc, src/DataHolder.cc, src/Makefile.am,
-	  src/Socket.cc, src/TH_File.cc, src/TH_Mem.cc, src/TH_ShMem.cc,
-	  src/TH_Socket.cc, src/TransportHolder.cc, src/Transporter.cc,
-	  src/Corba/BS_Corba.cc, src/Corba/CorbaControl.cc,
-	  src/Corba/CorbaController.cc, src/Corba/CorbaMonitor.cc,
-	  src/Corba/CorbaTransport.cc, src/Corba/CorbaTransportIn.cc,
-	  src/Corba/CorbaTransportInterface.cc,
-	  src/Corba/CorbaTransportOut.cc, src/Corba/TH_Corba.cc,
-	  test/ExampleMPI.cc, test/ExampleShMem.cc: %[PR: 100]%
-
-	  Added line #include <lofar_config.h> to all .cc files.  Updated
-	  test/ExampleMPI.cc and test/ExampleShMem.cc to work with new
-	  complex (ref. ER 247).
-
-2005-04-27 17:50  loose
-
-	* test/: DH_Ethernet.cc, DH_Example.cc, DH_Socket.cc, DH_VarBuf.cc,
-	  Example.cc, ExampleBlMem.cc, ExampleEthernet.cc, ExampleMPI.cc,
-	  ExampleMem.cc, ExampleNonBlocking.cc, ExampleShMem.cc,
-	  ExampleSocket.cc, ExampleSocketPerf.cc, ExampleVarBuf.cc,
-	  Makefile.am, StopWatch.cc, TestBidirectional.cc, tTH_Socket.cc:
-	  %[PR: 100]%
-
-	  Added line #include <lofar_config.h> to all .cc files.
-
-2005-04-26 09:29  zwart
-
-	* src/TH_ShMem.cc: %[PR: 100]%
-
-	  #include <lofar_config.h> was removed from header, now it was
-	  added to .cc
-
-2005-04-20 14:31  loose
-
-	* test/Makefile.am: %[ER: ]%
-
-	  Removed ExampleEthernet from the list of test programs, as it can
-	  only be run successfully by user root.
-
-2005-04-15 12:18  loose
-
-	* test/StopWatch.h: %[PR: 100]%
-
-	  Removed all `#include <config.h>' and `#include <lofar_config.h>'
-	  from .h and .tcc files. Added `#include <lofar_config.h>' to .cc
-	  files where necessary.
-
-2005-04-14 23:59  loose
-
-	* test/StopWatch.h: %[PR: 100]%
-
-	  Removed `#include <config.h>' and `#include <lofar_config.h>'
-	  from .h and .tcc files. Added `#include <lofar_config.h> to .cc
-	  files where necessary.
-
-2005-04-13 16:45  loose
-
-	* src/BaseSim.h, src/CyclicBuffer.h, src/DataBlobExtra.h,
-	  src/DataHolder.h, src/Socket.h, src/TH_Ethernet.h, src/TH_File.h,
-	  src/TH_MPI.h, src/TH_Mem.h, src/TH_ShMem.h, src/TH_Socket.h,
-	  src/TransportHolder.h, src/Transporter.h, src/Corba/BS_Corba.h,
-	  src/Corba/CorbaController.h, src/Corba/CorbaMonitor.h,
-	  src/Corba/CorbaTransport.h, src/Corba/CorbaTransportIn.h,
-	  src/Corba/CorbaTransportOut.h, src/Corba/MTCircularBuffer.h,
-	  test/DH_Ethernet.h, test/DH_Example.h, test/DH_Socket.h,
-	  test/DH_VarBuf.h: %[PR: 100]%
-
-	  Removed #include <config.h> and #include <lofar_config.h> from
-	  header files
-
-2005-04-11 16:05  meijeren
-
-	* src/: BaseSim.h, Connection.cc, Connection.h, TH_Ethernet.cc,
-	  TH_Ethernet.h, TH_File.cc, TH_File.h, TH_MPI.cc, TH_MPI.h,
-	  TH_Mem.cc, TH_Mem.h, TH_ShMem.cc, TH_ShMem.h, TH_Socket.h,
-	  TransportHolder.cc, TransportHolder.h: %[ER: 231]% Added a
-	  isClonable() and clone() method to TransportHolders. This is
-	  needed by CEPFrame when connecting multiple channels in one
-	  connect call.
-
-2005-04-06 17:34  loose
-
-	* src/: TH_Socket.cc, TH_Socket.h: %[ER: 231]%
-
-	  If you fix a bug you gotta fix it right ;-).
-	  TH_Socket::shutdown() should of course take a reference to a
-	  socket pointer and not the pointer itself; otherwise setting the
-	  pointer to zero has no effect outside the scope of
-	  TH_Socket::shutdown().
-
-2005-04-06 11:34  loose
-
-	* src/: TH_Socket.cc, TH_Socket.h: %[ER: 231]%
-
-	  Fixed a nasty bug in recv[Non]Blocking that caused a double
-	  delete of a private Socket object. The acts of shutdown and
-	  destroy are now merged into a new private shutdown(Socket*)
-	  method.
-
-2005-04-05 15:49  meijeren
-
-	* src/TH_MPI.cc, src/TH_MPI.h, src/TH_ShMem.h, test/ExampleMPI.cc,
-	  test/ExampleShMem.cc: %[ER: 231]% Now also working with gnu_mpich
-
-2005-04-05 13:27  meijeren
-
-	* src/: Connection.cc, Connection.h, DataHolder.cc, DataHolder.h,
-	  TH_Mem.cc, TH_Mem.h, TransportHolder.cc, TransportHolder.h: %[ER:
-	  231]% Changes needed by tinyCEP.
-
-2005-03-30 15:21  meijeren
-
-	* test/: DH_Example.cc, DH_Example.h, DH_ExampleExtra.cc,
-	  DH_ExampleExtra.h, DH_VarBuf.cc, DH_VarBuf.h, Example.cc,
-	  ExampleBlMem.cc, ExampleMem.cc, ExampleNonBlocking.cc,
-	  ExampleVarBuf.cc, TestBidirectional.cc: %[ER: 231]% Modified to
-	  use built-in complex.
-
-2005-03-24 16:49  meijeren
-
-	* test/TestBidirectional.cc: %[ER: 231]% Added comment.
-
-2005-03-23 16:48  lang
-
-	* test/: DH_Ethernet.cc, DH_Ethernet.h, ExampleEthernet.cc,
-	  ExampleEthernet.run, ExampleEthernet_test.sh, Makefile.am: %[ER:
-	  ]% introduction of TH_Ethernet test program
-
-2005-03-22 13:48  diepen
-
-	* test/: DH_Example.cc, DH_Example.h, DH_VarBuf.cc, DH_VarBuf.h,
-	  Example.cc, ExampleBlMem.cc, ExampleMem.cc,
-	  ExampleNonBlocking.cc, ExampleSocket.cc, ExampleSocketPerf.cc,
-	  ExampleVarBuf.cc, TestBidirectional.cc: %[ER: 247]% Use builtin
-	  complex
-
-2005-03-17 14:11  meijeren
-
-	* src/Connection.cc, src/DataHolder.cc, src/DataHolder.h,
-	  test/Makefile.am: %[ER: 231]% Added a check on DataHolder
-	  initialisation in Connection::read/write.
-
-2005-03-17 13:56  romein
-
-	* src/TH_Ethernet.cc: %[ER: ]% Avoid non-standard C++
-
-2005-03-16 16:34  lang
-
-	* src/: TH_Ethernet.cc, TH_Ethernet.h: %[ER:242 ]% Constructor
-	  arguments changed from char* to (lofar)string
-
-2005-03-16 15:22  loose
-
-	* configure.in: %[ER: 30]%
-
-	  Updated version number to 1.1
-
-2005-03-16 14:59  lang
-
-	* src/TH_Ethernet.h: %[ER:242 ]% Initialization of datamember
-	  itsDHHeader changed from true to false
-
-2005-03-16 14:52  lang
-
-	* src/: TH_Ethernet.cc, TH_Ethernet.h: %[ER:242 ]%
-	  Dataholder::Headersize call introduced for offset in databuffer
-	  if necessary
-
-2005-03-16 09:37  loose
-
-	* configure.in: %[ER: 30]%
-
-	  Updated version number to 1.1
-
-2005-03-15 12:21  loose
-
-	* src/: Socket.cc, Socket.h: %[ER: 231]%
-
-	  Removed the temporary copies of LCS/ACC/Socket.{h,cc}, which are
-	  themselves obsolete as well.
-
-2005-03-14 16:33  overeem
-
-	* test/ExampleSocket.cc: %[ER:231]% ExampleSocket now replaces
-	  tTH_Socket.
-
-2005-03-14 16:20  overeem
-
-	* test/: tClient.cc, tServer.cc: %[ER:231]% Manual testprograms for
-	  testing client-server functionality.
-
-2005-03-14 16:01  overeem
-
-	* test/Makefile.am: %[ER:231]% Update for ExampleSocket and
-	  tServer+tClient.
-
-2005-03-14 15:58  overeem
-
-	* test/DH_Socket.cc: %[ER:231]% Small invocation change.
-
-2005-03-14 15:38  overeem
-
-	* src/: Connection.cc, Connection.h, ConnectionPool.cc,
-	  ConnectionPool.h, Makefile.am, TH_Socket.cc, TH_Socket.h:
-	  %[ER:231]% Modified assert in Connection to meet Client/Server
-	  requirements.  Rewrote TH_Socket.  Added ConnectionPool for
-	  Servers.
-
-2005-03-11 16:44  loose
-
-	* package.doc: %[ER: 236]%
-
-	  Added group Transport to group LCS.
-
-2005-03-03 15:55  lang
-
-	* src/: Makefile.am, TH_Ethernet.cc, TH_Ethernet.h: %[ER: 243]
-	  Enhancements after review by Ruud Overeem
-
-2005-02-21 13:15  overeem
-
-	* test/tTH_Socket.cc: %[ER:128]% Made test more robust in
-	  connecting to the other side.
-
-2005-02-18 09:24  overeem
-
-	* src/: TH_Socket.cc, TH_Socket.h: %[ER:182]% Formal accessor
-	  functions for setting/getting the ListenerSocket.  Datamembers
-	  are private again.
-
-2005-02-17 18:59  overeem
-
-	* src/TH_Socket.h: %[ER:182]% Datamembers not private for BG test.
-
-2005-02-11 14:32  meijeren
-
-	* src/: BaseSim.h, Connection.h, CyclicBuffer.h, DataBlobExtra.h,
-	  DataHolder.h, Socket.h, TH_Ethernet.h, TH_File.h, TH_MPI.h,
-	  TH_Mem.h, TH_ShMem.h, TH_Socket.h, TransportHolder.h: %[ER: 231]%
-	  Removed includes of lofar_config.h from header files.
-
-2005-02-10 13:42  meijeren
-
-	* src/: Connection.h, DataHolder.h: %[ER: 231]% Minor changes
-	  needed by TransportPL.
-
-2005-02-10 13:00  loose
-
-	* package.doc, src/CyclicBuffer.h, src/DataBlobExtra.h,
-	  src/DataHolder.h, src/TH_Ethernet.h, src/TH_File.h, src/TH_MPI.h,
-	  src/TH_Mem.h, src/TH_ShMem.h, src/TH_Socket.h,
-	  src/TransportHolder.h, src/Transporter.h: %[ER: 236]%
-
-	  Enhanced the documentation: - Defined a number of groups within
-	  the package group "Common".  - Added (sub)grouping to several
-	  source files.  - Updated comment style to C++ // style.
-
-2005-02-09 12:09  meijeren
-
-	* src/DataHolder.cc, src/DataHolder.h, test/DH_Example.h,
-	  test/DH_ExampleExtra.h: %[ER: 231]% Changed comments.
-
-2005-02-09 09:50  meijeren
-
-	* test/ExampleMPI.cc: %[ER: 231]% Fixed bidirectional MPI test.
-
-2005-02-08 16:38  meijeren
-
-	* src/: TH_ShMem.cc, TH_ShMem.h: %[ER: 231]% Updated TH_ShMem
-
-2005-02-08 14:23  lang
-
-	* src/TH_Ethernet.cc: Socket filter update
-
-2005-02-08 14:02  lang
-
-	* src/TH_Ethernet.h: Changed comment
-
-2005-02-08 14:01  lang
-
-	* src/TH_Ethernet.cc: Possibility to ignore Dataholder header
-
-2005-02-01 09:55  meijeren
-
-	* src/Connection.cc, src/Connection.h, src/DataHolder.cc,
-	  src/DataHolder.h, src/TH_MPI.cc, src/TH_MPI.h, src/TH_Mem.cc,
-	  src/TH_Mem.h, src/TH_ShMem.cc, src/TH_ShMem.h,
-	  src/TransportHolder.h, test/Example.cc, test/ExampleBlMem.cc,
-	  test/ExampleMPI.cc, test/ExampleMem.cc,
-	  test/ExampleNonBlocking.cc, test/ExampleShMem.cc,
-	  test/ExampleVarBuf.cc, test/Makefile.am,
-	  test/TestBidirectional.cc: %[ER: 231]% Various (small) changes.
-
-2005-01-27 16:27  meijeren
-
-	* test/ExampleNonBlocking.cc: %[ER: 231]% Adjusted
-	  ExampleNonBlocking to new Transport structure.
-
-2005-01-27 15:58  meijeren
-
-	* src/Connection.cc, src/Connection.h, src/DataBlobExtra.cc,
-	  src/DataBlobExtra.h, src/DataHolder.cc, src/DataHolder.h,
-	  src/Makefile.am, src/TH_File.cc, src/TH_File.h, src/TH_Mem.cc,
-	  src/TH_Mem.h, src/TH_ShMem.cc, src/TH_ShMem.h, src/TH_Socket.h,
-	  src/TransportHolder.cc, src/TransportHolder.h,
-	  src/Transporter.cc, src/Transporter.h, test/DH_Example.cc,
-	  test/DH_Example.h, test/DH_ExampleExtra.cc,
-	  test/DH_ExampleExtra.h, test/DH_Socket.cc, test/DH_Socket.h,
-	  test/DH_VarBuf.cc, test/DH_VarBuf.h, test/Example.cc,
-	  test/ExampleBlMem.cc, test/ExampleMem.cc, test/ExampleVarBuf.cc,
-	  test/Makefile.am, test/TestBidirectional.cc: %[ER: 231]%
-	  Restructured dependencies and interfaces.
-
-2005-01-12 11:12  meijeren
-
-	* test/: DH_VarBuf.cc, DH_VarBuf.h, ExampleVarBuf.cc,
-	  ExampleVarBuf_test.sh, Makefile.am, Readme.txt: %[ER: 159]% Added
-	  test of a variable size datafield in the main blob.
-
-2005-01-11 12:07  loose
-
-	* test/Makefile.am: %[ER: 177]%
-
-	  Shared memory can now be enabled or disabled using
-	  --with-shmem=[yes|no] during configure. Furthermore,
-	  --with-shmem=yes has been made the default for the standard
-	  variant (e.g. debug, opt, mpich, etc.); the bgl and fakebgl
-	  variants use --with-shmem=no by default.
-
-2005-01-07 09:33  broekema
-
-	* src/Makefile.am: %[ER: 177]% Solve a bootstrapping problem by
-	  adding the shmem code differently
-
-2005-01-06 18:02  loose
-
-	* src/Makefile.am: %[ER: 177]%
-
-	  Shared memory can now be enabled or disabled using
-	  --with-shmem=[yes|no] during configure. Furthermore,
-	  --with-shmem=yes has been made the default for the standard
-	  variant (e.g. debug, opt, mpich, etc.); the bgl and fakebgl
-	  variants use --with-shmem=no by default.
-
-2004-12-27 09:25  lang
-
-	* src/: TH_Ethernet.cc, TH_Ethernet.h: Handle messages containing
-	  more bytes than maximum ethernetframe length
-
-2004-12-23 11:14  broekema
-
-	* src/TH_Mem.cc: %[ER: 182]% Cosmetic fix of a unused variable
-	  warning
-
-2004-12-22 09:45  overeem
-
-	* test/ExampleSocket.cc: %[ER:30]% Changed portnr for test to 8924
-	  to not interfere with test Example3 with occasionally hangs.
-
-2004-12-21 13:41  lang
-
-	* src/: TH_Ethernet.cc, TH_Ethernet.h: First release of Ethernet
-	  TransportHolder
-
-2004-12-20 11:43  meijeren
-
-	* src/: DataHolder.cc, DataHolder.h, Transporter.cc, Transporter.h:
-	  %[ER: 159]% Fixed return values of init() and write() and removed
-	  basePreprocess method.
-
-2004-12-16 15:18  broekema
-
-	* src/TH_MPI.h: %[ER: 182]% Add an include for mpe.h when HAVE_MPE
-	  is defined
-
-2004-12-16 14:00  overeem
-
-	* test/tTH_Socket.cc: %[ER:30]% Using a different portnr in each
-	  test.
-
-2004-12-16 13:22  meijeren
-
-	* src/DataHolder.h: %[ER: 159]% Made read and write calls virtual.
-
-2004-12-15 16:00  overeem
-
-	* test/: tTH_Socket.cc, tTH_Socket.run: %[ER:30]% Removing result
-	  file in testscript. Using another portnumber that other tests.
-
-2004-12-15 14:13  overeem
-
-	* src/: TH_Socket.cc, TH_Socket.h: %[ER:30]% Updated Socket to the
-	  Blue Gene which has no netdb.h functions. Embellished the logging
-	  messages and made sure the sockets use the right blockingmode
-	  directly after creation.
-
-	  Modified TH_Socket to implement real non-blocking
-	  connect/accept/read-calls.
-
-2004-12-14 10:48  meijeren
-
-	* test/: DH_Example.h, DH_Socket.h: %[ER: 159]% Minor updates.
-
-2004-12-06 16:13  overeem
-
-	* test/tTH_Socket.cc: %[ER:30]% While-loop around read call because
-	  it may be non-blocking.
-
-2004-12-06 10:21  overeem
-
-	* src/TH_Socket.cc: %[ER:30]% dos2unix converted.
-
-2004-12-03 14:35  meijeren
-
-	* test/ExampleNonBlocking.cc: %[ER: 159]% Added a sleep to be sure
-	  writing has finished.
-
-2004-12-03 14:24  meijeren
-
-	* test/: ExampleNonBlocking.cc, ExampleNonBlocking_test.sh,
-	  Makefile.am, Readme.txt: %[ER: 159]% Added a non-blocking example
-	  to illustrate the effects of non-blocking communication.
-
-2004-12-03 13:16  meijeren
-
-	* test/: DH_Example.cc, DH_Example.h, Example.cc, ExampleMem.cc:
-	  %[ER: 159]% Addition of getBufferElement() method.
-
-2004-12-01 12:34  meijeren
-
-	* test/: ExampleSocket.cc, Readme.txt: %[ER: 157]% Added a test of
-	  bidirectional connect with TH_Socket.
-
-2004-11-30 17:15  meijeren
-
-	* src/TH_MPI.cc, src/TH_MPI.h, src/Transporter.cc,
-	  test/ExampleMPI.cc, test/Readme.txt: %[ER: 157]% Added a test of
-	  a bidirectional connect with TH_MPI.
-
-2004-11-24 14:42  diepen
-
-	* src/DataHolder.h: %[ER: 148]% Improved comments on setMaxDataSize
-
-2004-11-24 09:04  diepen
-
-	* test/ExampleBlMem.cc: %[ER: 70]% Check if threads can be used
-
-2004-11-22 16:22  meijeren
-
-	* test/Readme.txt: %[ER: 159]% Removed description of PL tests.
-
-2004-11-10 08:48  diepen
-
-	* configure.in: Removed PL
-
-2004-11-10 08:47  diepen
-
-	* Makefile.am, bootstrap, configure.in, src/BaseSim.h,
-	  src/CyclicBuffer.cc, src/CyclicBuffer.h, src/DataBlobExtra.cc,
-	  src/DataBlobExtra.h, src/DataHolder.cc, src/DataHolder.h,
-	  src/Makefile.am, src/Socket.cc, src/Socket.h, src/TH_File.cc,
-	  src/TH_File.h, src/TH_MPI.cc, src/TH_MPI.h, src/TH_Mem.cc,
-	  src/TH_Mem.h, src/TH_ShMem.cc, src/TH_ShMem.h, src/TH_Socket.cc,
-	  src/TH_Socket.h, src/TransportHolder.cc, src/TransportHolder.h,
-	  src/Transporter.cc, src/Transporter.h, src/Corba/BS_Corba.cc,
-	  src/Corba/BS_Corba.h, src/Corba/CorbaControl.cc,
-	  src/Corba/CorbaControl.idl, src/Corba/CorbaController.cc,
-	  src/Corba/CorbaController.h, src/Corba/CorbaMonitor.cc,
-	  src/Corba/CorbaMonitor.h, src/Corba/CorbaTransport.cc,
-	  src/Corba/CorbaTransport.h, src/Corba/CorbaTransportIn.cc,
-	  src/Corba/CorbaTransportIn.h,
-	  src/Corba/CorbaTransportInterface.cc,
-	  src/Corba/CorbaTransportInterface.idl,
-	  src/Corba/CorbaTransportOut.cc, src/Corba/CorbaTransportOut.h,
-	  src/Corba/MTCircularBuffer.h, src/Corba/Makefile.am,
-	  src/Corba/TH_Corba.cc, src/Corba/TH_Corba.h, test/DH_Example.cc,
-	  test/DH_Example.h, test/DH_Socket.cc, test/DH_Socket.h,
-	  test/Example.cc, test/ExampleBlMem.cc, test/ExampleBlMem_test.sh,
-	  test/ExampleMPI.cc, test/ExampleMPI.run, test/ExampleMPI_test.sh,
-	  test/ExampleMem.cc, test/ExampleMem_test.sh,
-	  test/ExampleShMem.cc, test/ExampleShMem.run,
-	  test/ExampleShMem_test.sh, test/ExampleSocket.cc,
-	  test/ExampleSocket.run, test/ExampleSocketPerf.cc,
-	  test/ExampleSocketPerf.run, test/ExampleSocket_test.sh,
-	  test/Example_test.sh, test/Makefile.am, test/Readme.txt,
-	  test/StopWatch.cc, test/StopWatch.h, test/TestBidirectional.cc,
-	  test/TestBidirectional_test.sh, test/tTH_Socket.cc,
-	  test/tTH_Socket.log_prop, test/tTH_Socket.run,
-	  test/tTH_Socket_test.sh: %[ER: 70]% Moved Transport from CEP to
-	  LCS and split off the PL part
-
diff --git a/LCS/Transport/INSTALL b/LCS/Transport/INSTALL
deleted file mode 100644
index c3bffc03080eae663652e08be6d29c286b3b1324..0000000000000000000000000000000000000000
--- a/LCS/Transport/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building a LOFAR package
-========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to the package root directory (i.e. LCS/Transport).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/LCS/Transport/Makefile.am b/LCS/Transport/Makefile.am
deleted file mode 100644
index 7e4e95290312daae2954bd40585b35bad2c78ac4..0000000000000000000000000000000000000000
--- a/LCS/Transport/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix) \
-      --with-blob=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      Transport.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Transport/NEWS b/LCS/Transport/NEWS
deleted file mode 100644
index 202318754c80352d2937ee0a6b36c096d46553c0..0000000000000000000000000000000000000000
--- a/LCS/Transport/NEWS
+++ /dev/null
@@ -1,145 +0,0 @@
-LCS/Transport: Version 2.3, date: 2006/02/01
-============================================
-
-The release only contains minor changes. The most notable change is probably
-due to the split-off of LCS/Blob. Furthermore, some changes were made to the
-TH_Ethernet class.
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 514 : TH_Ethernet: add an interface for setting the kernel level socket
-        buffers.
-        The size of the socketbuffers can be given to the constructor. They
-        will be set during init. Also added TH_Null. This is useful if you do
-        not want a connection but you do need an TH-object.
-
-
-
-LCS/Transport: Version 2.2, date: 2005/11/16
-============================================
-
-In preparation of making package distributable as rpm package, all header
-files that must be installed have been moved from the `src' directory to the
-`inclucde/<package>' directory (ref. BugID #396).
-
-Furthermore, some changes to the build environment require the use of
-autoconf_share 2.4 (or later). 
-
-
-The following BugIDs have been resolved
----------------------------------------
-
-# 349 : ExampleSocket should be XFAIL for gnu_fakebgl
-        BG/L does not support hostname lookup, which is why ExampleSocket
-        fails for the build variant gnu_fakebgl.
-
-# 405 : Cannot re-init a TH_Socket after shutdown
-        When a client tries to reconnect after a server failure, it receives
-        an "Transport endpoint is already connected" error. This problem
-        arises because TH_Socket only calls shutdown() on the Socket object;
-        it does not destroy it. So, when you try to re-connect, the kernel
-        will pull the breaks, because you're trying to use a file descriptor
-        that's already in use.
-        Solution: after peer closed connection, let TH_Socket *always* destroy
-        the data socket when it "owns" the socket.
-
-
-
-LCS/Transport: Version 2.1, date: 2005/09/05
-============================================
-
-This version of the LCS/Transport library incorporates some bug-fixes to source
-code and tests. The CyclicBuffer and Lock classes have been moved to CEP/CEPFrame.
-
-The following Bugs have been fixed
-----------------------------------
-
-BugID 147 :     Transport  : Missing null-pointer check in DataHolder::putExtra()
-
-
-BugID 238 :     Transport  : ExampleEthernet fails to compile for gnu_fakebgl
-
-
-BugID 272 :     Transport  : TH_Socket opening socket in constructor
-
-       Added argument to constructor that determines if the socket is made
-        in the constructor. MPI-CEPFrame applications can use this argument
-        to postpone the creation of the socket until TH_Socket::init() is
-        called.
-
-LCS/Transport: Version 2.0, date: 2005/06/17
-============================================
-
-This is the second major release of the LCS/Transport library. The interface
-has undergone some major changes. See Enhancement Request ER-231 for details.
-Connections between two DataHolder objects are now made using a Connection
-object. Hence, DataHolders and TransportHolder can now be used independently.
-
-The build process has changed as well. The Transport library should now be
-built against an installed version of the Common library. (Ref. ER-270 and
-ER-273).
-
-There has been a significant change in TH_ShMem. It no longer needs MPI to
-work, instead a helper TransportHolder of your choice is used once to set up 
-the shared memory communication. This helper TransportHolder must be set 
-during construction.
-
-The following Enhancement Requests have been implemented
---------------------------------------------------------
-
-ER 231 : Transport             : Change DH/Transport/TH relationship 
-
-         Change the transport library in such a way DataHolders and
-         TransportHolders can be used independently. Plus remove all unused
-         functionality from the interfaces of all classes.
-
-ER 270 : Build environment     : Modify build process to use installed
-                                 packages
-
-         The current build process uses (locally) built packages and does some
-         trickery to derive package dependencies. Although this approach works
-         in practice, it causes unwanted build dependencies between
-         packages. Furthermore, the current design does not allow running a
-         'make distcheck', which is a prerequisite for building a package
-         distribution (e.g. tarball or rpm).
-
-ER 273 : Build environment     : Change from lofar_PACKAGE to lofar_INTERNAL
-
-         Instead of lofar_PACKAGE, lofar_INTERNAL should be used in the
-         configure.in files. This is in preparation of making distributable
-         packages.
-
-
-The following Problem Reports have been fixed
----------------------------------------------
-
-PR 100 : LOFAR SW development  : Neither config.h nor lofar_config.h should
-                                 be included in header files
-
-         Inclusion of either config.h or lofar_config.h in a distributed
-         header file is problematic, because the config files themselves
-         cannot be distributed; they contain system specific definitions. It
-         is therefore unwise to include either of these files in a header
-         file.
-
-         Note: This Problem Report is closely related to Enhancement Request
-               ER 229.
-
-PR 154 : Transport             : Connection.read may not be repeated 
-
-         In branch ER231_development a Connection class is introduced. When
-         working with NonBlocking TH's the read() function may not be called
-         repeatedly Therefor you can not use the function as a poll mechanism
-         which is often used in servers.  The read() call must be implemented
-         like the recvNonBocking() function in the TH_Socket of that branch.
-
-PR 159 : Transport             : adjustment for BlueGene 
-
-         #ifndef HAVE_BGL added for compiling on BlueGene
-
-PR 163 : Transport             : Corba stuff is antiquated: remove 
-
-         The Corba stuff is very out-of-date. It will most certainly not build
-         anymore. Hence the code should be moved to the CVS attic.
diff --git a/LCS/Transport/Transport.spec.in b/LCS/Transport/Transport.spec.in
deleted file mode 100644
index ebe7010f2c631952c663d70b4de1affe42aa75a9..0000000000000000000000000000000000000000
--- a/LCS/Transport/Transport.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Transport.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Transport is the common LOFAR software package handling the transport of node in various ways (Socket, MPI, shared memory).
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 3.0
-Requires: Blob >= 1.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Transport is the package handling the data transport in LOFAR.
-In a transparant way it handles the data transport over sockets, MPI,
-shared memory, etc..
-In a 'derived' package TransportPL it can also handle data transport
-via a database (using the LCS/databases/PL package).
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/Transport/bootstrap b/LCS/Transport/bootstrap
deleted file mode 100755
index 0e2ea4eaa84e50d11ae6299f3a2285936340baeb..0000000000000000000000000000000000000000
--- a/LCS/Transport/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
\ No newline at end of file
diff --git a/LCS/Transport/configure.in b/LCS/Transport/configure.in
deleted file mode 100644
index d726266529e3ac1ab5c7742f54aeb577849fc3d5..0000000000000000000000000000000000000000
--- a/LCS/Transport/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Transport, 2.3, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_MPI
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/Transport/Makefile
-src/Makefile
-test/Makefile
-Makefile
-Transport.spec
-)
diff --git a/LCS/Transport/include/Makefile.am b/LCS/Transport/include/Makefile.am
deleted file mode 100644
index 5b98b9bbc8c4809a321fe3d5ad79282477c7aa4c..0000000000000000000000000000000000000000
--- a/LCS/Transport/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= Transport
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/Transport/include/Transport/Makefile.am b/LCS/Transport/include/Transport/Makefile.am
deleted file mode 100644
index 5349996dbf3d0d905635af9055f8f6de3c4b3bfe..0000000000000000000000000000000000000000
--- a/LCS/Transport/include/Transport/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	BaseSim.h \
-	BGLConnection.h \
-	Connection.h \
-	ConnectionPool.h \
-	CSConnection.h \
-	DataBlobExtra.h \
-	DataHolder.h \
-	DH_BlobStreamable.h \
-	TH_Ethernet.h \
-	TH_File.h \
-	TH_Mem.h \
-	TH_MPI.h \
-	TH_Null.h \
-	TH_ShMem.h \
-	TH_Socket.h \
-	TransportHolder.h 
-
-noinst_HEADERS = 
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/Transport/src/Makefile.am b/LCS/Transport/src/Makefile.am
deleted file mode 100644
index b73d87fed919601901e5718aa779c5ad377a1a01..0000000000000000000000000000000000000000
--- a/LCS/Transport/src/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-lib_LTLIBRARIES			= libtransport.la 
-
-libtransport_la_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-libtransport_la_SOURCES		= Package__Version.cc  \
-	BGLConnection.cc \
-	Connection.cc \
-	ConnectionPool.cc \
-	CSConnection.cc \
-	DataBlobExtra.cc \
-	DataHolder.cc \
-	DH_BlobStreamable.cc \
-	TH_Ethernet.cc \
-	TH_File.cc \
-	TH_Mem.cc \
-	TH_MPI.cc \
-	TH_ShMem.cc \
-	TH_Socket.cc \
-	TransportHolder.cc
-
-bin_PROGRAMS = versiontransport
-
-versiontransport_SOURCES      = versiontransport.cc
-versiontransport_LDADD        = libtransport.la
-versiontransport_DEPENDENCIES = libtransport.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/Transport/test/Makefile.am b/LCS/Transport/test/Makefile.am
deleted file mode 100644
index 6cc1315c81f346fba8731ec19ed44bf07d9e4c38..0000000000000000000000000000000000000000
--- a/LCS/Transport/test/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-AM_CPPFLAGS = \
-	-DHAVE_MMAP=0 \
-	-DMORECORE=shmbrk \
-	-DMORECORE_CONTIGUOUS=0 \
-	-DMORECORE_CANNOT_TRIM=1 \
-	-DSHMEM_ALLOC
-
-CHECKTOOLPROGS		  = Example \
-			    TestBidirectional \
-			    ExampleMem \
-		    	    ExampleBlMem \
-			    ExampleNonBlocking \
-			    ExampleVarBuf \
-			    ExampleShMem \
-			    ExampleMPI \
-			    ExampleSocket
-
-check_PROGRAMS		  = Example \
-			    TestBidirectional \
-			    ExampleMem \
-		    	    ExampleBlMem \
-			    ExampleNonBlocking \
-			    ExampleVarBuf \
-			    ExampleShMem \
-			    ExampleMPI \
-			    ExampleSocket \
-			    ExampleEthernet \
-			    tServer tClient \
-			    tCSConnection
-
-Example_SOURCES 	  = Example.cc DH_Example.cc
-
-ExampleMem_SOURCES 	  = ExampleMem.cc DH_Example.cc DH_ExampleExtra.cc
-
-ExampleBlMem_SOURCES	  = ExampleBlMem.cc DH_Example.cc DH_ExampleExtra.cc
-
-ExampleNonBlocking_SOURCES= ExampleNonBlocking.cc DH_Example.cc
-
-ExampleVarBuf_SOURCES     = ExampleVarBuf.cc DH_VarBuf.cc
-
-ExampleShMem_SOURCES 	  = ExampleShMem.cc DH_Example.cc DH_ExampleExtra.cc
-
-ExampleMPI_SOURCES 	  = ExampleMPI.cc DH_Example.cc DH_ExampleExtra.cc
-
-TestBidirectional_SOURCES = TestBidirectional.cc DH_Example.cc
-
-ExampleSocket_SOURCES     = ExampleSocket.cc DH_Socket.cc
-
-ExampleEthernet_SOURCES	  = ExampleEthernet.cc DH_Ethernet.cc
-
-tServer_SOURCES		  = tServer.cc DH_Socket.cc
-
-tClient_SOURCES		  = tClient.cc DH_Socket.cc
-
-tCSConnection_SOURCES	  = tCSConnection.cc
-
-LDADD			  = ../src/libtransport.la 
-DEPENDENCIES		  = ../src/libtransport.la $(LOFAR_DEPEND)
-
-TESTSCRIPTS = \
-	Example.sh		\
-	TestBidirectional.sh	\
-	ExampleMem.sh		\
-	ExampleBlMem.sh		\
-	ExampleNonBlocking.sh	\
-	ExampleShMem.sh		\
-	ExampleMPI.sh		\
-	ExampleVarBuf.sh	\
-	ExampleSocket.sh
-
-TESTS = $(TESTSCRIPTS)
-
-
-EXTRA_DIST =				\
-	DH_Ethernet.h DH_Example.h DH_ExampleExtra.h \
-	DH_Socket.h DH_VarBuf.h StopWatch.h \
-	ExampleEthernet.run ExampleMPI.run \
-	ExampleShMem.run ExampleSocket.run \
-	$(TESTSCRIPTS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/bootstrap b/LCS/bootstrap
deleted file mode 100755
index be0aa5082f702905c4cb89db7d6df5b590303556..0000000000000000000000000000000000000000
--- a/LCS/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../autoconf_share/bootstrap ../autoconf_share
diff --git a/LCS/lofarconf.in b/LCS/lofarconf.in
deleted file mode 100644
index 2151181c72e32cb21cbdcafb1b7105050445d44a..0000000000000000000000000000000000000000
--- a/LCS/lofarconf.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Tools         # Useful tools
-Common        # Common stuff
-Blob	      # Binary Large Objects
-Stream        # Low-level support for streaming data
-Transport     # Low-level transport library
-ACC           # Application Configuration & Control
-AMC           # Astronomical Measures Conversions (successor of CRD)
-ApplCommon    # Application common stuff
diff --git a/LCS/pyparameterset/Makefile.am b/LCS/pyparameterset/Makefile.am
deleted file mode 100644
index ffdd8847d22ec90a02099bf67adaac7e3858647d..0000000000000000000000000000000000000000
--- a/LCS/pyparameterset/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      pyparameterset.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/pyparameterset/bootstrap b/LCS/pyparameterset/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/pyparameterset/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/pyparameterset/configure.in b/LCS/pyparameterset/configure.in
deleted file mode 100644
index 9cedce6516d0e44f65984c54a2ddf18d93a8727c..0000000000000000000000000000000000000000
--- a/LCS/pyparameterset/configure.in
+++ /dev/null
@@ -1,74 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(pyparameterset, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-dnl AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl Checks for Python
-lofar_PYTHON
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h)
-lofar_INTERNAL(LCS/pytools,pytools,,,,"")
-
-lofar_EXTERNAL(pyrap,1,pyrap/Converters/PycBasicData.h)
-lofar_AIPSPP(1,"-lcasa")
-lofar_EXTERNAL(boost,1,boost/python.hpp,boost_python)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-pyparameterset.spec
-)
diff --git a/LCS/pyparameterset/pyparameterset.spec.in b/LCS/pyparameterset/pyparameterset.spec.in
deleted file mode 100644
index 9f13651d763e9999673d5ce0cbce73b21d901948..0000000000000000000000000000000000000000
--- a/LCS/pyparameterset/pyparameterset.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# ParmFacade.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: ParmFacade is the high level access to the Parameter Data Base
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-ParmFacade is the high level access to the Parameter Data Base.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/pyparameterset/src/Makefile.am b/LCS/pyparameterset/src/Makefile.am
deleted file mode 100644
index b6ce69ffc6a4243edf3319698c7a6b88058b66c5..0000000000000000000000000000000000000000
--- a/LCS/pyparameterset/src/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-lib_LTLIBRARIES         = _pyparameterset.la
-
-_pyparameterset_la_SOURCES	= pyparameterset.cc
-# Needed for non-standard library name (i.e. not lib...)
-_pyparameterset_la_LDFLAGS	= -module
-_pyparameterset_la_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-lofarpython_PYTHON = __init__.py
-lofarpythondir = $(pythondir)/lofar/parameterset
-libdir         = $(lofarpythondir)
-
-pkginclude_HEADERS = Package__Version.h
-
-bin_PROGRAMS = versionpyparameterset
-
-versionpyparameterset_SOURCES      = versionpyparameterset.cc Package__Version.cc
-versionpyparameterset_DEPENDENCIES = $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/pyparameterset/test/Makefile.am b/LCS/pyparameterset/test/Makefile.am
deleted file mode 100644
index 182c8f058f68210b69bd7ee81708e893773dca5c..0000000000000000000000000000000000000000
--- a/LCS/pyparameterset/test/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# scripts used to run tests
-TESTSCRIPTS           = tpyparameterset.sh
-
-# scripts and possible programs to run tests
-TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS) \
-			tpyparameterset.py
-			tpyparameterset.in tpyparameterset.stdout	
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/pyparameterset/test/tpyparameterset.sh b/LCS/pyparameterset/test/tpyparameterset.sh
index 368fa3bdd6f5ef7db5352653b7aefe4668429461..36684276c7dae32750513ab7f404fcb5dedf51b6 100755
--- a/LCS/pyparameterset/test/tpyparameterset.sh
+++ b/LCS/pyparameterset/test/tpyparameterset.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-./runctest.sh -pythonpkg parameterset tpyparameterset > tpyparameterset.log 2>&1
+./runctest.sh tpyparameterset > tpyparameterset.log 2>&1
diff --git a/LCS/pytools/Makefile.am b/LCS/pytools/Makefile.am
deleted file mode 100644
index d48bffdf7bd38e1636777d784edb8c26ad3e979e..0000000000000000000000000000000000000000
--- a/LCS/pytools/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/pytools/bootstrap b/LCS/pytools/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCS/pytools/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCS/pytools/configure.in b/LCS/pytools/configure.in
deleted file mode 100644
index 294029d0f9a4116c55478a5a397d8b5e724a9020..0000000000000000000000000000000000000000
--- a/LCS/pytools/configure.in
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(pytools, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-dnl AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl Checks for Python
-lofar_PYTHON
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/LCS/pytools/src/Makefile.am b/LCS/pytools/src/Makefile.am
deleted file mode 100644
index c0db8a123a1dfce01b1d54c57718b806f393b4e3..0000000000000000000000000000000000000000
--- a/LCS/pytools/src/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-lofarpython_PYTHON = __init__.py
-lofarpythondir = $(pythondir)/lofar
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/Firmware/tools/Makefile.am b/LCU/Firmware/tools/Makefile.am
deleted file mode 100644
index 4cf41f1d81b13d0144ca25a2b42213b552de87a5..0000000000000000000000000000000000000000
--- a/LCU/Firmware/tools/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-EXTRA_DIST = Makefile.common
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/Firmware/tools/bootstrap b/LCU/Firmware/tools/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/LCU/Firmware/tools/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/LCU/Firmware/tools/configure.in b/LCU/Firmware/tools/configure.in
deleted file mode 100644
index 3d9a176b23b983cf5f38cdbe8ce307a65c0ed144..0000000000000000000000000000000000000000
--- a/LCU/Firmware/tools/configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-
-dnl Not really necessary (we have no C sources), but autoconf requires it
-AC_CONFIG_HEADERS(config.h)
-
-dnl Needed by automake (e.g. for make dist)
-AM_INIT_AUTOMAKE(Firmware-Tools, 1.0, no-define)
-
-dnl This is only needed because bootstrap issues a libtoolize command
-AC_PROG_LIBTOOL
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile)
diff --git a/LCU/Firmware/tools/src/Makefile.am b/LCU/Firmware/tools/src/Makefile.am
deleted file mode 100644
index 46b8b49c20ced70642a6129d5af6d9e3477f3954..0000000000000000000000000000000000000000
--- a/LCU/Firmware/tools/src/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-sbin_SCRIPTS = \
-	flash_images.sh \
-	restart_images.sh \
-	view_images.sh \
-	rsuctl \
-	rsuctl3 \
-	rsuctl3.pl \
-	rsuctl3_reset \
-	README.rsuctl \
-	flash_tbb.sh
-
-dist_sbin_SCRIPTS = $(sbin_SCRIPTS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/Makefile.am b/LCU/StationTest/Makefile.am
deleted file mode 100644
index 359c543d1c92380dad56a6af391cea64dbb018b4..0000000000000000000000000000000000000000
--- a/LCU/StationTest/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS = modules gold tc test
-
-testdir	=  $(prefix)/stationtest
-
-test_SCRIPTS = 	README.txt
-test_SCRIPTS += $(srcdir)/*.py
-test_SCRIPTS += $(srcdir)/*.sh
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/bootstrap b/LCU/StationTest/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/LCU/StationTest/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/LCU/StationTest/configure.in b/LCU/StationTest/configure.in
deleted file mode 100644
index aebf3efd947acf12ac05a3606eeb4ae675e46ec3..0000000000000000000000000000000000000000
--- a/LCU/StationTest/configure.in
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_INIT(README.txt)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(StationTest, 1.0, no-define)
-
-AC_PROG_LIBTOOL
-
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-	Makefile
-	gold/Makefile
-	modules/Makefile
-	tc/Makefile
-	test/Makefile
-	test/beamformertest/Makefile
-	test/hbatest/Makefile
-	test/hbatest/gold/Makefile
-	test/subbandstatistics/Makefile
-	test/systemnoise/Makefile
-	test/timing/Makefile
-	test/xcstatistics/Makefile
-	test/envcontroltest/Makefile
-	test/subracktest/Makefile
-)
-
diff --git a/LCU/StationTest/gold/Makefile.am b/LCU/StationTest/gold/Makefile.am
deleted file mode 100644
index 26223749baac7122ace1c5e6d28cc3dd0bcc0c27..0000000000000000000000000000000000000000
--- a/LCU/StationTest/gold/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-testdir		 =  $(prefix)/stationtest/gold
-
-test_SCRIPTS = 	$(srcdir)/*.gold 
-test_SCRIPTS +=  $(srcdir)/*.m
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/modules/Makefile.am b/LCU/StationTest/modules/Makefile.am
deleted file mode 100644
index 0caafdc537994b2539282da9541db84cc8012088..0000000000000000000000000000000000000000
--- a/LCU/StationTest/modules/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir		 =	$(prefix)/stationtest/modules
-
-test_SCRIPTS = 	$(srcdir)/*.py
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/tc/Makefile.am b/LCU/StationTest/tc/Makefile.am
deleted file mode 100644
index ca120dd23058c04d9e04edcf24a63437232ac1dd..0000000000000000000000000000000000000000
--- a/LCU/StationTest/tc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir		 =  $(prefix)/stationtest/tc
-
-test_SCRIPTS = $(srcdir)/*.py
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/Makefile.am b/LCU/StationTest/test/Makefile.am
deleted file mode 100644
index cfc8d7912b5b5741a48671587d4573934070f05b..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = beamformertest hbatest hbatest/gold subbandstatistics \
-          systemnoise timing xcstatistics envcontroltest subracktest
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/beamformertest/Makefile.am b/LCU/StationTest/test/beamformertest/Makefile.am
deleted file mode 100755
index d79fa5958c74d60de1a1975101b70e1b67ce17ce..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/beamformertest/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/beamformertest
-
-test_SCRIPTS = 	$(srcdir)/*.sh
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/envcontroltest/Makefile.am b/LCU/StationTest/test/envcontroltest/Makefile.am
deleted file mode 100755
index d1b38acef1c2b5e332763480e1e9d56733e1ebc4..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/envcontroltest/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/envcontroltest
-
-test_SCRIPTS = 	$(srcdir)/*.py
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/hbatest/Makefile.am b/LCU/StationTest/test/hbatest/Makefile.am
deleted file mode 100644
index 1d9f567974b50c269ca4b8aa3b118776b0d3b934..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/hbatest/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-subdirs = gold
-
-testdir	=  $(prefix)/stationtest/test/hbatest
-
-test_SCRIPTS = 	$(srcdir)/*.sh
-test_SCRIPTS +=  $(srcdir)/*.py
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/hbatest/gold/Makefile.am b/LCU/StationTest/test/hbatest/gold/Makefile.am
deleted file mode 100644
index c52d97c8e75ffaace1dbd58623e3edd799b862ca..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/hbatest/gold/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/hbatest/gold
-
-test_SCRIPTS = 	$(srcdir)/*.gold
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/subbandstatistics/Makefile.am b/LCU/StationTest/test/subbandstatistics/Makefile.am
deleted file mode 100644
index bc0860a9e9682540fe4d34412707b64fb06f692b..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/subbandstatistics/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/subbandstatistics
-
-test_SCRIPTS = 	$(srcdir)/*.sh
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/subracktest/Makefile.am b/LCU/StationTest/test/subracktest/Makefile.am
deleted file mode 100644
index 9957f097db5a8aeda2da1ae08cb6552fae88b752..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/subracktest/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/subracktest
-
-test_SCRIPTS = 	$(srcdir)/*.sh
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/systemnoise/Makefile.am b/LCU/StationTest/test/systemnoise/Makefile.am
deleted file mode 100644
index e7b458fa520fdfb1879d26eb45b42d35577b3885..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/systemnoise/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/systemnoise
-
-test_SCRIPTS = 	$(srcdir)/*.sh
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/timing/Makefile.am b/LCU/StationTest/test/timing/Makefile.am
deleted file mode 100644
index 913acd7901cc8c60f46c306d541ae460643788b7..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/timing/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/timing
-
-test_SCRIPTS = 	$(srcdir)/*.sh
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCU/StationTest/test/xcstatistics/Makefile.am b/LCU/StationTest/test/xcstatistics/Makefile.am
deleted file mode 100644
index eb14e6a52dce178f1aa60d1869fcbb6234ba864b..0000000000000000000000000000000000000000
--- a/LCU/StationTest/test/xcstatistics/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-testdir	=  $(prefix)/stationtest/test/xcstatistics
-
-test_SCRIPTS = 	$(srcdir)/*.sh
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/APLCommon.spec.in b/MAC/APL/APLCommon/APLCommon.spec.in
deleted file mode 100644
index 4aafbc2462d3e6523d3bbd872ad77681121bb4c9..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/APLCommon.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# APLCommon.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: APLCommon contains the common MAC-APL classes.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: GCFPAL = 6.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-APLCommon is the package containing the common classes for the APL layer 
-of MAC.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/APLCommon/Makefile.am b/MAC/APL/APLCommon/Makefile.am
deleted file mode 100644
index 1ae471cfa00085fa0dcbea97e209e6d3270674d9..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      APLCommon.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/bootstrap b/MAC/APL/APLCommon/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in
deleted file mode 100644
index 49800cfa5d9dc03a82d71e4dce09b7b729a5e82d..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/configure.in
+++ /dev/null
@@ -1,76 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(APLCommon, 3.1, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/StationInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
-lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
-lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, "boost_date_time boost_regex")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/APL/APLCommon/Makefile
-src/Makefile
-test/Makefile
-Makefile
-APLCommon.spec
-)
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am b/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
deleted file mode 100644
index 61d4cb55a2e37693b2156c703715717d744b0095..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgincludedir = $(includedir)/APL/APLCommon
-pkginclude_HEADERS = Package__Version.h  \
-					AntennaMapper.h \
-					AntennaPos.h \
-					AntennaSets.h \
-					APLCommonExceptions.h \
-					APL_Defines.h \
-					APLUtilities.h \
-					bitsetUtil.tcc \
-					ControllerDefines.h \
-					CTState.h \
-					ControllerInfo.h \
-					ControllerAdmin.h \
-					ChildControl.h \
-					ParentControl.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/include/Makefile.am b/MAC/APL/APLCommon/include/Makefile.am
deleted file mode 100644
index d992ae3446320f6d4c2ca7081f8394e0a7b992ef..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APL/APLCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/src/Makefile.am b/MAC/APL/APLCommon/src/Makefile.am
deleted file mode 100644
index 10ea7ce373fafbc278d4fe3ff0effa14cc2643ca..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/src/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO  $<
-
-%.conf: %.conf.in
-	cp $< $@
-
-%: %.sh.in
-	cp $< $@
-
-lib_LTLIBRARIES = libaplcommon.la
-
-libaplcommon_la_CPPFLAGS =  -DBOOST_DISABLE_THREADS \
-							-Wno-deprecated \
-							-fmessage-length=0 \
-							-fdiagnostics-show-location=once
-
-libaplcommon_la_SOURCES   = Package__Version.cc \
-							StartDaemon_Protocol.cc \
-							Controller_Protocol.cc \
-							APLUtilities.cc \
-							ControllerDefines.cc \
-							CTState.cc \
-							ControllerAdmin.cc \
-							ChildControl.cc \
-							ParentControl.cc  \
-							AntennaSets.cc \
-							AntennaPos.cc
-
-BUILT_SOURCES 			= $(ph_HEADERS) swlevel swlevel.conf
-
-EXTRA_DIST 				= $(BUILT_SOURCES) $(BUILT_SOURCES)
-
-sysconf_DATA			= swlevel.conf 
-
-bin_SCRIPTS				= swlevel
-
-phdir					=$(includedir)/APL/APLCommon
-
-ph_HEADERS 				= StartDaemon_Protocol.ph \
-						  Controller_Protocol.ph
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versionaplcommon
-
-versionaplcommon_SOURCES      = versionaplcommon.cc
-versionaplcommon_LDADD        = libaplcommon.la
-versionaplcommon_DEPENDENCIES = libaplcommon.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/APLCommon/test/Makefile.am b/MAC/APL/APLCommon/test/Makefile.am
deleted file mode 100755
index 5658eb0938accf5503c9a43c86d219cb92ecdbae..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/test/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-check_PROGRAMS		= tControllerDefines tAPLUtilities tbitsetUtil tOutOfBand tAntennaMapper tAntennaSet tAntennaPos
-AM_CPPFLAGS			= -I../src/
-
-tControllerDefines_SOURCES	= tControllerDefines.cc
-tControllerDefines_LDADD	= ../src/libaplcommon.la
-tControllerDefines_DEPENDENCIES= ../src/libaplcommon.la $(LOFAR_DEPEND)
-
-tAPLUtilities_SOURCES		= tAPLUtilities.cc
-tAPLUtilities_LDADD			= ../src/libaplcommon.la
-tAPLUtilities_DEPENDENCIES	= ../src/libaplcommon.la $(LOFAR_DEPEND)
-
-tbitsetUtil_SOURCES			= tbitsetUtil.cc
-tbitsetUtil_LDADD			= ../src/libaplcommon.la
-tbitsetUtil_DEPENDENCIES	= ../src/libaplcommon.la $(LOFAR_DEPEND)
-
-tOutOfBand_SOURCES			= tOutOfBand.cc
-tOutOfBand_LDADD			= ../src/libaplcommon.la
-tOutOfBand_DEPENDENCIES		= ../src/libaplcommon.la $(LOFAR_DEPEND)
-
-tAntennaMapper_SOURCES		= tAntennaMapper.cc
-tAntennaMapper_LDADD		= ../src/libaplcommon.la
-tAntennaMapper_DEPENDENCIES	= ../src/libaplcommon.la $(LOFAR_DEPEND)
-
-tAntennaSet_SOURCES			= tAntennaSet.cc
-tAntennaSet_LDADD			= ../src/libaplcommon.la
-tAntennaSet_DEPENDENCIES	= ../src/libaplcommon.la $(LOFAR_DEPEND)
-
-tAntennaPos_SOURCES			= tAntennaPos.cc
-tAntennaPos_LDADD			= ../src/libaplcommon.la
-tAntennaPos_DEPENDENCIES	= ../src/libaplcommon.la $(LOFAR_DEPEND)
-
-TESTSCRIPTS					= tControllerDefines_test.sh
-
-
-TESTS						= $(TESTSCRIPTS)
-
-EXTRA_DIST					= tControllerDefines.log_prop \
-							  tAPLUtilities.log_prop \
-							  tOutOfBand.log_prop \
-							  ResourceAllocatorTest.log_prop \
-							  $(TESTSCRIPTS)
-
-#noinst_PROGRAMS = ResourceAllocatorTest
-
-#ResourceAllocatorTest_CPPFLAGS = 
-#	-Wno-deprecated 
-#	-fmessage-length=0 
-#	-fdiagnostics-show-location=once 
-#	-DTESTBUILD
-#ResourceAllocatorTest_SOURCES = 
-#	ResourceAllocatorTest.cc 
-#	$(top_srcdir)/src/ResourceAllocator.cc
-#ResourceAllocatorTest_LDADD = 
-
-#BUILT_SOURCES = 
-#	ResourceAllocatorTest.log_prop
-
-NOINSTHDRS =
-
-INSTHDRS =
-
-pkginclude_HEADERS = $(NOINSTHDRS) $(INSTHDRS)
-
-
-%.log_prop: %.log_prop.in
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/CEPCU.spec.in b/MAC/APL/CEPCU/CEPCU.spec.in
deleted file mode 100644
index 898d233981a6bad481a1dbb533dba17f37094291..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/CEPCU.spec.in
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CEPCU.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The MCU contains the ACC-Controller
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: OTDB = 1.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: GCFPAL = 6.0
-Requires: APLCommon = 3.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The MCU contains all controller for the MainCU:
-MacScheduler that scans the SAS database for new observations.
-ObservationCtrl that is the maincontroller for each observation.
-BeamDirection that makes sure that all station point in the same direction.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/CEPCU/Makefile.am b/MAC/APL/CEPCU/Makefile.am
deleted file mode 100644
index 81be8286672efeaa1ecfa209fd9c16e1403c9a84..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      CEPCU.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/bootstrap b/MAC/APL/CEPCU/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in
deleted file mode 100644
index a16b17d69b061b33b2959d2f068d7f9bceb893a2..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/configure.in
+++ /dev/null
@@ -1,85 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(CEPCU, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_PVSS(0)
-lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.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,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol",)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 0, GCF/RTDB/RTDB_PropertySet.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
-lofar_EXTERNAL(boost,1.32,boost/date_time/date.hpp, boost_date_time-gcc)
-dnl lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
-dnl lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-src/ApplController/Makefile
-test/ApplController/Makefile
-src/CEPlogProcessor/Makefile
-src/BGPlogProcessor/Makefile
-src/OnlineControl/Makefile
-dnl src/OfflineControl/Makefile
-src/PythonControl/Makefile
-Makefile
-CEPCU.spec
-)
diff --git a/MAC/APL/CEPCU/src/ApplController/Makefile.am b/MAC/APL/CEPCU/src/ApplController/Makefile.am
deleted file mode 100644
index 2e397b96bf04d2ef2b24ba65ac6f84c3ddd86f32..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/src/ApplController/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-
-bin_PROGRAMS		= ApplController ACDaemon ACcli ACuserMenu
-
-dist_bin_SCRIPTS	= startAP.sh startBGL.sh startMPI.sh \
-			  		  stopAP.sh stopBGL.sh stopMPI.sh
-
-sysconf_DATA		= ACDaemon.log_prop ACDaemon.conf \
-					  ApplController.log_prop \
-					  ACuserMenu.log_prop
-
-ACDaemonHEADERS		= ACDaemon.h ACRequestPool.h
-
-ApplControllerHEADERS = ACCmdImpl.h \
-						ACDaemonComm.h \
-						APAdmin.h \
-						APAdminPool.h \
-						ApplController.h \
-						CmdStack.h \
-						ItemList.h \
-						ProcRule.h \
-						ProcRuler.h \
-						PR_MPI.h \
-						PR_BGL.h \
-						PR_Shell.h \
-						StateEngine.h
-
-ACuserMenuHEADERS	= myACClientFunctions.h
-
-noinst_HEADERS 		= $(ACDaemonHEADERS) $(ApplControllerHEADERS) $(ACuserMenuHEADERS)
-
-### ApplController ###
-ApplController_SOURCES	= ACCmdImpl.cc \
-						  ACDaemonComm.cc \
-						  APAdmin.cc \
-						  APAdminPool.cc \
-						  CmdStack.cc \
-						  ItemList.cc \
-						  ProcRule.cc \
-						  ProcRuler.cc \
-						  PR_Shell.cc \
-						  PR_MPI.cc \
-						  PR_BGL.cc \
-						  StateEngine.cc \
-						  ApplController.cc \
-						  ApplControllerMain.cc
-ApplController_DEPENDENCIES = $(LOFAR_DEPEND) $(ApplControllerHEADERS)
-ApplController_LDADD	= 
-
-### ACDaemon ###
-ACDaemon_SOURCES		= ACRequestPool.cc \
-						  ACDaemon.cc \
-						  ACDaemonMain.cc
-ACDaemon_DEPENDENCIES	= $(LOFAR_DEPEND) $(ACDaemonHEADERS)
-ACDaemon_LDADD       	=
-
-
-### ACcli ###
-ACcli_SOURCES			= ACcli.cc
-ACcli_DEPENDENCIES		= $(LOFAR_DEPEND)
-ACcli_LDADD				=
-
-### ACuserMenu ###
-ACuserMenu_SOURCES		= ACuserMenu.cc
-ACuserMenu_DEPENDENCIES	= $(LOFAR_DEPEND)  $(ACuserMenuHEADERS)
-ACuserMenu_LDADD		= 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/src/BGPlogProcessor/Makefile.am b/MAC/APL/CEPCU/src/BGPlogProcessor/Makefile.am
deleted file mode 100644
index 7f3860cb299014a9b89d5e8c656c827e5aada48d..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/src/BGPlogProcessor/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-bin_PROGRAMS			= BGPlogProcessor CEPlogProcessor
-
-sysconf_DATA			= BGPlogProcessor.conf
-
-BGPlogProcessorHEADERS	= BGPlogProcessor.h
-
-CEPlogProcessorHEADERS	= CEPlogProcessor.h
-
-noinst_HEADERS 			= $(BGPlogProcessorHEADERS) $(CEPlogProcessorHEADERS)
-
-BGPlogProcessor_SOURCES			= BGPlogProcessor.cc \
-								  BGPlogProcessorMain.cc
-BGPlogProcessor_DEPENDENCIES	= $(LOFAR_DEPEND) $(BGPlogProcessorHEADERS)
-BGPlogProcessor_LDADD       	=
-
-CEPlogProcessor_SOURCES			= CEPlogProcessor.cc \
-								  CEPlogProcessorMain.cc
-CEPlogProcessor_DEPENDENCIES	= $(LOFAR_DEPEND) $(CEPlogProcessorHEADERS)
-CEPlogProcessor_LDADD       	=
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/src/CEPlogProcessor/Makefile.am b/MAC/APL/CEPCU/src/CEPlogProcessor/Makefile.am
deleted file mode 100644
index 66548e20b650907f6eb95c1ea4bd63ba7945a3e7..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/src/CEPlogProcessor/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-bin_PROGRAMS			= CEPlogProcessor
-
-sysconf_DATA			= CEPlogProcessor.conf
-
-CEPlogProcessorHEADERS	= CEPlogProcessor.h
-
-noinst_HEADERS 			= $(CEPlogProcessorHEADERS)
-
-CEPlogProcessor_SOURCES			= CEPlogProcessor.cc \
-								  CEPlogProcessorMain.cc
-CEPlogProcessor_DEPENDENCIES	= $(LOFAR_DEPEND) $(CEPlogProcessorHEADERS)
-CEPlogProcessor_LDADD       	=
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/src/Makefile.am b/MAC/APL/CEPCU/src/Makefile.am
deleted file mode 100644
index 03b890cc0bf45386134806d0d98d3d2cb040d62e..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/src/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-SUBDIRS = ApplController
-if HAVE_PVSS
-  SUBDIRS += OnlineControl CEPlogProcessor BGPlogProcessor PythonControl # OfflineControl 
-endif
-
-bin_PROGRAMS = versioncepcu
-
-versioncepcu_SOURCES      = versioncepcu.cc Package__Version.cc
-versioncepcu_LDADD        = 
-versioncepcu_DEPENDENCIES = $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/CEPCU/src/OnlineControl/Makefile.am b/MAC/APL/CEPCU/src/OnlineControl/Makefile.am
deleted file mode 100644
index 0152195438dbf15d0b62fdeb9af136df227ff055..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/src/OnlineControl/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-bin_PROGRAMS 				= OnlineControl
-
-OnlineControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once
-
-OnlineControl_SOURCES		= CEPApplMgr.cc \
-								OnlineControl.cc \
-								OnlineControlMain.cc 
-
-OnlineControl_LDADD		= $(LOFAR_DEPEND)
-OnlineControl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= CEPApplMgr.h \
-								OnlineControl.h \
-							  	OnlineControlDefines.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-sysconf_DATA		= 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/src/PythonControl/Makefile.am b/MAC/APL/CEPCU/src/PythonControl/Makefile.am
deleted file mode 100644
index 6cd07c2a7702dfee512ce370e5ba4bc3b7204660..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/src/PythonControl/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-bin_PROGRAMS 				= PythonControl
-
-PythonControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once
-
-PythonControl_SOURCES		= PythonControl.cc \
-							  PythonControlMain.cc 
-
-PythonControl_LDADD		= $(LOFAR_DEPEND)
-PythonControl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= PythonControl.h \
-							  PythonControlDefines.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-sysconf_DATA		= 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/Makefile.am b/MAC/APL/CEPCU/src/_OfflineControl/Makefile.am
deleted file mode 100644
index 11404259dceb8b4d1e2db16324cb510b8dd442aa..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/src/_OfflineControl/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-bin_PROGRAMS 				= OfflineControl
-
-OfflineControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once
-
-OfflineControl_SOURCES		= CEPApplicationManager.cc \
-								OfflineControl.cc \
-								OfflineControlMain.cc 
-
-OfflineControl_LDADD		= $(LOFAR_DEPEND)
-OfflineControl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= CEPApplicationManager.h \
-								OfflineControl.h \
-							  	OfflineControlDefines.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-sysconf_DATA		= 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/test/ApplController/Makefile.am b/MAC/APL/CEPCU/test/ApplController/Makefile.am
deleted file mode 100644
index d8abe58ef07a9bb0cb00b0afd6a01c77d624c154..0000000000000000000000000000000000000000
--- a/MAC/APL/CEPCU/test/ApplController/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-bin_PROGRAMS		= 
-sysconf_DATA		= 
-
-TESTS			= 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CUDaemons/CUDaemons.spec.in b/MAC/APL/CUDaemons/CUDaemons.spec.in
deleted file mode 100644
index 572c2cec44d2d176ca2b25e5447b0c80d05824f9..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/CUDaemons.spec.in
+++ /dev/null
@@ -1,168 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CUDaemons.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: This package contains all daemons that should run on a ControlUnit.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: OTDB = 1.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: GCFPAL = 6.0
-Requires: APLCommon = 3.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-This package contains all daemons that should run on a ControlUnit:
-LDStartDaemon that starts Logical Devices.
-ServiceBroker for managing portnumbers on a CU.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/CUDaemons/Makefile.am b/MAC/APL/CUDaemons/Makefile.am
deleted file mode 100644
index 370578e5d2c03e5d9ac633c2f130f898b4059345..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      CUDaemons.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CUDaemons/bootstrap b/MAC/APL/CUDaemons/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/CUDaemons/configure.in b/MAC/APL/CUDaemons/configure.in
deleted file mode 100644
index 446f9c3a79b174929c3ecd9b0ffd5e589b89acf7..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/configure.in
+++ /dev/null
@@ -1,76 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(CUDaemons, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/StationInfo.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol macio",)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-src/ServiceBroker/Makefile
-src/CTStartDaemon/Makefile
-src/LogClient/Makefile
-Makefile
-CUDaemons.spec
-)
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am b/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
deleted file mode 100644
index 127a86f962c4f02cb1ae2dc3ba600ca33b1ba8de..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Executables
-bin_PROGRAMS 				= CTStartDaemon
-
-CTStartDaemon_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
-							  -Wno-deprecated \
-							  -fmessage-length=0 \
-							  -fdiagnostics-show-location=once
-
-CTStartDaemon_SOURCES		= ../Package__Version.cc \
-							  CTStartDaemon.cc \
-							  CTStartDaemonMain.cc
-CTStartDaemon_LDADD			= $(LOFAR_DEPEND) 
-CTStartDaemon_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-bin_SCRIPTS					= startController.sh
-
-NOINSTHDRS 					= CTStartDaemon.h
-
-INSTHDRS 					= 
-
-BUILT_SOURCES				= $(ph_HEADERS)
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-
-sysconf_DATA		= CTStartDaemon.conf
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CUDaemons/src/LogClient/Makefile.am b/MAC/APL/CUDaemons/src/LogClient/Makefile.am
deleted file mode 100644
index 142f8bc4c8755ef9e2a69b1cb66d538a6e57cac2..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/src/LogClient/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Executables
-bin_PROGRAMS 				= LogClient
-
-LogClient_SOURCES		= ../Package__Version.cc \
-							  LogClient.cc \
-							  LogClientMain.cc
-
-bin_SCRIPTS					= 
-
-INSTHDRS 					= LogClient.h
-
-NOINSTHDRS 					= 
-
-BUILT_SOURCES				= 
-
-pkgincludedir				= $(includedir)/APL/CUDaemons
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-# Libraries
-lib_LTLIBRARIES         	= 
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir				= $(bindir)
-configfiles_DATA 			= 
-
-sysconf_DATA				= LogClient.conf
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CUDaemons/src/Makefile.am b/MAC/APL/CUDaemons/src/Makefile.am
deleted file mode 100644
index f91cc3b08d12eeed3a8ac8d7c261cbbee46e0552..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/src/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-lib_LTLIBRARIES = libcudaemons.la
-libcudaemons_la_SOURCES = Package__Version.cc
-
-pkginclude_HEADERS = Package__Version.h
-
-SUBDIRS = CTStartDaemon LogClient ServiceBroker
-
-bin_PROGRAMS = versioncudaemons
-
-versioncudaemons_SOURCES      = versioncudaemons.cc
-versioncudaemons_LDADD        = libcudaemons.la
-versioncudaemons_DEPENDENCIES = libcudaemons.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am b/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
deleted file mode 100644
index f6a9179966ab9873f247cb865353b0a132790455..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Executables
-bin_PROGRAMS 				= ServiceBroker
-
-ServiceBroker_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
-							  -Wno-deprecated \
-							  -fmessage-length=0 \
-							  -fdiagnostics-show-location=once
-
-ServiceBroker_SOURCES		= ../Package__Version.cc \
-							  ServiceBroker.cc \
-							  ServiceBrokerMain.cc
-ServiceBroker_LDADD			= $(LOFAR_DEPEND)
-ServiceBroker_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-bin_SCRIPTS					= 
-
-NOINSTHDRS 					= ServiceBroker.h
-
-INSTHDRS 					= 
-
-BUILT_SOURCES				= $(ph_HEADERS)
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-
-sysconf_DATA		= ServiceBroker.conf 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CUDaemons/test/Makefile.am b/MAC/APL/CUDaemons/test/Makefile.am
deleted file mode 100644
index 09a9201d0e3da45a1c4e8a29fc3bdeedd9cdee5c..0000000000000000000000000000000000000000
--- a/MAC/APL/CUDaemons/test/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CPPFLAGS					= -I$(top_builddir)/include
-
-bin_PROGRAMS				= LDtestMenu ObservationControl tLogClient
-
-LDtestMenu_SOURCES			= EventPort.cc  \
-							  LDtestMenu.cc
-LDtestMenu_DEPENDENCIES		= $(LOFAR_DEPEND)
-
-ObservationControl_SOURCES		= dummyLD.cc
-ObservationControl_DEPENDENCIES = $(LOFAR_DEPEND)
-
-tLogClient_SOURCES			= tLogClient.cc
-tLogClient_DEPENDENCIES 	= $(LOFAR_DEPEND)
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/CURTDBDaemons.spec.in b/MAC/APL/CURTDBDaemons/CURTDBDaemons.spec.in
deleted file mode 100644
index f77cb6390ed8ad5dc273d84862e9352a951c9768..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/CURTDBDaemons.spec.in
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CURTDBDaemons.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: This package contains all daemons that should run on a ControlUnit.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: APLCommon = 3.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-This package contains all daemons that should run on a ControlUnit:
-LDStartDaemon that starts Logical Devices.
-ServiceBroker for managing portnumbers on a CU.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/CURTDBDaemons/Makefile.am b/MAC/APL/CURTDBDaemons/Makefile.am
deleted file mode 100644
index b665a04f97abd959ef52c505dc6bb1dbcefcac14..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-EXTRA_DIST = \
-      Makefile.common \
-      CUDaemons.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/bootstrap b/MAC/APL/CURTDBDaemons/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/CURTDBDaemons/configure.in b/MAC/APL/CURTDBDaemons/configure.in
deleted file mode 100644
index 9798dcbfc16ecb196b55930df05d65480982db45..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/configure.in
+++ /dev/null
@@ -1,84 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(CURTDBDaemons, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/StationInfo.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol",)
-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/RTDBCommon, RTDBCommon,, 1, APL/RTDBCommon/RTDButilities.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon,, 1, APL/APLCommon/ControllerDefines.h,,)
-lofar_INTERNAL(SAS/OTDB, OTDB, , 1, OTDB/OTDBconnection.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)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-src/LogProcessor/Makefile
-src/KeyValueLogger/Makefile
-src/SASGateway/Makefile
-src/SoftwareMonitor/Makefile
-Makefile
-CURTDBDaemons.spec
-)
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am
deleted file mode 100644
index 6769087003c633eb4f303a6085983b6a1bd75914..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Executables
-bin_PROGRAMS 				= KeyValueLogger
-
-#KeyValueLogger_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
-#							  -Wno-deprecated \
-#							  -fmessage-length=0 \
-#							  -fdiagnostics-show-location=once
-
-KeyValueLogger_SOURCES		= ../Package__Version.cc \
-							  KeyValueLogger.cc \
-							  KeyValueLoggerMain.cc
-KeyValueLogger_LDADD		= $(LOFAR_DEPEND) $(libdir)/libkvt_protocol.a
-KeyValueLogger_DEPENDENCIES = $(LOFAR_DEPEND)
-
-bin_SCRIPTS					= 
-
-NOINSTHDRS 					= KeyValueLogger.h
-
-INSTHDRS 					= 
-
-BUILT_SOURCES				= $(ph_HEADERS)
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir				= $(bindir)
-configfiles_DATA 			= 
-
-sysconf_DATA				= KeyValueLogger.conf
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/Makefile.am b/MAC/APL/CURTDBDaemons/src/LogProcessor/Makefile.am
deleted file mode 100644
index 1f992b59dd460c98b369bc577943494c6e7d1c3a..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-# Executables
-bin_PROGRAMS 				= LogProcessor
-
-#LogProcessor_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
-#							  -Wno-deprecated \
-#							  -fmessage-length=0 \
-#							  -fdiagnostics-show-location=once
-
-LogProcessor_SOURCES	= ../Package__Version.cc \
-							  LogProcessor.cc \
-							  LogProcessorMain.cc
-LogProcessor_LDADD		= $(LOFAR_DEPEND) $(libdir)/liblog_protocol.a
-LogProcessor_DEPENDENCIES=$(LOFAR_DEPEND)
-
-bin_SCRIPTS					= 
-
-NOINSTHDRS 					= LogProcessor.h
-
-INSTHDRS 					= 
-
-BUILT_SOURCES				= $(ph_HEADERS)
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir				= $(bindir)
-configfiles_DATA 			= 
-
-sysconf_DATA				= LogProcessor.conf \
-							  LogProcessor.log_prop 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/src/Makefile.am b/MAC/APL/CURTDBDaemons/src/Makefile.am
deleted file mode 100644
index 3678c84d1eab250392ac5138fc21cb65ec41fcd1..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/src/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-lib_LTLIBRARIES = libcurtdbdaemons.la
-libcurtdbdaemons_la_SOURCES = Package__Version.cc
-
-pkginclude_HEADERS = Package__Version.h
-
-SUBDIRS = LogProcessor KeyValueLogger SASGateway SoftwareMonitor
-
-bin_PROGRAMS = versioncurtdbdaemons
-
-versioncurtdbdaemons_SOURCES      = versioncurtdbdaemons.cc
-versioncurtdbdaemons_LDADD        = libcurtdbdaemons.la
-versioncurtdbdaemons_DEPENDENCIES = libcurtdbdaemons.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/Makefile.am b/MAC/APL/CURTDBDaemons/src/SASGateway/Makefile.am
deleted file mode 100644
index e5b0c123c98ef8eb45f8606a3c3b458956a28581..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Executables
-bin_PROGRAMS 				= SASGateway
-
-#SASGateway_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
-#							  -Wno-deprecated \
-#							  -fmessage-length=0 \
-#							  -fdiagnostics-show-location=once
-
-SASGateway_SOURCES		= ../Package__Version.cc \
-							  SASGateway.cc \
-							  SASGatewayMain.cc
-SASGateway_LDADD		= $(LOFAR_DEPEND)
-SASGateway_DEPENDENCIES = $(LOFAR_DEPEND)
-
-bin_SCRIPTS					= 
-
-NOINSTHDRS 					= SASGateway.h
-
-INSTHDRS 					= 
-
-BUILT_SOURCES				= $(ph_HEADERS)
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir				= $(bindir)
-configfiles_DATA 			= 
-
-sysconf_DATA				= SASGateway.conf
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/Makefile.am b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/Makefile.am
deleted file mode 100644
index a8282fa83fe5e04606bb8602197d2decd1650a78..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-bin_PROGRAMS 				= SoftwareMonitor
-
-SoftwareMonitor_CPPFLAGS	= -Wno-deprecated \
-							  -fmessage-length=0 \
-							  -fdiagnostics-show-location=once
-
-SoftwareMonitor_SOURCES		= ../Package__Version.cc \
-							  SoftwareMonitorMain.cc \
-							  SoftwareMonitor.cc  
-
-SoftwareMonitor_LDADD		= $(LOFAR_DEPEND)
-SoftwareMonitor_DEPENDENCIES= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= SoftwareMonitor.h \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-sysconf_DATA				= SoftwareMonitor.conf
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/test/Makefile.am b/MAC/APL/CURTDBDaemons/test/Makefile.am
deleted file mode 100644
index 271ce493f777929446c2516f874bd0eb51aca413..0000000000000000000000000000000000000000
--- a/MAC/APL/CURTDBDaemons/test/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AM_CPPFLAGS						= -I$(top_builddir)/include
-
-bin_PROGRAMS					= tLoggingProcessor tKeyValueLogger
-
-tLoggingProcessor_SOURCES		= tLoggingProcessor.cc
-tLoggingProcessor_LDADD			= $(libdir)/liblog_protocol.a
-tLoggingProcessor_DEPENDENCIES	= $(LOFAR_DEPEND) $(libdir)/liblog_protocol.a
-
-tKeyValueLogger_SOURCES			= tKeyValueLogger.cc
-tKeyValueLogger_LDADD			= $(libdir)/libkvt_protocol.a $(libdir)/libeventport.a
-tKeyValueLogger_DEPENDENCIES	= $(LOFAR_DEPEND) $(libdir)/libkvt_protocol.a $(libdir)/libeventport.a
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/MD_Protocol/MD_Protocol.spec.in b/MAC/APL/MD_Protocol/MD_Protocol.spec.in
deleted file mode 100644
index 38f64d3376d27031179342dec7141007b6b8e3fe..0000000000000000000000000000000000000000
--- a/MAC/APL/MD_Protocol/MD_Protocol.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# MD_Protocol.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: MD_Protocol contains the metadata datastructures
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-MD_Protocol is a package containing the metadata structures exchanged within MAC.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/MD_Protocol/Makefile.am b/MAC/APL/MD_Protocol/Makefile.am
deleted file mode 100644
index 2d1d51ce80a93b7abf74a59c58468f8edb6b58a3..0000000000000000000000000000000000000000
--- a/MAC/APL/MD_Protocol/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-SUBDIRS	= src include test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      MD_Protocol.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/MD_Protocol/bootstrap b/MAC/APL/MD_Protocol/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/MD_Protocol/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/MD_Protocol/configure.in b/MAC/APL/MD_Protocol/configure.in
deleted file mode 100644
index f731be7a1eed7d5ae9feb8252d4f993d87877d45..0000000000000000000000000000000000000000
--- a/MAC/APL/MD_Protocol/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MD_Protocol, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/GCF_Event.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/MD_Protocol/Makefile
-src/Makefile
-test/Makefile
-Makefile
-MD_Protocol.spec
-)
diff --git a/MAC/APL/MD_Protocol/include/MD_Protocol/Makefile.am b/MAC/APL/MD_Protocol/include/MD_Protocol/Makefile.am
deleted file mode 100644
index de30d6f5671c235ffc50069efa593935d6fc227b..0000000000000000000000000000000000000000
--- a/MAC/APL/MD_Protocol/include/MD_Protocol/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INSTHDRS = \
-	BeamletAllocation.h  \
-	BlAllocArr.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-pkgincludedir = $(includedir)/MD_Protocol
-pkginclude_HEADERS = Package__Version.h  $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/MD_Protocol/include/Makefile.am b/MAC/APL/MD_Protocol/include/Makefile.am
deleted file mode 100644
index 591d88cc4c271e0f0fee310bfab62d50e22b8784..0000000000000000000000000000000000000000
--- a/MAC/APL/MD_Protocol/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS	= MD_Protocol
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/MD_Protocol/src/Makefile.am b/MAC/APL/MD_Protocol/src/Makefile.am
deleted file mode 100644
index dce738ce406df30911a4c642e1cbd31734fd93f7..0000000000000000000000000000000000000000
--- a/MAC/APL/MD_Protocol/src/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/MD_Protocol
-
-EXTRA_DIST = \
-	MD_Protocol.prot 
-
-BUILT_SOURCES = \
-	MD_Protocol.ph \
-	MD_Protocol.cc
-
-pkgincludedir=$(includedir)/MD_Protocol
-pkginclude_HEADERS = \
-	$(BUILT_SOURCES)
-
-lib_LTLIBRARIES         = libmd_protocol.la
-
-libmd_protocol_la_SOURCES = Package__Version.cc  \
-	$(BUILT_SOURCES) \
-	BeamletAllocation.cc \
-	BlAllocArr.cc
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versionmd_protocol
-
-versionmd_protocol_SOURCES      = versionmd_protocol.cc
-versionmd_protocol_LDADD        = libmd_protocol.la
-versionmd_protocol_DEPENDENCIES = libmd_protocol.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/MainCU/MainCU.spec.in b/MAC/APL/MainCU/MainCU.spec.in
deleted file mode 100644
index f68a74235b7cd4ccafbbf56e564be2746712462e..0000000000000000000000000000000000000000
--- a/MAC/APL/MainCU/MainCU.spec.in
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# MCU.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The MCU contains all controller for the MainCU.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: OTDB = 1.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: GCFPAL = 6.0
-Requires: APLCommon = 3.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The MCU contains all controller for the MainCU:
-MacScheduler that scans the SAS database for new observations.
-ObservationCtrl that is the maincontroller for each observation.
-BeamDirection that makes sure that all station point in the same direction.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/MainCU/Makefile.am b/MAC/APL/MainCU/Makefile.am
deleted file mode 100644
index 972b3523d38f868cf15d98dec944912db5e9eed7..0000000000000000000000000000000000000000
--- a/MAC/APL/MainCU/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      MainCU.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/MainCU/bootstrap b/MAC/APL/MainCU/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/MainCU/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/MainCU/configure.in b/MAC/APL/MainCU/configure.in
deleted file mode 100644
index c30a8d7bae4354ab9309fc49de22fce15a212d59..0000000000000000000000000000000000000000
--- a/MAC/APL/MainCU/configure.in
+++ /dev/null
@@ -1,79 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MainCU, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-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,,)
-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(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)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-src/MACScheduler/Makefile
-src/ObservationControl/Makefile
-Makefile
-MainCU.spec
-)
diff --git a/MAC/APL/MainCU/src/MACScheduler/Makefile.am b/MAC/APL/MainCU/src/MACScheduler/Makefile.am
deleted file mode 100644
index 18a81161372f4fca901707f4fb358c74acfec33e..0000000000000000000000000000000000000000
--- a/MAC/APL/MainCU/src/MACScheduler/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-bin_PROGRAMS 				= MACScheduler 
-
-MACScheduler_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
-							  -Wno-deprecated \
-							  -fmessage-length=0 \
-							  -fdiagnostics-show-location=once
-
-MACScheduler_SOURCES		= ../Package__Version.cc \
-							  MACScheduler.cc \
-							  ObsClaimer.cc \
-							  MACSchedulerMain.cc
-
-MACScheduler_LDADD			= -lpqxx $(LOFAR_DEPEND)
-MACScheduler_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= MACScheduler.h \
-							  ObsClaimer.h \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-
-sysconf_DATA		= MACScheduler.conf
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/MainCU/src/Makefile.am b/MAC/APL/MainCU/src/Makefile.am
deleted file mode 100644
index d00f562370c83fbaebc28fd9b9afa54d9de526b5..0000000000000000000000000000000000000000
--- a/MAC/APL/MainCU/src/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-lib_LTLIBRARIES = libmaincu.la
-libmaincu_la_SOURCES = Package__Version.cc
-
-pkginclude_HEADERS = Package__Version.h
-
-SUBDIRS = MACScheduler ObservationControl
-
-bin_PROGRAMS = versionmaincu
-
-versionmaincu_SOURCES      = versionmaincu.cc
-versionmaincu_LDADD        = libmaincu.la
-versionmaincu_DEPENDENCIES = libmaincu.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/MainCU/src/ObservationControl/Makefile.am b/MAC/APL/MainCU/src/ObservationControl/Makefile.am
deleted file mode 100644
index dec4c2bef6053e0dc380ca198b1f1159e34a3600..0000000000000000000000000000000000000000
--- a/MAC/APL/MainCU/src/ObservationControl/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-bin_PROGRAMS 				= ObservationControl
-
-ObservationControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once
-
-ObservationControl_SOURCES		= ../Package__Version.cc \
-							 	  ObservationControl.cc \
-								  ObservationControlMain.cc 
-
-ObservationControl_LDADD		= $(LOFAR_DEPEND)
-ObservationControl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= ObservationControl.h \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/BS_Protocol/BS_Protocol.spec.in b/MAC/APL/PAC/BS_Protocol/BS_Protocol.spec.in
deleted file mode 100644
index 4ad6444d846194b3f0b89bc0562db290f81ce241..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/BS_Protocol.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# BS_Protocol.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: BS_Protocol is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-BS_Protocol ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/BS_Protocol/Makefile.am b/MAC/APL/PAC/BS_Protocol/Makefile.am
deleted file mode 100644
index eac0f949a441a99ae0b890e487e91237ea624cc9..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix) \
-	--with-rsp_protocol=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      BS_Protocol.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/BS_Protocol/bootstrap b/MAC/APL/PAC/BS_Protocol/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/BS_Protocol/configure.in b/MAC/APL/PAC/BS_Protocol/configure.in
deleted file mode 100644
index c4bcfb04c87c9f99abefb6b7bae3feb6baa2090c..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/configure.in
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(BS_Protocol, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, , 1, AMCBase/Converter.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/APL/BS_Protocol/Makefile
-src/Makefile
-test/Makefile
-Makefile
-BS_Protocol.spec
-)
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
deleted file mode 100644
index 3271f67221f756e7582243b210e26b3c07d6d044..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pkgincludedir = $(includedir)/APL/BS_Protocol
-pkginclude_HEADERS = Package__Version.h \
-					 Beamlet2SubbandMap.h \
-					 Pointing.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/BS_Protocol/include/Makefile.am b/MAC/APL/PAC/BS_Protocol/include/Makefile.am
deleted file mode 100644
index 111289bd469051ecc3c6cf1319d1552f262c01f6..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APL/BS_Protocol
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/BS_Protocol/src/Makefile.am b/MAC/APL/PAC/BS_Protocol/src/Makefile.am
deleted file mode 100644
index 52b7ad1dddee5fdb271e675e0f73471246e1153f..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/src/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-
-AM_CPPFLAGS = -I$(top_builddir)/include
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/BS_Protocol
-
-EXTRA_DIST		= BS_Protocol.prot 
-
-BUILT_SOURCES	= BS_Protocol.ph 
-
-pkgincludedir	= $(includedir)/APL/BS_Protocol
-
-pkginclude_HEADERS = $(BUILT_SOURCES)
-
-lib_LTLIBRARIES	= libbs_protocol.la 
-
-libbs_protocol_la_SOURCES = Package__Version.cc \
-	BS_Protocol.ph \
-	BS_Protocol.cc \
-	Beamlet2SubbandMap.cc \
-	Pointing.cc
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versionbs_protocol
-
-versionbs_protocol_SOURCES      = versionbs_protocol.cc
-versionbs_protocol_LDADD        = libbs_protocol.la
-versionbs_protocol_DEPENDENCIES = libbs_protocol.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/BS_Protocol/test/Makefile.am b/MAC/APL/PAC/BS_Protocol/test/Makefile.am
deleted file mode 100644
index a790f429ef0122014f0c2e8d65fd0ff06cc0d7b2..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BS_Protocol/test/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-# scripts used to run tests
-TESTSCRIPTS           =
-
-# scripts and possible programs to run tests
-TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS)
-
-# Lines to build a test program testprg
-#testprg_SOURCES		= testprg.cc
-#testprg_LDADD			= ../src/libbs_protocol.la
-#testprg_DEPENDENCIES		= ../src/libbs_protocol.la $(LOFAR_DEPEND)
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/Beam_Server/BeamServer.spec.in b/MAC/APL/PAC/Beam_Server/BeamServer.spec.in
deleted file mode 100644
index af0b9218b15c48e19ec744f093fb8b7175084b03..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Beam_Server/BeamServer.spec.in
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# BeamServer.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The BeamServer is a real-time control process that computes beamformer weights for the LOFAR remote station.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The BeamServer is a control process that calculates beamformer weights
-for upto eight beams. It sends the weights to the RSPDriver which in turn
-sends the weights to the RSP hardware.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/Beam_Server/Makefile.am b/MAC/APL/PAC/Beam_Server/Makefile.am
deleted file mode 100644
index 337fbdc4f48ea7798b193870fa4cb6ec7ac595f0..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Beam_Server/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-SUBDIRS = src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix)\
-	--with-suite=$(prefix)\
-	--with-gcftm=$(prefix)\
-	--with-rsp=$(prefix)
-
-EXTRA_DIST = \
-	Makefile.common \
-	BeamServer.spec \
-	autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/Beam_Server/bootstrap b/MAC/APL/PAC/Beam_Server/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Beam_Server/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/Beam_Server/configure.in b/MAC/APL/PAC/Beam_Server/configure.in
deleted file mode 100644
index 84e55f4c70ee4cada406a7f5f415ea7899598f28..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Beam_Server/configure.in
+++ /dev/null
@@ -1,86 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/BeamServer.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Beam_Server, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl For the am_rpm_init.m4 macros
-RPM_RELEASE=1
-AC_SUBST(RPM_RELEASE)
-
-AM_RPM_INIT
-dnl Enable or disable the rpm making rules in Makefile.am
-AM_CONDITIONAL(MAKE_RPMS, test x$make_rpms = xtrue)
-
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/StationConfig.h,,)
-dnl lofar_INTERNAL(MAC/APL/TestSuite, TestSuite, , 1, TestSuite/suite.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/CAL_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/BS_Protocol, BS_Protocol, , 1, APL/BS_Protocol/BS_Protocol.ph,,)
-lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, , 1, AMCBase/Converter.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-	BeamServer.spec
-	Makefile
-	src/Makefile
-	test/Makefile
-)
diff --git a/MAC/APL/PAC/Beam_Server/src/Makefile.am b/MAC/APL/PAC/Beam_Server/src/Makefile.am
deleted file mode 100644
index 8f2a2ce712b68fd4976f842c6a363535fa0a292a..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Beam_Server/src/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-#
-# if USE_CAL_THREAD is defined in Calibration/src/Makefile.am it should be
-# defined here as well and vice versa
-#
-
-AM_CPPFLAGS 			= -I$(top_srcdir)/src \
-						  -DUSE_CAL_THREAD
-
-AUTOGEN 				= autogen
-SUFFIXES 				= .ph
-
-BUILT_SOURCES 			= BeamServer.conf \
-						  beamctl.conf
-
-EXTRA_DIST 				= $(BUILT_SOURCES)
-
-sysconf_DATA 			= BeamServer.conf \
-						  beamctl.conf
-
-lib_LTLIBRARIES 		= libabsdevel.la
-libabsdevel_la_SOURCES 	= Package__Version.cc \
-						  Beam.h \
-						  Beam.cc \
-						  Beamlet.h \
-						  Beamlet.cc \
-						  Beams.h \
-						  Beams.cc \
-						  Beamlets.h \
-						  Beamlets.cc
-
-bin_PROGRAMS 			= versionbeam_server BeamServer beamctl
-
-BeamServer_SOURCES 		= BeamServerMain.cc BeamServer.h BeamServerConstants.h BeamServer.cc
-BeamServer_LDADD 		= libabsdevel.la
-BeamServer_DEPENDENCIES	= libabsdevel.la $(LOFAR_DEPEND)
-
-beamctl_SOURCES 		= beamctl.h beamctl.cc
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-%.properties: %.properties.in
-	cp $< $@
-
-%.log_prop: %.log_prop.in
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-
-versionbeam_server_SOURCES      = versionbeam_server.cc
-versionbeam_server_LDADD        = libabsdevel.la
-versionbeam_server_DEPENDENCIES = libabsdevel.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/Beam_Server/test/Makefile.am b/MAC/APL/PAC/Beam_Server/test/Makefile.am
deleted file mode 100644
index 09e85bf1b024431f30757c35c1f069139344d409..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Beam_Server/test/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-
-#
-# if USE_CAL_THREAD is defined in Calibration/src/Makefile.am it should be
-# defined here as well and vice versa
-#
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/test \
-	-DUSE_CAL_THREAD
-
-#	CheckWeightsTest 
-#	CheckWeightsTest2 
-
-TESTS = 
-#	avtstub.sh 
-#	BeamServerTest 
-
-#bin_PROGRAMS = BeamServerTest
-#	AVTStub 
-#	EPATest 
-#	SweepTest
-
-bin_SCRIPTS = \
-	beamctltest
-
-#	BeamServerTest 
-#	CheckWeightsTest2 
-
-#check_PROGRAMS = BeamServerTest
-
-#BeamServerTest_SOURCES	= BSTest.h  BeamServerTest.cc
-#BeamServerTest_LDADD 	= $(top_builddir)/src/libabsdevel.la
-
-#CheckWeightsTest_SOURCES = CheckWeightsTest.cc
-#CheckWeightsTest_LDADD = $(top_builddir)/src/libabs.la $(top_builddir)/src/libabsdevel.la
-
-#CheckWeightsTest2_SOURCES = CheckWeightsTest2.cc
-#CheckWeightsTest2_LDADD = $(top_builddir)/src/libabs.la $(top_builddir)/src/libabsdevel.la
-
-#AVTStub_SOURCES 	= AVTStub.h AVTStub.cc
-#AVTStub_LDADD 		= $(top_builddir)/src/libabsdevel.la
-
-#EPATest_SOURCES 	= EPATest.h EPATest.cc
-#EPATest_LDADD 		= $(top_builddir)/src/libabsdevel.la
-
-#SweepTest_SOURCES 	=  SweepTest.h  SweepTest.cc
-#SweepTest_LDADD 	= $(top_builddir)/src/libabsdevel.la
-
-BUILT_SOURCES = \
-	AVTStub.conf \
-	EPATest.conf \
-	SweepTest.conf \
-	BeamServerTest.conf
-
-EXTRA_DIST = \
-	$(BUILT_SOURCES) \
-	avtstub.sh \
-	weights.dat
-
-sysconf_DATA = \
-	AVTStub.conf \
-	EPATest.conf \
-	SweepTest.conf \
-	BeamServerTest.conf
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/PAC/CAL_Protocol/CAL_Protocol.spec.in b/MAC/APL/PAC/CAL_Protocol/CAL_Protocol.spec.in
deleted file mode 100644
index 9b2db864eb3e6b51f0c411d60d01322a92ff4f1d..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/CAL_Protocol.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CAL_Protocol.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The CAL_Protocol library can be used to communicate with the CalServer calibration process.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The CAL_Protocol library implements the protocol towards the CalServer calibration
-process. Any programs wishing to communicate with the CalServer can use this
-library.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/CAL_Protocol/Makefile.am b/MAC/APL/PAC/CAL_Protocol/Makefile.am
deleted file mode 100644
index 5a2bf1c32ec9ff6f54a52f47bd5e641ac6c1b97d..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      CAL_Protocol.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/CAL_Protocol/bootstrap b/MAC/APL/PAC/CAL_Protocol/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/CAL_Protocol/configure.in b/MAC/APL/PAC/CAL_Protocol/configure.in
deleted file mode 100644
index c2797d056bb1b7a4f60250d0c7edc4221002777d..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(CAL_Protocol, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.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)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/APL/CAL_Protocol/Makefile
-src/Makefile
-test/Makefile
-Makefile
-CAL_Protocol.spec
-)
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
deleted file mode 100644
index 2ba029878324aca0ad3c444c09112c7111f50c04..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-pkgincludedir 		= $(includedir)/APL/CAL_Protocol
-pkginclude_HEADERS	= Package__Version.h \
-					  AntennaArray.h \
-					  AntennaArrayData.h \
-					  AntennaGains.h \
-					  SharedResource.h \
-					  SpectralWindow.h \
-					  SubArray.h \
-					  CalibrationInterface.h \
-					  ACC.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/CAL_Protocol/include/Makefile.am b/MAC/APL/PAC/CAL_Protocol/include/Makefile.am
deleted file mode 100644
index 259f307c665ca6b6d037bc32eecda63402ad15ce..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APL/CAL_Protocol
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/CAL_Protocol/src/Makefile.am b/MAC/APL/PAC/CAL_Protocol/src/Makefile.am
deleted file mode 100644
index 9a66253f87ca926431ff236459f3c22b287357dc..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/src/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/CAL_Protocol
-
-EXTRA_DIST = \
-	CAL_Protocol.prot
-
-BUILT_SOURCES = \
-	CAL_Protocol.ph
-
-pkgincludedir=$(includedir)/APL/CAL_Protocol
-pkginclude_HEADERS = \
-	$(BUILT_SOURCES)
-
-lib_LTLIBRARIES = \
-	libcal_protocol.la
-
-libcal_protocol_la_SOURCES = Package__Version.cc \
-	$(BUILT_SOURCES) \
-	CAL_Protocol.cc \
-	AntennaArray.cc \
-	AntennaArrayData.cc \
-	AntennaGains.cc \
-	SpectralWindow.cc \
-	SubArray.cc \
-	ACC.cc
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versioncal_protocol
-
-versioncal_protocol_SOURCES      = versioncal_protocol.cc
-versioncal_protocol_LDADD        = libcal_protocol.la
-versioncal_protocol_DEPENDENCIES = libcal_protocol.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/CAL_Protocol/test/Makefile.am b/MAC/APL/PAC/CAL_Protocol/test/Makefile.am
deleted file mode 100644
index 897978e94b4b809996024100fa936ec83cd9d368..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CAL_Protocol/test/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-# scripts used to run tests
-TESTSCRIPTS           =
-
-# scripts and possible programs to run tests
-TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS)
-
-# Lines to build a test program testprg
-#testprg_SOURCES		= testprg.cc
-#testprg_LDADD			= ../src/libcal_protocol.la
-#testprg_DEPENDENCIES		= ../src/libcal_protocol.la $(LOFAR_DEPEND)
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/Cal_Server/CalServer.spec.in b/MAC/APL/PAC/Cal_Server/CalServer.spec.in
deleted file mode 100644
index 64937be5edac37c523ea7fd77ee06c77773f7b6b..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Cal_Server/CalServer.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CalServer.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The CalServer program is part of the LOFAR station control software.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The CalServer program is responsible for defining and calibrating
-subarrays of the LOFAR remote station. It is part of the remote
-station control software.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/Cal_Server/Makefile.am b/MAC/APL/PAC/Cal_Server/Makefile.am
deleted file mode 100644
index 0e5bbe1e9a1dd700d31ff9a78472916918c15f96..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Cal_Server/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-SUBDIRS = src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      CalServer.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/Cal_Server/bootstrap b/MAC/APL/PAC/Cal_Server/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Cal_Server/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/Cal_Server/configure.in b/MAC/APL/PAC/Cal_Server/configure.in
deleted file mode 100644
index 7f04092b036e82142aa604c1d3998c353dbcdee3..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Cal_Server/configure.in
+++ /dev/null
@@ -1,80 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/CalServer.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Cal_Server, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-
-lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, , 1, AMCBase/Converter.h,,)
-lofar_INTERNAL(LCS/Blob, Blob, , 1, Blob/BlobField.h,,)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/StationConfig.h,,)
-lofar_INTERNAL(MAC/APL/TestSuite, TestSuite, , 1, TestSuite/suite.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/SubArray.h,,)
-#lofar_EXTERNAL(g2c, 1,,,,,,, "-lg2c")
-#lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm")
-lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-	Makefile
-	src/Makefile
-	test/Makefile
-	CalServer.spec
-)
diff --git a/MAC/APL/PAC/Cal_Server/src/Makefile.am b/MAC/APL/PAC/Cal_Server/src/Makefile.am
deleted file mode 100644
index 5eacc80c74ba4800ebfa2bfd0fbf9ae4fe695744..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Cal_Server/src/Makefile.am
+++ /dev/null
@@ -1,94 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-
-#AM_CPPFLAGS = -DUSE_CAL_THREAD
-AM_CPPFLAGS = -DUSE_CAL_THREAD
-
-#-fmessage-length=0 // needed for Eclipse
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-BUILT_SOURCES = \
-	CalServer.conf \
-	DipoleModel.conf \
-	SourceCatalog.conf 
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-sysconf_DATA = \
-	CalServer.conf \
-	DipoleModel.conf \
-	SourceCatalog.conf
-
-%.conf: %.conf.in
-	cp $< $@
-
-# protocol library, use this to use the CAL protocol
-lib_LTLIBRARIES = libcaldevel.la
-
-# convenience library
-# lib_LTLIBRARIES = libcaldevel.la
-
-libcaldevel_ladir = $(prefix)/include
-
-libcaldevel_la_SOURCES = Package__Version.cc  \
-	CalibrationAlgorithm.h \
-	CalibrationAlgorithm.cc \
-	CalibrationThread.h \
-	CalibrationThread.cc \
-	DipoleModel.h \
-	DipoleModel.cc \
-	DipoleModelData.h \
-	DipoleModelData.cc \
-	Documentation.h \
-	RemoteStationCalibration.h \
-	RemoteStationCalibration.cc \
-	Source.h \
-	Source.cc \
-	SourceData.h \
-	SourceData.cc \
-	SubArrays.h \
-	SubArrays.cc \
-	SubArraySubscription.h \
-	SubArraySubscription.cc 
-
-bin_PROGRAMS = versioncal_server \
-	CalServer \
-	calinfo
-
-sbin_PROGRAMS = juggle_acc
-
-CalServer_SOURCES = \
-	CalServer.h \
-	CalServer.cc \
-	ACMProxy.h \
-	ACMProxy.cc
-
-CalServer_LDADD = \
-	libcaldevel.la
-
-#	-lrtccommon
-
-juggle_acc_SOURCES = \
-	juggle_acc.cc
-
-calinfo_SOURCES = \
-	calinfo.cc
-
-CalServer_DEPENDENCIES = \
-	libcaldevel.la \
-	$(LOFAR_DEPEND)
-
-clean-local:
-	rm -f *.ph
-
-versioncal_server_SOURCES      = versioncal_server.cc
-versioncal_server_LDADD        = libcaldevel.la
-versioncal_server_DEPENDENCIES = libcaldevel.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/Cal_Server/test/Makefile.am b/MAC/APL/PAC/Cal_Server/test/Makefile.am
deleted file mode 100644
index c1ab2bf192be89018a4f2bbd687158ad8ae7cfb9..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/Cal_Server/test/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/test
-
-#TESTS = \
-#	CalTest
-
-bin_PROGRAMS = \
-	CalTest
-
-check_PROGRAMS = \
-	CalTest
-
-CalTest_SOURCES = \
-	CalTest.h \
-	CalTest.cc
-
-BUILT_SOURCES = \
-	CalTest.conf
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-sysconf_DATA = \
-	CalTest.conf
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/IBS_Protocol/IBS_Protocol.spec.in b/MAC/APL/PAC/IBS_Protocol/IBS_Protocol.spec.in
deleted file mode 100644
index f1549f4ce076cc27351a6b72a6f83f104658fed3..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/IBS_Protocol/IBS_Protocol.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# IBS_Protocol.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: IBS_Protocol is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-IBS_Protocol ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/IBS_Protocol/Makefile.am b/MAC/APL/PAC/IBS_Protocol/Makefile.am
deleted file mode 100644
index 9d285ed9bd3bb95cb414b0609707b9189ef4e505..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/IBS_Protocol/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBDIRS = src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix) \
-	--with-rsp_protocol=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      IBS_Protocol.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/IBS_Protocol/bootstrap b/MAC/APL/PAC/IBS_Protocol/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/IBS_Protocol/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/IBS_Protocol/configure.in b/MAC/APL/PAC/IBS_Protocol/configure.in
deleted file mode 100644
index 117ac030b21f9e7b7437a46653f5ba7e7031ceec..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/IBS_Protocol/configure.in
+++ /dev/null
@@ -1,70 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(IBS_Protocol, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/Marshalling.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/APL/IBS_Protocol/Makefile
-src/Makefile
-Makefile
-IBS_Protocol.spec
-)
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Makefile.am b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Makefile.am
deleted file mode 100644
index a839513bd280cf339b5963217da001849d496083..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pkgincludedir = $(includedir)/APL/IBS_Protocol
-pkginclude_HEADERS = Package__Version.h \
-					 Beamlet2SubbandMap.h \
-					 Pointing.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/IBS_Protocol/include/Makefile.am b/MAC/APL/PAC/IBS_Protocol/include/Makefile.am
deleted file mode 100644
index 49b1c892593827058cdb1ba7f91728dcf3d8042b..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/IBS_Protocol/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APL/IBS_Protocol
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/IBS_Protocol/src/Makefile.am b/MAC/APL/PAC/IBS_Protocol/src/Makefile.am
deleted file mode 100644
index 08d3589a8aeffadd46e2955904ce11e01d56da1e..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/IBS_Protocol/src/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-
-AM_CPPFLAGS = -I$(top_builddir)/include
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/IBS_Protocol
-
-EXTRA_DIST		= IBS_Protocol.prot 
-
-BUILT_SOURCES	= IBS_Protocol.ph
-
-pkgincludedir	= $(includedir)/APL/IBS_Protocol
-
-pkginclude_HEADERS = $(BUILT_SOURCES)
-
-lib_LTLIBRARIES	= libibs_protocol.la
-
-libibs_protocol_la_SOURCES = Package__Version.cc \
-	IBS_Protocol.ph \
-	IBS_Protocol.cc \
-	Beamlet2SubbandMap.cc \
-	Pointing.cc
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versionibs_protocol
-
-versionibs_protocol_SOURCES      = versionibs_protocol.cc
-versionibs_protocol_LDADD        = libibs_protocol.la
-versionibs_protocol_DEPENDENCIES = libibs_protocol.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ICAL_Protocol/ICAL_Protocol.spec.in b/MAC/APL/PAC/ICAL_Protocol/ICAL_Protocol.spec.in
deleted file mode 100644
index ddaeb2f104301003ffde6d11c1c6444c0798d250..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ICAL_Protocol/ICAL_Protocol.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# ICAL_Protocol.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The ICAL_Protocol library can be used to communicate with the CalServer calibration process.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The ICAL_Protocol library implements the protocol towards the CalServer calibration
-process. Any programs wishing to communicate with the CalServer can use this
-library.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/ICAL_Protocol/Makefile.am b/MAC/APL/PAC/ICAL_Protocol/Makefile.am
deleted file mode 100644
index 884573d2a4e998ad01c11c83ba1b84371b0c0cd1..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ICAL_Protocol/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS=src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      ICAL_Protocol.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ICAL_Protocol/bootstrap b/MAC/APL/PAC/ICAL_Protocol/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ICAL_Protocol/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/ICAL_Protocol/configure.in b/MAC/APL/PAC/ICAL_Protocol/configure.in
deleted file mode 100644
index 56de927f15b1ca705150d4498542eb6073781735..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ICAL_Protocol/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ICAL_Protocol, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.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)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/APL/ICAL_Protocol/Makefile
-src/Makefile
-test/Makefile
-Makefile
-ICAL_Protocol.spec
-)
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/Makefile.am b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/Makefile.am
deleted file mode 100644
index 8eb56433ad70d4cbd5e05d00ab78b8d641067d96..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-pkgincludedir 		= $(includedir)/APL/ICAL_Protocol
-pkginclude_HEADERS	= Package__Version.h \
-					  AntennaArray.h \
-					  AntennaArrayData.h \
-					  AntennaGains.h \
-					  SharedResource.h \
-					  SpectralWindow.h \
-					  SubArray.h \
-					  CalibrationInterface.h \
-					  ACC.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/Makefile.am b/MAC/APL/PAC/ICAL_Protocol/include/Makefile.am
deleted file mode 100644
index 696a313e26c2edc612fb739696cce2b434601710..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ICAL_Protocol/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APL/ICAL_Protocol
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/Makefile.am b/MAC/APL/PAC/ICAL_Protocol/src/Makefile.am
deleted file mode 100644
index 48069a47dc13fb75eb27a4e2b176b3f43007f4a1..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ICAL_Protocol/src/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/ICAL_Protocol
-
-EXTRA_DIST = \
-	ICAL_Protocol.prot
-
-BUILT_SOURCES = \
-	ICAL_Protocol.ph
-
-pkgincludedir=$(includedir)/APL/ICAL_Protocol
-pkginclude_HEADERS = \
-	$(BUILT_SOURCES)
-
-lib_LTLIBRARIES = \
-	libcal_protocol.la
-
-libcal_protocol_la_SOURCES = Package__Version.cc \
-	$(BUILT_SOURCES) \
-	ICAL_Protocol.cc \
-	AntennaArray.cc \
-	AntennaArrayData.cc \
-	AntennaGains.cc \
-	SpectralWindow.cc \
-	SubArray.cc \
-	ACC.cc
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versioncal_protocol
-
-versioncal_protocol_SOURCES      = versioncal_protocol.cc
-versioncal_protocol_LDADD        = libcal_protocol.la
-versioncal_protocol_DEPENDENCIES = libcal_protocol.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ITRFBeamServer/Makefile.am b/MAC/APL/PAC/ITRFBeamServer/Makefile.am
deleted file mode 100644
index 6fa64e2cb78461e412ef78287eadbe3545ffa195..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFBeamServer/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-SUBDIRS = src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix)\
-	--with-suite=$(prefix)\
-	--with-gcftm=$(prefix)\
-	--with-rsp=$(prefix)
-
-EXTRA_DIST = \
-	Makefile.common \
-	BeamServer.spec \
-	autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ITRFBeamServer/bootstrap b/MAC/APL/PAC/ITRFBeamServer/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFBeamServer/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/ITRFBeamServer/configure.in b/MAC/APL/PAC/ITRFBeamServer/configure.in
deleted file mode 100644
index b0560a9e5f6b60b62bd0de48a3c84881f67dce9a..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFBeamServer/configure.in
+++ /dev/null
@@ -1,86 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/BeamServer.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ITRFBeamServer, 0.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl For the am_rpm_init.m4 macros
-RPM_RELEASE=1
-AC_SUBST(RPM_RELEASE)
-
-AM_RPM_INIT
-dnl Enable or disable the rpm making rules in Makefile.am
-AM_CONDITIONAL(MAKE_RPMS, test x$make_rpms = xtrue)
-
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_AIPSPP(1,"-lmeasures -ltables -lscimath -lscimath_f -lcasa")
-
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/StationConfig.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/CAL_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/IBS_Protocol, IBS_Protocol, , 1, APL/IBS_Protocol/IBS_Protocol.ph,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/AntennaPos.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, , 1, AMCBase/Converter.h,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-	Makefile
-	src/Makefile
-	test/Makefile
-)
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Makefile.am b/MAC/APL/PAC/ITRFBeamServer/src/Makefile.am
deleted file mode 100644
index 703e6b6357e411c6991d35ccb3217fccf974118c..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFBeamServer/src/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-#
-# if USE_CAL_THREAD is defined in Calibration/src/Makefile.am it should be
-# defined here as well and vice versa
-#
-
-AM_CPPFLAGS 			= -I$(top_srcdir)/src \
-						  -DUSE_CAL_THREAD
-
-AUTOGEN 				= autogen
-SUFFIXES 				= .ph
-
-BUILT_SOURCES 			= 
-
-EXTRA_DIST 				= $(BUILT_SOURCES)
-
-sysconf_DATA 			= 
-
-bin_PROGRAMS 			= iBeamServer ibeamctl
-
-iBeamServer_SOURCES 		= BeamServerMain.cc BeamServerConstants.h \
-							  BeamServer.h BeamServer.cc \
-							  Beam.h Beam.cc \
-							  DigitalBeam.h DigitalBeam.cc \
-							  AnalogueBeam.h AnalogueBeam.cc \
-							  AnaBeamMgr.h AnaBeamMgr.cc \
-							  J2000Converter.h J2000Converter.cc \
-							  CasaConverter.h CasaConverter.cc
-iBeamServer_LDADD 			= 
-iBeamServer_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-ibeamctl_SOURCES 		= beamctl.cc
-ibeamctl_LDADD 			= 
-ibeamctl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-%.properties: %.properties.in
-	cp $< $@
-
-%.log_prop: %.log_prop.in
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/Makefile.am b/MAC/APL/PAC/ITRFBeamServer/test/Makefile.am
deleted file mode 100644
index 59a3be7b4cc58417309e08bc3f95076e5559ef83..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFBeamServer/test/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-check_PROGRAMS			= tConverter tJ2000Converter tAnaBeamMgr
-
-tConverter_SOURCES		= tConverter.cc
-tConverter_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-tJ2000Converter_SOURCES			= tJ2000Converter.cc ../src/J2000Converter.cc
-tJ2000Converter_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-tAnaBeamMgr_SOURCES			= tAnaBeamMgr.cc ../src/Beam.cc ../src/AnalogueBeam.cc ../src/AnaBeamMgr.cc ../src/CasaConverter.cc
-tAnaBeamMgr_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ITRFCalServer/CalServer.spec.in b/MAC/APL/PAC/ITRFCalServer/CalServer.spec.in
deleted file mode 100644
index 64937be5edac37c523ea7fd77ee06c77773f7b6b..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFCalServer/CalServer.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CalServer.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The CalServer program is part of the LOFAR station control software.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The CalServer program is responsible for defining and calibrating
-subarrays of the LOFAR remote station. It is part of the remote
-station control software.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/ITRFCalServer/Makefile.am b/MAC/APL/PAC/ITRFCalServer/Makefile.am
deleted file mode 100644
index 0e5bbe1e9a1dd700d31ff9a78472916918c15f96..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFCalServer/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-SUBDIRS = src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      CalServer.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ITRFCalServer/bootstrap b/MAC/APL/PAC/ITRFCalServer/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFCalServer/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/ITRFCalServer/configure.in b/MAC/APL/PAC/ITRFCalServer/configure.in
deleted file mode 100644
index c031743ca87dddf427ea6b6ac690134eb703314d..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFCalServer/configure.in
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/CalServer.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ITRFCalServer, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_MATLAB(/opt/MATLAB/MATLAB_Compiler_Runtime/v78)
-
-lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, , 1, AMCBase/Converter.h,,)
-lofar_INTERNAL(LCS/Blob, Blob, , 1, Blob/BlobField.h,,)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-lofar_INTERNAL(MAC/APL/PAC/ICAL_Protocol, ICAL_Protocol, , 1, APL/ICAL_Protocol/SubArray.h,,)
-lofar_INTERNAL(MAC/APL/PAC/LBA_Calibration, LBA_Calibration, , 1, APL/LBA_Calibration/lba_calibration.h,,)
-#lofar_EXTERNAL(g2c, 1,,,,,,, "-lg2c")
-#lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm")
-lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-	Makefile
-	src/Makefile
-	test/Makefile
-	CalServer.spec
-)
diff --git a/MAC/APL/PAC/ITRFCalServer/src/Makefile.am b/MAC/APL/PAC/ITRFCalServer/src/Makefile.am
deleted file mode 100644
index 3d98da9b2555a84fc0ac357564ff1fb6a9285353..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFCalServer/src/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-
-#AM_CPPFLAGS = -DUSE_CAL_THREAD
-AM_CPPFLAGS = -DUSE_CAL_THREAD
-
-#-fmessage-length=0 // needed for Eclipse
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-BUILT_SOURCES = \
-	CalServer.conf \
-	DipoleModel.conf \
-	SourceCatalog.conf \
-	LBAntennas.conf \
-	HBAntennas.conf \
-	AntennaArrays.conf
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-sysconf_DATA = \
-	CalServer.conf \
-	DipoleModel.conf \
-	SourceCatalog.conf \
-	LBAntennas.conf \
-	HBAntennas.conf \
-	AntennaArrays.conf
-
-%.conf: %.conf.in
-	cp $< $@
-
-# protocol library, use this to use the CAL protocol
-lib_LTLIBRARIES = libcaldevel.la
-
-# convenience library
-# lib_LTLIBRARIES = libcaldevel.la
-
-libcaldevel_ladir = $(prefix)/include
-
-libcaldevel_la_SOURCES =  \
-	CalibrationThread.h \
-	CalibrationThread.cc \
-	DipoleModel.h \
-	DipoleModel.cc \
-	DipoleModelData.h \
-	DipoleModelData.cc \
-	Documentation.h \
-	LBACalibration.h \
-	LBACalibration.cc \
-	Source.h \
-	Source.cc \
-	SourceData.h \
-	SourceData.cc \
-	SubArrays.h \
-	SubArrays.cc \
-	SubArraySubscription.h \
-	SubArraySubscription.cc 
-
-bin_PROGRAMS = 	CalServer \
-				calinfo \
-				versioncalserver
-
-sbin_PROGRAMS = juggle_acc
-
-CalServer_SOURCES = \
-	CalServer.h \
-	CalServer.cc \
-	ACMProxy.h \
-	ACMProxy.cc
-
-CalServer_LDADD = \
-	libcaldevel.la
-
-#	-lrtccommon
-
-juggle_acc_SOURCES = \
-	juggle_acc.cc
-
-calinfo_SOURCES = \
-	calinfo.cc
-
-CalServer_DEPENDENCIES = \
-	libcaldevel.la \
-	$(LOFAR_DEPEND)
-
-clean-local:
-	rm -f *.ph
-
-versioncalserver_SOURCES      = versioncalserver.cc
-versioncalserver_LDADD        = libcaldevel.la
-versioncalserver_DEPENDENCIES = libcaldevel.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ITRFCalServer/test/Makefile.am b/MAC/APL/PAC/ITRFCalServer/test/Makefile.am
deleted file mode 100644
index c1ab2bf192be89018a4f2bbd687158ad8ae7cfb9..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFCalServer/test/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/test
-
-#TESTS = \
-#	CalTest
-
-bin_PROGRAMS = \
-	CalTest
-
-check_PROGRAMS = \
-	CalTest
-
-CalTest_SOURCES = \
-	CalTest.h \
-	CalTest.cc
-
-BUILT_SOURCES = \
-	CalTest.conf
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-sysconf_DATA = \
-	CalTest.conf
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/ITRFCalServer/test/Makefile.in b/MAC/APL/PAC/ITRFCalServer/test/Makefile.in
deleted file mode 100644
index 6c754814fdbe24da4e98ead26cc419bc336b71cc..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/ITRFCalServer/test/Makefile.in
+++ /dev/null
@@ -1,869 +0,0 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Some common rules.
-
-
-SOURCES = $(CalTest_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = CalTest$(EXEEXT)
-check_PROGRAMS = CalTest$(EXEEXT)
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.common \
-	$(top_srcdir)/autoconf_share/runctest.sh.in
-subdir = test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/autoconf_share/am_rpm_init.m4 \
-	$(top_srcdir)/autoconf_share/lofar_docxx.m4 \
-	$(top_srcdir)/autoconf_share/lofar_external.m4 \
-	$(top_srcdir)/autoconf_share/lofar_general.m4 \
-	$(top_srcdir)/autoconf_share/lofar_init.m4 \
-	$(top_srcdir)/autoconf_share/lofar_internal.m4 \
-	$(top_srcdir)/autoconf_share/lofar_logger.m4 \
-	$(top_srcdir)/autoconf_share/lofar_qatools.m4 \
-	$(top_srcdir)/autoconf_share/lofar_shmem.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = runctest.sh
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_CalTest_OBJECTS = CalTest.$(OBJEXT)
-CalTest_OBJECTS = $(am_CalTest_OBJECTS)
-CalTest_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(CalTest_SOURCES)
-DIST_SOURCES = $(CalTest_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-sysconfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(sysconf_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AR_FLAGS = @AR_FLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOCPP = @DOCPP@
-DOCPPFLAGS = @DOCPPFLAGS@
-DOXYGEN = @DOXYGEN@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-HAVE_AMCBASE_FALSE = @HAVE_AMCBASE_FALSE@
-HAVE_AMCBASE_TRUE = @HAVE_AMCBASE_TRUE@
-HAVE_APPLCOMMON_FALSE = @HAVE_APPLCOMMON_FALSE@
-HAVE_APPLCOMMON_TRUE = @HAVE_APPLCOMMON_TRUE@
-HAVE_BLITZ_FALSE = @HAVE_BLITZ_FALSE@
-HAVE_BLITZ_TRUE = @HAVE_BLITZ_TRUE@
-HAVE_BLOB_FALSE = @HAVE_BLOB_FALSE@
-HAVE_BLOB_TRUE = @HAVE_BLOB_TRUE@
-HAVE_CAL_PROTOCOL_FALSE = @HAVE_CAL_PROTOCOL_FALSE@
-HAVE_CAL_PROTOCOL_TRUE = @HAVE_CAL_PROTOCOL_TRUE@
-HAVE_COMMON_FALSE = @HAVE_COMMON_FALSE@
-HAVE_COMMON_TRUE = @HAVE_COMMON_TRUE@
-HAVE_CPPLAPACK_FALSE = @HAVE_CPPLAPACK_FALSE@
-HAVE_CPPLAPACK_TRUE = @HAVE_CPPLAPACK_TRUE@
-HAVE_DOCPP_FALSE = @HAVE_DOCPP_FALSE@
-HAVE_DOCPP_TRUE = @HAVE_DOCPP_TRUE@
-HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@
-HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@
-HAVE_G2C_FALSE = @HAVE_G2C_FALSE@
-HAVE_G2C_TRUE = @HAVE_G2C_TRUE@
-HAVE_GCFTM_FALSE = @HAVE_GCFTM_FALSE@
-HAVE_GCFTM_TRUE = @HAVE_GCFTM_TRUE@
-HAVE_LOG4CPLUS_FALSE = @HAVE_LOG4CPLUS_FALSE@
-HAVE_LOG4CPLUS_TRUE = @HAVE_LOG4CPLUS_TRUE@
-HAVE_LOG4CXX_FALSE = @HAVE_LOG4CXX_FALSE@
-HAVE_LOG4CXX_TRUE = @HAVE_LOG4CXX_TRUE@
-HAVE_MACIO_FALSE = @HAVE_MACIO_FALSE@
-HAVE_MACIO_TRUE = @HAVE_MACIO_TRUE@
-HAVE_RSP_PROTOCOL_FALSE = @HAVE_RSP_PROTOCOL_FALSE@
-HAVE_RSP_PROTOCOL_TRUE = @HAVE_RSP_PROTOCOL_TRUE@
-HAVE_RTCCOMMON_FALSE = @HAVE_RTCCOMMON_FALSE@
-HAVE_RTCCOMMON_TRUE = @HAVE_RTCCOMMON_TRUE@
-HAVE_SHMEM_FALSE = @HAVE_SHMEM_FALSE@
-HAVE_SHMEM_TRUE = @HAVE_SHMEM_TRUE@
-HAVE_TESTSUITE_FALSE = @HAVE_TESTSUITE_FALSE@
-HAVE_TESTSUITE_TRUE = @HAVE_TESTSUITE_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LOFARROOT = @LOFARROOT@
-LOFAR_DEPEND = @LOFAR_DEPEND@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MAKE_RPMS = @MAKE_RPMS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-RPMBUILD_PROG = @RPMBUILD_PROG@
-RPM_ARGS = @RPM_ARGS@
-RPM_CONFIGURE_ARGS = @RPM_CONFIGURE_ARGS@
-RPM_DIR = @RPM_DIR@
-RPM_PROG = @RPM_PROG@
-RPM_RELEASE = @RPM_RELEASE@
-RPM_TARBALL = @RPM_TARBALL@
-RPM_TARGET = @RPM_TARGET@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_BACKTRACE_FALSE = @USE_BACKTRACE_FALSE@
-USE_BACKTRACE_TRUE = @USE_BACKTRACE_TRUE@
-VERSION = @VERSION@
-YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-docpp_found = @docpp_found@
-doxygen_dot_found = @doxygen_dot_found@
-doxygen_found = @doxygen_found@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-lofar_compiler = @lofar_compiler@
-lofar_doctool = @lofar_doctool@
-lofar_root = @lofar_root@
-lofar_root_libdir = @lofar_root_libdir@
-lofar_sharedir = @lofar_sharedir@
-lofar_top_srcdir = @lofar_top_srcdir@
-lofar_use_root = @lofar_use_root@
-lofar_variant = @lofar_variant@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/test
-
-CalTest_SOURCES = \
-	CalTest.h \
-	CalTest.cc
-
-BUILT_SOURCES = \
-	CalTest.conf
-
-EXTRA_DIST = $(BUILT_SOURCES)
-sysconf_DATA = \
-	CalTest.conf
-
-#CLEANFILES += tca.* .inslog* *.cc *.h $(top_builddir)/pure_cache docxxhtml/* *.log docxx_hdrs.names
-
-# DISTCLEANFILES also removes the md5 check files created by rub,
-# so configure is executed again.
-DISTCLEANFILES = \
-      pkgext*\
-      lofar_config.*\
-      FillPackage__Version* \
-      .doxygenrc \
-      *.spec \
-      *.md5-check \
-      *.err
-
-
-# Rules for building documentation using doxygen or doc++.
-# Default output directory is docxxhtml.
-DOCDIR := docxxhtml
-
-#
-#
-# Target to be able to do a system build.
-# By default it does a check, but no install.
-WITH_CLEAN = 0
-WITH_INSTALL = 0
-WITH_CHECK = 1
-CHECKTOOL = 
-
-# Define the default variables to export to the test scripts.
-TESTS_ENVIRONMENT = LOFARROOT="$(LOFARROOT)" \
-                    lofar_sharedir="$(lofar_sharedir)" \
-                    prefix="$(prefix)" \
-                    top_srcdir="$(top_srcdir)" \
-                    srcdir="$(srcdir)" \
-		    CHECKTOOLPROGS="$(CHECKTOOLPROGS)" \
-		    MPIBIN="$(MPIBIN)" \
-		    AIPSPP="$(AIPSPP)" \
-		    GNU_AUTOTOOLS="yes"
-
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  test/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-runctest.sh: $(top_builddir)/config.status $(top_srcdir)/autoconf_share/runctest.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-CalTest$(EXEEXT): $(CalTest_OBJECTS) $(CalTest_DEPENDENCIES) 
-	@rm -f CalTest$(EXEEXT)
-	$(CXXLINK) $(CalTest_LDFLAGS) $(CalTest_OBJECTS) $(CalTest_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CalTest.Po@am__quote@
-
-.cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-sysconfDATA: $(sysconf_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-	done
-
-uninstall-sysconfDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/.. $(distdir)/../autoconf_share
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS install-sysconfDATA
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-sysconfDATA
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	install-sysconfDATA installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am uninstall-sysconfDATA
-
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-# CLEANFILES cannot delete directories, therefore use target clean-generic.
-clean-generic:
-	-rm -rf ti_files
-	-rm -f tca.*
-	-rm -f .inslog*
-	-rm -f *.log
-	-rm -f *.i
-	-rm -f *.s
-	-rm -f src/*.h
-	-rm -f *.hh
-	-rm -f *.cc
-	-rm -f *.cs_cc
-	-rm -f doxygen.cfg
-	-rm -rf $(top_builddir)/pure_cache
-	-rm -rf docxxhtml
-
-# Rule to delete all files generated by bootstrap.
-# This is sometimes needed when switching to another version of autotools.
-confclean: pkgclean
-pkgclean: distclean
-	  -rm -rf $(srcdir)/autom4te.cache
-	  -rm -f $(srcdir)/config.*
-	  -rm -f $(srcdir)/{configure,aclocal.m4,depcomp,install-sh,ltmain.sh}
-	  -rm -f $(srcdir)/{Makefile.in,missing,mkinstalldirs}
-	  -rm -f $(srcdir)/{Makefile.common,autoconf_share,lofarconf}
-
-# Make the rpm if possible.
-# Note:
-# MAKE_RPMS is set by lofar_init and possibly overwritten by lofar_general.
-# Older package releases include Makefile.common from $lofar_sharedir
-# with the effect that the include is handled by make.
-# Newer releases (as of 1-11-2005) include Makefile.common from $top_srcdir
-# with the effect that the include is handled by automake.
-# To be compatible with older releases, it was decided that the MAKE_RPMS
-# should be handled by make, hence the blank before endif. Otherwise
-# automake complains about an endif without an if.
- ifeq "$(MAKE_RPMS)" "true"
-   rpm: dist @RPM_TARGET@
-   $(RPM_TARGET): $(DISTFILES)
-	${MAKE} dist
-	-mkdir -p $(RPM_DIR)/SRPMS
-	-mkdir -p `dirname $(RPM_TARGET)`
-	$(RPM_PROG) $(RPM_ARGS) $(RPM_TARBALL)
-	@echo Congratulations, $(RPM_TARGET) "(and friends)" should now exist.
- endif
-# Put the phony target outside the if, otherwise automake gives
-# warnings if a .PHONY is also defined in the Makefile.am.
-.PHONY: rpm
-
-# Only preprocess the file.
-%.i: %.cc
-	$(CXX) -E $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< > $@
-%.i: %.c
-	$(CC) -E $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< > $@
-
-# Only compile (but not assemble) the file.
-%.s: %.cc
-	$(CXX) -S $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $<
-%.s: %.c
-	$(CC) -S $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $<
-
-# Rules for preprocessing idl files.
-# There should be a corresponding .cc file in the source directory
-# including the .cs_cc file.
-%.cs_cc: %.idl
-	$(IDLCXX) $(IDLFLAGS) $(AM_IDLFLAGS) $<
-	echo '#include "$*_c.cc"' >  $*.cs_cc
-	echo '#include "$*_s.cc"' >> $*.cs_cc
-
-# Rules for preprocessing Qt sources.
-%.moc.cc: %.h
-	$(QT_DIR)/bin/moc $< -o $@
-
-# Rule to build all test programs.
-test: $(check_PROGRAMS)
-
-# Rule to build and run one or more test programs.
-# The programs to build/run must be defined in the PGM variable.
-checkrun:
-	@if [ "$(PGM)" = "" ] ; then \
-	   echo "Error: use as: make (mem)checkrun PGM=testprogram"; \
-	 else \
-	   curwd=`pwd`; \
-	   bcurwd=`basename $$curwd`; \
-	   if [ "$$bcurwd" != test ]; then \
-	     echo "Error: run (mem)checkrun in test directory"; \
-	   else \
-	     PGMB=; \
-	     PGMT=; \
-	     for PGMVAR in $(PGM) ; \
-	     do \
-	       grep "^ *$${PGMVAR}_SOURCES" $(srcdir)/Makefile.am >& /dev/null; \
-	       if [ $$? = 0 ]; then \
-	         PGMB="$$PGMB $$PGMVAR"; \
-	       fi; \
-	       PGMTST=$$PGMVAR; \
-	       if [ -f $(srcdir)/$${PGMVAR}.sh ] ; then \
-	         PGMTST=$(srcdir)/$${PGMVAR}.sh; \
-	       elif [ -f $(srcdir)/$${PGMVAR}_test.sh ] ; then \
-	         PGMTST=$(srcdir)/$${PGMVAR}_test.sh; \
-	       fi; \
-	       PGMT="$$PGMT $$PGMTST"; \
-	     done; \
-	     echo "make check CHECKTOOL='$(CHECKTOOL)' check_PROGRAMS='$$PGMB' TESTS='$$PGMT'"; \
-	     make check CHECKTOOL="$(CHECKTOOL)" check_PROGRAMS="$$PGMB" TESTS="$$PGMT"; \
-	   fi \
-	 fi
-
-# Rule to run test programs using valgrind's memcheck tool.
-memcheck:
-	@$(RM) `find . -name "*.valgrind.*"`
-	make check CHECKTOOL='valgrind --tool=memcheck --num-callers=50 --leak-check=yes --track-fds=yes --log-file=[PROGNAME].valgrind'
-	@vgfils=`find . -name "*.valgrind.*"`; \
-	vgfils=`echo $$vgfils`; \
-	nrvg=`echo "$$vgfils" | wc -w`; \
-	nrvg=`echo $$nrvg`; \
-	if [ "$$nrvg" != 0  -a  "$$nrvg" != "" ]; then \
-	  echo ''; \
-	  echo "memcheck error summary from $$nrvg *.valgrind.* file(s)"; \
-	  echo '--------------------------------------------------'; \
-	  (grep "ERROR SUMMARY: " `echo $$vgfils` | grep -v " 0 errors ") || echo "No memory check errors"; \
-	  (grep "definitely lost: " `echo $$vgfils` | grep -v " 0 bytes ") || echo "No definite memory leaks"; \
-	  (grep "possibly lost: " `echo $$vgfils` | grep -v " 0 bytes ") || echo "No possible memory leaks"; \
-	  (grep " open file descriptor " `echo $$vgfils` | grep -v "descriptor [012]:") || echo "No file descriptor leaks"; \
-	fi
-
-# Rule to build and run memcheck for one or more test programs.
-# The programs to build/run must be defined in the PGM variable.
-memcheckrun:
-	$(RM) `find . -name "*.valgrind.*"`
-	make checkrun CHECKTOOL='valgrind --tool=memcheck --num-callers=50 --leak-check=yes --track-fds=yes --log-file=[PROGNAME].valgrind' PGM="$(PGM)"
-	@vgfils=`find . -name "*.valgrind.*"`; \
-	vgfils=`echo $$vgfils`; \
-	nrvg=`echo "$$vgfils" | wc -w`; \
-	nrvg=`echo $$nrvg`; \
-	if [ "$$nrvg" != 0  -a  "$$nrvg" != "" ]; then \
-	  echo ''; \
-	  echo "memcheckrun error summary from $$nrvg *.valgrind.* file(s)"; \
-	  echo '-----------------------------------------------------'; \
-	  (grep "ERROR SUMMARY: " `echo $$vgfils` | grep -v " 0 errors ") || echo "No memory check errors"; \
-	  (grep "definitely lost: " `echo $$vgfils` | grep -v " 0 bytes ") || echo "No definite memory leaks"; \
-	  (grep "possibly lost: " `echo $$vgfils` | grep -v " 0 bytes ") || echo "No possible memory leaks"; \
-	  (grep " open file descriptor " `echo $$vgfils` | grep -v "descriptor [012]:") || echo "No file descriptor leaks"; \
-	fi
-
-doc:
-	@if [ "$(lofar_doctool)" = "doxygen" ] ; then \
-	  cp $(top_builddir)/.doxygenrc doxygen.cfg ; \
-	  projnm=`(cd $(srcdir) && pwd) | sed -e "s%.*/LOFAR/%%"` ; \
-	  echo "PROJECT_NAME = $$projnm" >> doxygen.cfg ; \
-	  echo "INPUT = $(srcdir)" >> doxygen.cfg ; \
-	  echo "RECURSIVE = YES" >> doxygen.cfg ; \
-	  echo "HTML_OUTPUT = $(DOCDIR)" >> doxygen.cfg ; \
-	  echo "EXCLUDE = $(srcdir)/build $(srcdir)/test $(srcdir)/demo" >> doxygen.cfg; \
-          echo "GENERATE_TAGFILE = `basename $$projnm`.tag" >> doxygen.cfg ; \
-	  $(DOXYGEN) doxygen.cfg ; \
-	else \
-	  if [ "$(lofar_doctool)" = "docpp" ] ; then \
-	    $(DOCPP) $(DOCPPFLAGS) --dir $(DOCDIR) `find $(srcdir) -name "*.h" -print` ; \
-	  else \
-	    echo "Error: No documentation tool configured" ; \
-	  fi \
-	fi
-
-docthis:
-	@if [ "$(lofar_doctool)" = "doxygen" ] ; then \
-	  cp $(top_builddir)/.doxygenrc doxygen.cfg ; \
-	  projnm=`(cd $(srcdir) && pwd) | sed -e "s%.*/LOFAR/%%"` ; \
-	  echo "PROJECT_NAME = $$projnm" >> doxygen.cfg ; \
-	  echo "INPUT = $(srcdir)/src" >> doxygen.cfg ; \
-	  echo "RECURSIVE = NO" >> doxygen.cfg ; \
-	  echo "HTML_OUTPUT = $(DOCDIR)" >> doxygen.cfg ; \
-	  $(DOXYGEN) doxygen.cfg ; \
-	else \
-	  if [ "$(lofar_doctool)" = "docpp" ] ; then \
-	    $(DOCPP) $(DOCPPFLAGS) --dir $(DOCDIR) $(srcdir)/*.h ; \
-	  else \
-	    echo "Error: No documentation tool configured" ; \
-	  fi \
-	fi
-build_system:
-	@if test 2 -eq $(WITH_CLEAN); then \
-	  $(MAKE) distclean ; \
-	  ../../lofarconf; \
-	fi; \
-	if test 1 -eq $(WITH_CLEAN); then \
-	  $(MAKE) clean ; \
-	fi; \
-	$(MAKE); \
-	if test 1 -eq $(WITH_CHECK); then \
-	  $(MAKE) check CHECKTOOL="$(CHECKTOOL)"; \
-	fi; \
-	if test 1 -eq $(WITH_INSTALL); then \
-	  $(MAKE) install ; \
-	fi;
-
-# Show the important make variables.
-show:
-	@echo "CXX      = $(CXX)";
-	@echo "   `$(CXX) --version | head -1`";
-	@echo "CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS)";
-	@echo "CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS)";
-	@echo "LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS)";
-	@echo "LIBS     = $(LIBS)";
-	@echo "MPIBIN   = $(MPIBIN)";
-	@echo "AIPSPP   = $(AIPSPP)";
-	@echo "prefix   = $(prefix)";
-
-help:
-	@echo "make targets";
-	@echo "------------";
-	@echo "show              show important make variables";
-	@echo "pgm               build test program pgm (in test directory)";
-	@echo "test              build all test programs";
-	@echo "check             build, run, and check all test programs";
-	@echo "check CHECKTOOL=  check test programs with a checktool (like valgrind)";
-	@echo "memcheck          check CHECKTOOL='valgrind --tool=memcheck"
-	@echo "                    --num-callers=50 --leak-check=yes --track-fds=yes'"
-	@echo "checkrun PGM=     build, run, and check given test program(s)";
-	@echo "memcheckrun PGM=  build, run, and memcheck given test program(s)";
-	@echo ""
-	@echo "file.o            make object file (in src or test directory)";
-	@echo "file.i            make preprocessed file";
-	@echo "file.s            make assembly file";
-	@echo "clean             remove object files, etc."
-	@echo "distclean         remove almost everything; requires a new lofarconf";
-	@echo "pkgclean          distclean and remove files generated by bootstrap";
-	@echo "                    requires a new bootstrap and lofarconf";
-	@echo "install           install package in $(prefix)";
-	@echo "dist              make a distribution";
-	@echo "distcheck         make and check a distribution";
-	@echo "rpm               make an rpm";
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/MAC/APL/PAC/LBA_Calibration/LBA_Calibration.spec.in b/MAC/APL/PAC/LBA_Calibration/LBA_Calibration.spec.in
deleted file mode 100644
index f86a60480b10cad220bb94f21a58e5cec5522358..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/LBA_Calibration/LBA_Calibration.spec.in
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# LBA_Calibration.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The LBA_Calibration library creates a C-library from matlab code.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The LBA_Calibration library implements LBA station calibration by compiling Matlab
-code with the MatLab compiler into a C-lib that can be used by the CalServer.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/LBA_Calibration/Makefile.am b/MAC/APL/PAC/LBA_Calibration/Makefile.am
deleted file mode 100644
index 06b1c66a543b50917eb4bced9901707f162e2dbf..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/LBA_Calibration/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS=src test 
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      MatLabCal.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/LBA_Calibration/bootstrap b/MAC/APL/PAC/LBA_Calibration/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/LBA_Calibration/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/LBA_Calibration/configure.in b/MAC/APL/PAC/LBA_Calibration/configure.in
deleted file mode 100644
index fb301e6530a8e035a68a229778f8417030c52cff..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/LBA_Calibration/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(LBA_Calibration, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_MATLAB(/opt/MATLAB/MATLAB_Compiler_Runtime/v78)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/APL/LBA_Calibration/Makefile
-src/Makefile
-test/Makefile
-Makefile
-LBA_Calibration.spec
-)
diff --git a/MAC/APL/PAC/LBA_Calibration/src/Makefile.am b/MAC/APL/PAC/LBA_Calibration/src/Makefile.am
deleted file mode 100644
index 7f05f09225f20a7300c2acd00ed265caa8ab104f..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/LBA_Calibration/src/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-AM_CPPFLAGS = -I$(top_builddir)/include
-
-MATLAB_COMPILER = mcc
-lib%.so : %.m
-	$(MATLAB_COMPILER) -v -W cpplib:lib$* -T link:lib $<
-	mkdir -p $(pkgincludedir)/
-	cp lib$*.h  $(pkgincludedir)/$*.h
-	cp lib$*.so $(libdir)/
-
-#libMatlabCal.so: calibrate.m
-#	$(MATLAB_COMPILER) -v -W cpplib:libMatlabCal -T link:lib $<
-#	mkdir -p $(pkgincludedir)/
-#	cp libMatlabCal.h  $(pkgincludedir)/
-#	cp libMatlabCal.so $(libdir)/
-
-EXTRA_DIST = 
-
-BUILT_SOURCES	= liblba_calibration.so
-
-#lib_LTLIBRARIES	= libcalibrate.la
-#libcalibrate_la_SOURCES = calibrate.m 
-
-
-pkgincludedir = $(includedir)/APL/LBA_Calibration
-#pkginclude_HEADERS = $(BUILT_SOURCES)
-
-bin_PROGRAMS = versionlba_calibration 
-
-versionlba_calibration_SOURCES      = Package__Version.cc versionlba_calibration.cc
-versionlba_calibration_LDADD        = 
-versionlba_calibration_DEPENDENCIES = $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/LBA_Calibration/test/Makefile.am b/MAC/APL/PAC/LBA_Calibration/test/Makefile.am
deleted file mode 100644
index e9a663520d8ac13b804b692d145ca9e69d9f1cb2..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/LBA_Calibration/test/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/test
-
-sbin_PROGRAMS = \
-	tCalibrate
-
-tCalibrate_SOURCES 	= $(BUILT_SOURCES) tCalibrate.cc
-tCalibrate_LDADD	= -llba_calibration -L../src/ $(LOFAR_DEPEND)
-tCalibrate_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-BUILT_SOURCES = 
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-sysconf_DATA = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/SHMInfo_Server/MIS.spec.in b/MAC/APL/PAC/SHMInfo_Server/MIS.spec.in
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/MAC/APL/PAC/SHMInfo_Server/Makefile.am b/MAC/APL/PAC/SHMInfo_Server/Makefile.am
deleted file mode 100644
index 4bed0d91aed2ea15ffe51eb670826bc2c7ceecd4..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/SHMInfo_Server/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-#DISTCHECK_CONFIGURE_FLAGS=\
-#      --with-common=$(prefix) # "common" is an example
-
-EXTRA_DIST = \
-      Makefile.common \
-      SHMInfoServer.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/SHMInfo_Server/SHMInfoServer.spec.in b/MAC/APL/PAC/SHMInfo_Server/SHMInfoServer.spec.in
deleted file mode 100644
index f239d12f032d0a6a6c381183ddc0bf3aea3b6d60..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/SHMInfo_Server/SHMInfoServer.spec.in
+++ /dev/null
@@ -1,168 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# SHMInfoServer.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: SHMInfoServer contains the MAC Information Server application.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: APS >= 2.0
-Requires: GCFTM >= 6.0
-Requires: GCFCommon >= 6.0
-Requires: GCFPAL >= 6.0
-Requires: RTCCommon >= 1.0
-Requires: RSP_Protocol >= 1.0
-Requires: APLCommon >= 3.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-SHMInfoServer contains the MAC Information Server application.
-of MAC.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PAC/SHMInfo_Server/bootstrap b/MAC/APL/PAC/SHMInfo_Server/bootstrap
deleted file mode 100644
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/SHMInfo_Server/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PAC/SHMInfo_Server/configure.in b/MAC/APL/PAC/SHMInfo_Server/configure.in
deleted file mode 100644
index a7099b68348a9d119bcd1a8e36f07d97cf9a63b3..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/SHMInfo_Server/configure.in
+++ /dev/null
@@ -1,62 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/SHMInfoServer.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(SHMInfo_Server, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PVSS, GCFPVSS, , 1, GCF/PVSS/PVSSservice.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Timestamp.h,,)
-lofar_INTERNAL(MAC/APL/RTDBCommon, RTDBCommon, , 1, APL/RTDBCommon/RTDButilities.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/CAL_Protocol.ph,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-SHMInfoServer.spec
-)
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/Makefile.am b/MAC/APL/PAC/SHMInfo_Server/src/Makefile.am
deleted file mode 100644
index a400a2c85040c595806f57d924a337ff7c9cfdc4..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/SHMInfo_Server/src/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-AM_CPPFLAGS = -DUSES_NEW_IOSTREAM
-pkginclude_HEADERS = Package__Version.h
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-DOCHDRS	=	 $(BUILT_SOURCES) \
-	SHMInfoServer.h \
-	SHMDefines.h \
-	SHMSession.h \
-	XCStatistics.h \
-	RspStatus.h
-
-noinst_LTLIBRARIES 	= libshminfoserver.la
-
-libshminfoserver_la_SOURCES	= Package__Version.cc \
-	$(DOCHDRS) \
-	SHMInfoServer.cc \
-	SHMSession.cc \
-	SHM_Protocol.cc \
-	XCStatistics.cc \
-	RspStatus.cc
-
-bin_PROGRAMS   		= versionshminfo_server SHMInfoServer
-  
-SHMInfoServer_SOURCES		  = SHMInfoServerMain.cc
-SHMInfoServer_LDADD		    = libshminfoserver.la $(LOFAR_DEPEND)
-SHMInfoServer_DEPENDENCIES	= libshminfoserver.la $(LOFAR_DEPEND)
-
-BUILT_SOURCES = SHM_Protocol.ph
-
-EXTRA_DIST = $(sysconf_DATA)
-	
-sysconf_DATA= 
-	
-%.conf: %.conf.in
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-	
-versionshminfo_server_SOURCES      = versionshminfo_server.cc
-versionshminfo_server_LDADD        = libshminfoserver.la
-versionshminfo_server_DEPENDENCIES = libshminfoserver.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/PAC/SHMInfo_Server/test/Makefile.am b/MAC/APL/PAC/SHMInfo_Server/test/Makefile.am
deleted file mode 100644
index 2c0b58c7b76ff27f00ffbafb84970a3343bb2c89..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/SHMInfo_Server/test/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-configfilesdir=$(bindir)
-configfiles_DATA= \
-	mis.pol
-	
-EXTRA_DIST = $(configfiles_DATA)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/PAC/bootstrap b/MAC/APL/PAC/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/PAC/lofarconf.in b/MAC/APL/PAC/lofarconf.in
deleted file mode 100644
index 1c8770f655be555cb2cc3654f73e3fb296267caa..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/lofarconf.in
+++ /dev/null
@@ -1,5 +0,0 @@
-CAL_Protocol
-BS_Protocol
-Cal_Server
-Beam_Server
-SHMInfo_Server
diff --git a/MAC/APL/PIC/ETHTest/Makefile.am b/MAC/APL/PIC/ETHTest/Makefile.am
deleted file mode 100644
index dd8a1c4a55ae6d8a1e968c9a1f69a730ed62229b..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/ETHTest/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS = src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/ETHTest/bootstrap b/MAC/APL/PIC/ETHTest/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/ETHTest/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PIC/ETHTest/configure.in b/MAC/APL/PIC/ETHTest/configure.in
deleted file mode 100644
index 0cf1887d64787bce323b093103149c75a4e9e172..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/ETHTest/configure.in
+++ /dev/null
@@ -1,81 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/Timer.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ETHTest, 1.0)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Define the prefix to allow the use of this path in programs
-AC_DEFINE_UNQUOTED([RSP_PREFIX],["${prefix}"],[Path to RSP install prefix directory.])
-RSP_PREFIX="${prefix}"
-AC_SUBST([RSP_PREFIX])
-
-AC_DEFINE_UNQUOTED([RSP_SYSCONF],["${prefix}/etc"],[Path to RSP install prefix directory.])
-RSP_SYSCONF="${prefix}/etc"
-AC_SUBST([RSP_SYSCONF])
-
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(sys/capability.h)
-dnl This is trick to be able to use "if HAVE_SYS_CAPABILITY_H" in Makefile.am
-AM_CONDITIONAL(HAVE_SYS_CAPABILITY_H, test `eval echo '${'$as_ac_Header'}'` = yes)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-#lofar_PVSS(1)
-
-dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-dnl lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-dnl lofar_EXTERNAL(suite,1,Suite/test.h,,)
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-	Makefile
-	src/Makefile
-)
diff --git a/MAC/APL/PIC/ETHTest/src/Makefile.am b/MAC/APL/PIC/ETHTest/src/Makefile.am
deleted file mode 100644
index 239234e59b0ef039880d1fce4331bc6951842c89..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/ETHTest/src/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-
-#
-# Define ENABLE_CAP_NET_RAW to let RSPDriver run as setuid root
-# with only cap_net_raw capability enabled.
-#
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src
-
-INSTALL=install -C
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(top_srcdir)/../../../MACCommon/autogen $<
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(top_srcdir)/../../../MACCommon/autogen $<
-
-BUILT_SOURCES = 
-	ETH_test.conf \
-	ETH_realtime.conf
-
-# clean-local:
-# 	rm -f \
-# 	RSP_Protocol.ph \
-# 	RSP_Protocol.cc \
-# 	EPA_Protocol.ph \
-# 	EPA_Protocol.cc
-
-EXTRA_DIST =
-
-sysconf_DATA = \
-	ETH_test.conf \
-	ETH_realtime.conf
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-%.ns: %.ns.in
-	cp $< $@
-
-%.top: %.top.in
-	cp $< $@
-
-bin_PROGRAMS = \
-	ETH_test \
-	ETH_realtime
-
-# 	TCP_test \
-# 	UDP_test
-
-ETH_test_SOURCES = \
-	Timer.h \
-	MEPData.h \
-	MEPData.cc \
-	DataEvent.h \
-	ETH_test.cc
-
- ETH_realtime_SOURCES = \
-	Timer.h \
-	MEPData.h \
-	MEPData.cc \
-	DataEvent.h \
-	ETH_realtime.cc
-
-# TCP_test_SOURCES = \
-# 	Timer.h \
-# 	TCP_test.cc
-
-# UDP_test_SOURCES = \
-# 	Timer.h \
-# 	UDP_test.cc
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSP_Driver/Makefile.am b/MAC/APL/PIC/RSP_Driver/Makefile.am
deleted file mode 100644
index 6c6c725a0c25e0ea147dbe7dae935209a8ad74d5..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Driver/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-SUBDIRS = src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      RSPDriver.spec \
-      autoconf_share/compiletool
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix)\
-	--with-suite=$(prefix)\
-	--with-gcftm=$(prefix)\
-	--with-rsp_protocol=$(prefix)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/PIC/RSP_Driver/RSPDriver.spec.in b/MAC/APL/PIC/RSP_Driver/RSPDriver.spec.in
deleted file mode 100644
index 06c156d569540b02698973f207bd707c6eedaa20..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Driver/RSPDriver.spec.in
+++ /dev/null
@@ -1,164 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# RSPDriver.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: RSPDriver is the user space device driver for the RSP boards.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-RSPDriver is the user space device driver that controls one or more RSP boards.
-The RSPDriver communicates with the RSP boards via raw ethernet messages. The
-driver can handle multiple clients simultaneously. Client programs can use the
-RSP_Protocol package to communicate with the RSPDriver using the events that
-are defined in the RSP_Protocol package.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PIC/RSP_Driver/bootstrap b/MAC/APL/PIC/RSP_Driver/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Driver/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PIC/RSP_Driver/configure.in b/MAC/APL/PIC/RSP_Driver/configure.in
deleted file mode 100644
index 28bd4ac4d1f2c20e16acd12e6321bab2b4e4e138..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Driver/configure.in
+++ /dev/null
@@ -1,112 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/RSPDriver.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(RSP_Driver, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h sys/timepps.h sys/mman.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-dnl lofar_PVSS(1)
-
-dnl autoscan discovered requirements
-dnl
-dnl wanted by: src/Tuner.cc:490
-AC_CHECK_FUNCS([floor])
-dnl wanted by: src/RSPDriver.cc:873
-AC_CHECK_FUNCS([gettimeofday])
-dnl wanted by: test/EPAStub.cc:68
-AC_CHECK_FUNCS([memset])
-dnl wanted by: src/CaptureStats.cc:68
-AC_CHECK_FUNCS([strdup])
-dnl wanted by: src/RSPDriver.cc:405
-AC_CHECK_FUNCS([strerror])
-dnl wanted by: src/rspctl.cc:99
-AC_CHECK_FUNCS([strtol])
-dnl wanted by: src/CaptureStats.cc:169
-AC_CHECK_FUNCS([strtoul])
-dnl wanted by: src/RSPDriver.cc:81
-AC_CHECK_HEADERS([fcntl.h])
-dnl wanted by: src/StatusRead.cc:35
-AC_CHECK_HEADERS([netinet/in.h])
-dnl wanted by: test/EPAStub.cc:38
-AC_CHECK_HEADERS([sys/time.h])
-dnl wanted by: src/BeamletWeights.h:80
-AC_C_INLINE
-dnl wanted by: src/captest.c:152
-AC_FUNC_FORK
-dnl wanted by: src/RSPDriver.cc:724
-AC_FUNC_STRFTIME
-dnl wanted by: src/CaptureStats.cc:161
-AC_HEADER_STDBOOL
-dnl wanted by: src/Cache.cc:50
-AC_HEADER_TIME
-dnl wanted by: src/CaptureStats.cc:874
-AC_STRUCT_TM
-
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
-lofar_INTERNAL(MAC/APL/TestSuite, TestSuite, , 1, TestSuite/test.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.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)
-
-dnl PPS_API needed by RSPDriver
-AC_CHECK_HEADER([sys/timepps.h])
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-	Makefile
-	RSPDriver.spec
-	src/Makefile
-	test/Makefile
-)
diff --git a/MAC/APL/PIC/RSP_Driver/src/Makefile.am b/MAC/APL/PIC/RSP_Driver/src/Makefile.am
deleted file mode 100644
index 9e6e230b9f4a537d1a9b4750b81d09ef1eef4683..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Driver/src/Makefile.am
+++ /dev/null
@@ -1,233 +0,0 @@
-AM_CPPFLAGS 	= -I$(top_srcdir)/src 
-
-AUTOGEN 		= autogen
-SUFFIXES 		= .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-
-sysconf_DATA 		= rspctl.conf 
-EXTRA_DIST 			= $(sysconf_DATA)
-include_HEADERS		=
-pkginclude_HEADERS	= Package__Version.h
-
-lib_LTLIBRARIES		= libepa.la
-libepa_la_SOURCES	= Package__Version.cc RawEvent.h RawEvent.cc
-
-sbin_PROGRAMS 		= geni2c
-bin_PROGRAMS 		= RSPDriver rspctl versionrsp_driver
-
-RSPDriver_SOURCES	= \
-	RSPDriver.cc \
-	Scheduler.cc \
-	Sequencer.cc \
-	Cache.cc \
-	StationSettings.cc \
-	RCUCables.cc \
-	CableAttenuation.cc \
-	CableSettings.cc \
-	SerdesBuffer.cc \
-	\
-	SetWeightsCmd.cc \
-	GetWeightsCmd.cc \
-	SetSubbandsCmd.cc \
-	GetSubbandsCmd.cc \
-	UpdSubbandsCmd.cc \
-	GetStatusCmd.cc \
-	UpdStatusCmd.cc \
-	SetRCUCmd.cc \
-	GetRCUCmd.cc \
-	UpdRCUCmd.cc \
-	SetHBACmd.cc \
-	GetHBACmd.cc \
-	ReadHBACmd.cc \
-	UpdHBACmd.cc \
-	SetRSUCmd.cc \
-	SetWGCmd.cc \
-	GetWGCmd.cc \
-	GetVersionsCmd.cc \
-	GetStatsCmd.cc \
-	UpdStatsCmd.cc \
-	GetXCStatsCmd.cc \
-	UpdXCStatsCmd.cc \
-	SetClocksCmd.cc \
-	GetClocksCmd.cc \
-	UpdClocksCmd.cc \
-	GetTDStatusCmd.cc \
-	UpdTDStatusCmd.cc \
-	GetRegisterStateCmd.cc \
-	UpdRegisterStateCmd.cc \
-	SetTBBCmd.cc \
-	GetTBBCmd.cc \
-	SetBypassCmd.cc \
-	GetBypassCmd.cc \
-	GetSPUStatusCmd.cc \
-	SetRawBlockCmd.cc \
-	GetRawBlockCmd.cc \
-	SetSplitterCmd.cc \
-	GetSplitterCmd.cc \
-	UpdSplitterCmd.cc \
-	GetLatencyCmd.cc \
-	\
-	SyncAction.cc \
-	WriteReg.cc \
-	ReadReg.cc \
-	XWWrite.cc \
-	BWWrite.cc \
-	BWRead.cc \
-	SSWrite.cc \
-	SSRead.cc \
-	RCUWrite.cc \
-	RCUProtocolWrite.cc \
-	RCUResultRead.cc \
-	RCURead.cc \
-	RawBlockRead.cc \
-	RawBlockWrite.cc \
-	StatusRead.cc \
-	SstRead.cc \
-	BstRead.cc \
-	XstRead.cc \
-	BypassRead.cc \
-	VersionsRead.cc \
-	WGWrite.cc \
-	WGRead.cc \
-	CDOWrite.cc \
-	BSWrite.cc \
-	RSUWrite.cc \
-	TDSProtocolWrite.cc \
-	TDSResultWrite.cc \
-	TDSResultRead.cc \
-	TDSStatusWrite.cc \
-	TDSStatusRead.cc \
-	HBAProtocolWrite.cc \
-	HBAResultRead.cc \
-	RADWrite.cc \
-	TimestampWrite.cc \
-	TBBSettingsWrite.cc \
-	TBBBandselWrite.cc \
-	BypassWrite.cc \
-	SerdesWrite.cc \
-	SerdesRead.cc \
-	LatencyRead.cc
-
-INSTHDRS	=
-NOINSTHDRS	= \
-	RefCount.h \
-	RSPDriver.h \
-	Scheduler.h \
-	Sequencer.h \
-	Command.h \
-	Cache.h \
-	StationSettings.h \
-	RCUCables.h \
-	CableAttenuation.h \
-	CableSettings.h \
-	SerdesBuffer.h \
-	\
-	SetWeightsCmd.h \
-	GetWeightsCmd.h \
-	SetSubbandsCmd.h \
-	GetSubbandsCmd.h \
-	UpdSubbandsCmd.h \
-	GetStatusCmd.h \
-	UpdStatusCmd.h \
-	SetRCUCmd.h \
-	GetRCUCmd.h \
-	UpdRCUCmd.h \
-	SetHBACmd.h \
-	GetHBACmd.h \
-	ReadHBACmd.h \
-	UpdHBACmd.h \
-	SetRSUCmd.h \
-	SetWGCmd.h \
-	GetWGCmd.h \
-	GetVersionsCmd.h \
-	GetStatsCmd.h \
-	UpdStatsCmd.h \
-	GetXCStatsCmd.h \
-	UpdXCStatsCmd.h \
-	SetClocksCmd.h \
-	GetClocksCmd.h \
-	UpdClocksCmd.h \
-	GetTDStatusCmd.h \
-	UpdTDStatusCmd.h \
-	GetRegisterStateCmd.h \
-	UpdRegisterStateCmd.h \
-	SetTBBCmd.h \
-	GetTBBCmd.h \
-	SetBypassCmd.h \
-	GetBypassCmd.h \
-	GetSPUStatusCmd.h \
-	SetRawBlockCmd.h \
-	GetRawBlockCmd.h \
-	SetSplitterCmd.h \
-	GetSplitterCmd.h \
-	UpdSplitterCmd.h \
-	GetLatencyCmd.h \
-	\
-	SyncAction.h \
-	WriteReg.h \
-	ReadReg.h \
-	XWWrite.h \
-	BWWrite.h \
-	BWRead.h \
-	SSWrite.h \
-	SSRead.h \
-	RCUWrite.h \
-	RCUProtocolWrite.h \
-	RCUResultRead.h \
-	RCURead.h \
-	RawBlockRead.h \
-	RawBlockWrite.h \
-	StatusRead.h \
-	SstRead.h \
-	BstRead.h \
-	XstRead.h \
-	BypassRead.h \
-	VersionsRead.h \
-	WGWrite.h \
-	WGRead.h \
-	CDOWrite.h \
-	BSWrite.h \
-	RSUWrite.h \
-	TDSi2cdefs.h \
-	TDSProtocolWrite.h \
-	TDSResultWrite.h \
-	TDSResultRead.h \
-	TDSStatusWrite.h \
-	TDSStatusRead.h \
-	HBAProtocolWrite.h \
-	HBAResultRead.h \
-	RADWrite.h \
-	TimestampWrite.h \
-	TBBSettingsWrite.h \
-	TBBBandselWrite.h \
-	BypassWrite.h  \
-	SerdesWrite.h \
-	SerdesRead.h \
-	LatencyRead.h
-
-RSPDriver_LDADD					= libepa.la $(RTCCOMMON_LDADD)
-RSPDriver_DEPENDENCIES			= libepa.la $(LOFAR_DEPEND)
-
-rspctl_SOURCES					= rspctl.h rspctl.cc
-rspctl_LDADD					= -lgnuplot_i
-
-geni2c_SOURCES					= geni2c.cc
-
-versionrsp_driver_SOURCES		= versionrsp_driver.cc
-versionrsp_driver_LDADD			= libepa.la
-versionrsp_driver_DEPENDENCIES	= libepa.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSP_Driver/test/Makefile.am b/MAC/APL/PIC/RSP_Driver/test/Makefile.am
deleted file mode 100644
index cd356ad3e9d11e2c5d88d6895c8696c99669ae77..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Driver/test/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-check_PROGRAMS		= tCableAttenuation tRCUCables 
-
-TESTSCRIPTS			= tCableAttenuation.sh tRCUCables.sh
-
-TESTS				= $(TESTSCRIPTS)
-
-tCableAttenuation_SOURCES		= tCableAttenuation.cc ../src/CableAttenuation.cc
-tCableAttenuation_LDADD			= $(LOFAR_DEPEND)
-tCableAttenuation_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-tRCUCables_SOURCES			= tRCUCables.cc ../src/RCUCables.cc ../src/CableAttenuation.cc
-tRCUCables_LDADD			= $(LOFAR_DEPEND)
-tRCUCables_DEPENDENCIES		= $(LOFAR_DEPEND)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src
-
-# TESTS = \
-# 	RSPTest \
-# 	EPAStub
-
-sbin_PROGRAMS = EPAStub RSPTest
-
-sbin_SCRIPTS = beamtest 
-
-RSPTest_SOURCES = \
-	RSPTest.h \
-	RSPTest.cc
-
-EPAStub_SOURCES = \
-	EPAStub.h \
-	EPAStub.cc
-
-EPAStub_LDADD = \
-	$(top_builddir)/src/libepa.la
-
-BUILT_SOURCES = \
-	RSPTest.conf \
-	EPAStub.conf \
-	EPAStub.log_prop
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-sysconf_DATA = \
-	EPAStub.conf \
-	RSPTest.conf \
-	EPAStub.log_prop
-
-%.log_prop: %.log_prop.in
-	cp $< $@
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSP_Protocol/Makefile.am b/MAC/APL/PIC/RSP_Protocol/Makefile.am
deleted file mode 100644
index c294e2269d305d53d2091a78686611f78b013f2e..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-SUBDIRS	= src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      RSP_Protocol.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSP_Protocol/RSP_Protocol.spec.in b/MAC/APL/PIC/RSP_Protocol/RSP_Protocol.spec.in
deleted file mode 100644
index 5fa712dc81d146e5dba60b9b5a05b140d03e9d1f..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/RSP_Protocol.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# RSP_Protocol.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: RSP_Protocol contains the library and headers necessary to communicate with the RSPDriver
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-RSP_Protocol is a package containing the library and headers needed to communicate
-with the RSPDriver. All events and any classes in the events are contained in the
-library and header files.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PIC/RSP_Protocol/bootstrap b/MAC/APL/PIC/RSP_Protocol/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PIC/RSP_Protocol/configure.in b/MAC/APL/PIC/RSP_Protocol/configure.in
deleted file mode 100644
index 7b68eb47cc55ab6f8d4f75d4696f7e4c53b868d7..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(RSP_Protocol, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/GCF_Event.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/APL/RSP_Protocol/Makefile
-src/Makefile
-test/Makefile
-Makefile
-RSP_Protocol.spec
-)
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Makefile.am b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Makefile.am
deleted file mode 100644
index 0670b13128cf72b69d2b59f4d0b38aa23d478371..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-INSTHDRS = \
-	AllRegisterState.h \
-	BeamletWeights.h \
-	BypassSettings.h \
-	HBASettings.h \
-	MEPHeader.h \
-	MEPData.h \
-	RCUSettings.h \
-	RSUSettings.h \
-	SPUStatus.h \
-	Statistics.h \
-	SubbandSelection.h \
-	SystemStatus.h \
-	TBBSettings.h \
-	TDStatus.h \
-	Versions.h \
-	WGSettings.h \
-	XCStatistics.h \
-	Latency.h
-
-NOINSTHDRS =
-
-TCCHDRS =
-
-pkgincludedir = $(includedir)/APL/RSP_Protocol
-pkginclude_HEADERS = Package__Version.h  $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS = $(NOINSTHDRS)
-
-DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSP_Protocol/include/Makefile.am b/MAC/APL/PIC/RSP_Protocol/include/Makefile.am
deleted file mode 100644
index 9c6b70da8a9ef994d519b3eee7fc6c6be8829886..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS	= APL/RSP_Protocol
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Makefile.am b/MAC/APL/PIC/RSP_Protocol/src/Makefile.am
deleted file mode 100644
index 7e1a8d283e1d5dd7e10dec9ea4f2ef0748f43c45..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/src/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/RSP_Protocol
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/RSP_Protocol
-
-EXTRA_DIST = \
-	EPA_Protocol.prot \
-	RSP_Protocol.prot \
-	RSPFE_Protocol.prot
-
-BUILT_SOURCES = \
-	EPA_Protocol.ph \
-	EPA_Protocol.cc \
-	RSP_Protocol.ph \
-	RSP_Protocol.cc \
-	RSPFE_Protocol.ph \
-	RSPFE_Protocol.cc
-
-pkgincludedir=$(includedir)/APL/RSP_Protocol
-pkginclude_HEADERS = \
-	$(BUILT_SOURCES)
-
-lib_LTLIBRARIES         = librsp_protocol.la
-
-librsp_protocol_la_SOURCES = Package__Version.cc  \
-	$(BUILT_SOURCES) \
-	AllRegisterState.cc \
-	BeamletWeights.cc \
-	BypassSettings.cc \
-	HBASettings.cc \
-	MEPHeader.cc \
-	MEPData.cc \
-	RCUSettings.cc \
-	RSUSettings.cc \
-	SPUStatus.cc \
-	Statistics.cc \
-	SubbandSelection.cc \
-	SystemStatus.cc \
-	TBBSettings.cc \
-	TDStatus.cc \
-	Versions.cc \
-	WGSettings.cc \
-	XCStatistics.cc \
-	Latency.cc
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versionrsp_protocol
-
-versionrsp_protocol_SOURCES      = versionrsp_protocol.cc
-versionrsp_protocol_LDADD        = librsp_protocol.la
-versionrsp_protocol_DEPENDENCIES = librsp_protocol.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSP_Protocol/test/Makefile.am b/MAC/APL/PIC/RSP_Protocol/test/Makefile.am
deleted file mode 100644
index c9db586573ea82c589e820c9a60bb1194ea9e49e..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSP_Protocol/test/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-# scripts used to run tests
-TESTSCRIPTS           =
-
-# scripts and possible programs to run tests
-TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS)
-
-# Lines to build a test program testprg
-#testprg_SOURCES		= testprg.cc
-#testprg_LDADD			= ../src/librsp_protocol.la
-#testprg_DEPENDENCIES		= ../src/librsp_protocol.la $(LOFAR_DEPEND)
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/TBB_Driver/Makefile.am b/MAC/APL/PIC/TBB_Driver/Makefile.am
deleted file mode 100644
index 966349e6749b24e5a0e2d074871bdce3a0657c8b..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Driver/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS= src test 
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      TBBDriver.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/TBB_Driver/TBBDriver.spec.in b/MAC/APL/PIC/TBB_Driver/TBBDriver.spec.in
deleted file mode 100644
index 9e3c6f9ed7b3c8758dd36698eb142022566d95c5..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Driver/TBBDriver.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# TBBDriver.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: TBBDriver is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-TBBDriver ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PIC/TBB_Driver/bootstrap b/MAC/APL/PIC/TBB_Driver/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Driver/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PIC/TBB_Driver/configure.in b/MAC/APL/PIC/TBB_Driver/configure.in
deleted file mode 100644
index e45b61ebdf3ba6fd2ecdd7e145abe266bb5e6520..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Driver/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(TBB_Driver, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(MAC/APL/TestSuite, TestSuite, , 1, TestSuite/test.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/APL/PIC/TBB_Protocol,TBB_Protocol,,1,APL/TBB_Protocol/TBB_Protocol.ph,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-TBBDriver.spec
-)
diff --git a/MAC/APL/PIC/TBB_Driver/src/Makefile.am b/MAC/APL/PIC/TBB_Driver/src/Makefile.am
deleted file mode 100644
index 8ec30ad44bc96c54792a36054019c798782076ac..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Driver/src/Makefile.am
+++ /dev/null
@@ -1,164 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include
-	
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-#	cp $*.ph $(top_builddir)/include/APL/TBBDriver/
-	
-BUILT_SOURCES = \
-	TP_Protocol.ph \
-	TP_Protocol.cc 
-
-# TBBDriver.conf is generated from MAC/Deployment/data/StaticMetadata
-#sysconf_DATA = TBBDriver.conf 
-
-#%.conf: %.conf.in
-#	cp $< $@
-	
-lib_LTLIBRARIES = \
-	libtbbdriver.la \
-	libtp_protocol.la
-
-EXTRA_DIST = \
-	$(BUILT_SOURCES) \
-	TP_Protocol.prot 
-
-libtbbdriver_la_SOURCES = Package__Version.cc \
-	DriverSettings.cc \
-	Command.cc \
-	AllocCmd.cc \
-	BoardCmdHandler.cc \
-	MsgHandler.cc \
-	FreeCmd.cc \
-	RecordCmd.cc \
-	StopCmd.cc \
-	TrigReleaseCmd.cc \
-	TrigGenCmd.cc\
-	TrigSetupCmd.cc\
-	TrigSetupSameCmd.cc\
-	TrigCoefCmd.cc\
-	TrigCoefSameCmd.cc\
-	TrigInfoCmd.cc\
-	ReadCmd.cc \
-	UdpCmd.cc \
-	PageperiodCmd.cc \
-	VersionCmd.cc \
-	SizeCmd.cc \
-	StatusCmd.cc \
-	ClearCmd.cc \
-	ResetCmd.cc \
-	ConfigCmd.cc \
-	ErasefCmd.cc \
-	ReadfCmd.cc \
-	WritefCmd.cc \
-	ImageInfoCmd.cc \
-	ReadwCmd.cc \
-	WritewCmd.cc \
-	ReadrCmd.cc \
-	WriterCmd.cc \
-	ReadxCmd.cc	\
-	ArpCmd.cc \
-	ArpModeCmd.cc \
-	StopCepCmd.cc	\
-	CepStatusCmd.cc	\
-	CepDelayCmd.cc	\
-	WatchDogCmd.cc \
-	TempLimitCmd.cc
-
-libtp_protocol_la_SOURCES = \
-	TP_Protocol.ph \
-	TP_Protocol.cc \
-	RawEvent.h \
-	RawEvent.cc
-
-pkginclude_HEADERS = Package__Version.h  $(BUILT_SOURCES)
-
-noinst_HEADERS = \
-	DriverSettings.h \
-	Command.h \
-	AllocCmd.h \
-	BoardCmdHandler.h \
-	MsgHandler.h \
-	FreeCmd.h \
-	RecordCmd.h \
-	StopCmd.h \
-	TrigReleaseCmd.h \
-	TrigGenCmd.h\
-	TrigSetupCmd.h\
-	TrigSetupSameCmd.h\
-	TrigCoefCmd.h\
-	TrigCoefSameCmd.h\
-	TrigInfoCmd.h\
-	ReadCmd.h \
-	UdpCmd.h \
-	PageperiodCmd.h \
-	VersionCmd.h \
-	SizeCmd.h \
-	StatusCmd.h \
-	ClearCmd.h \
-	ResetCmd.h \
-	ConfigCmd.h \
-	ErasefCmd.h \
-	ReadfCmd.h \
-	WritefCmd.h	\
-	ImageInfoCmd.h \
-	ReadwCmd.h \
-	WritewCmd.h	\
-	ReadrCmd.h \
-	WriterCmd.h \
-	ReadxCmd.h	\
-	ArpCmd.h \
-	ArpModeCmd.h \
-	StopCepCmd.h \
-	CepStatusCmd.h \
-	CepDelayCmd.h \
-	WatchDogCmd.h \
-	TempLimitCmd.h	\
-	UdpIpTools.h
-
-#NOINSTdir	=
-
-# AM_YFLAGS               = -d -p KeyParse
-# AM_LFLAGS               = -PKeyTokenize
-# LEX_OUTPUT_ROOT         = lex.KeyTokenize
-
-# if HAVE_SHMEM
-# libtbbdriver_la_LIBADD     = shmem/libshmem.la
-# endif
-
-bin_PROGRAMS = versiontbb_driver \
-	TBBDriver \
-	tbbctl
-
-# Lines to build a program prg
-#prg_SOURCES		= prg.cc
-#prg_LDADD		= libtbbdriver.la
-#prg_DEPENDENCIES	= libtbbdriver.la $(LOFAR_DEPEND)
-
-tbbctl_SOURCES 			= tbbctl.h tbbctl.cc
-
-TBBDriver_SOURCES 		= TBBDriver.h TBBDriver.cc
-TBBDriver_LDADD 		= libtbbdriver.la libtp_protocol.la
-TBBDriver_DEPENDENCIES  = libtbbdriver.la libtp_protocol.la $(LOFAR_DEPEND)
-
-versiontbb_driver_SOURCES      = versiontbb_driver.cc
-versiontbb_driver_LDADD        = libtbbdriver.la
-versiontbb_driver_DEPENDENCIES = libtbbdriver.la $(LOFAR_DEPEND)
-
-
-glishdir = $(libexecdir)/glish
-dist_glish_SCRIPTS = 
-
-pythondir = $(bindir)
-dist_python_SCRIPTS = 
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/TBB_Driver/test/Makefile.am b/MAC/APL/PIC/TBB_Driver/test/Makefile.am
deleted file mode 100644
index ff596da939a4180255a74af6130a5060c047f094..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Driver/test/Makefile.am
+++ /dev/null
@@ -1,92 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-
-# scripts used to run tests
-#TESTSCRIPTS           =
-
-# scripts and possible programs to run tests
-#TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-#EXTRA_DIST            = $(TESTSCRIPTS)
-
-# Lines to build a test program testprg
-#testprg_SOURCES		= testprg.cc
-#testprg_LDADD			= ../src/libtbbdriver.la
-#testprg_DEPENDENCIES		= ../src/libtbbdriver.la $(LOFAR_DEPEND)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src
-
-# TESTS = \
-# 	TBBTest \
-# 	TPStub
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-	cp $*.ph $(top_builddir)/include/TBBDriver/TP_Protocol
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-	cp $*.ph $(top_builddir)/include/TBBDriver/TP_Protocol
-	
-BUILT_SOURCES = \
-	TBBTest.conf \
-	TPStub.conf 
-
-lib_LTLIBRARIES = \
-	libtbbstub.la	
-	
-EXTRA_DIST = \
-	$(BUILT_SOURCES) \
-	TP_Protocol.prot 
-
-sysconf_DATA = \
-	TPStub.conf \
-	TBBTest.conf 
-
-
-%.properties: $(MAC_CONFIG)/%.properties
-	cp $< $@
-
-%.conf: %.conf.in
-	cp $< $@
-
-libtbbstub_la_SOURCES = \
-	StubRawEvent.h \
-	StubRawEvent.cc 
-
-sbin_PROGRAMS = \
-	TPStub \
-	TBBTest
-
-#check_PROGRAMS = \
-#	TBBTest
-
-TBBTest_SOURCES = \
-	TBBTest.h \
-	TBBTest.cc
-
-TPStub_SOURCES = \
-	TPStub.h \
-	TPStub.cc
-
-TPStub_LDADD = \
-	libtbbstub.la \
-  $(top_builddir)/src/libtp_protocol.la \
-  $(top_builddir)/src/libtbbdriver.la
- 
-TPStub_DEPENDENCIES = \
-	libtbbstub.la \
-	$(top_builddir)/src/libtbbdriver.la \
-	$(top_builddir)/src/libtp_protocol.la \
-	$(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/TBB_Protocol/Makefile.am b/MAC/APL/PIC/TBB_Protocol/Makefile.am
deleted file mode 100644
index 1579a731b8debefebbbc71b11988255eb21877a5..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Protocol/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-SUBDIRS	= src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-gcftm=$(prefix) \
-	--with-rtccommon=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      TBB_Protocol.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/TBB_Protocol/TBB_Protocol.spec.in b/MAC/APL/PIC/TBB_Protocol/TBB_Protocol.spec.in
deleted file mode 100644
index a48ebc65e6cd09358b15bc6bbd75d162ef29113d..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Protocol/TBB_Protocol.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# TBB_Protocol.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary:TBB_Protocol contains the library and headers necessary to communicate with the TBB board
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-TBB_Protocol is a package containing the library and headers needed to communicate
-with the TBBDriver. All events and any classes in the events are contained in the
-library and header files.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/PIC/TBB_Protocol/bootstrap b/MAC/APL/PIC/TBB_Protocol/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Protocol/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PIC/TBB_Protocol/configure.in b/MAC/APL/PIC/TBB_Protocol/configure.in
deleted file mode 100644
index 0190c3bbf848bece02d9ec6aa12d4327cf55716f..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Protocol/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(TBB_Protocol, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/GCF_Event.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-include/Makefile
-include/APL/TBB_Protocol/Makefile
-TBB_Protocol.spec
-)
diff --git a/MAC/APL/PIC/TBB_Protocol/include/APL/TBB_Protocol/Makefile.am b/MAC/APL/PIC/TBB_Protocol/include/APL/TBB_Protocol/Makefile.am
deleted file mode 100644
index 2624c56b40db9e10d5649ff8e9519db107badf42..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Protocol/include/APL/TBB_Protocol/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-pkgincludedir = $(includedir)/APL/TBB_Protocol
diff --git a/MAC/APL/PIC/TBB_Protocol/include/Makefile.am b/MAC/APL/PIC/TBB_Protocol/include/Makefile.am
deleted file mode 100644
index b22d3a37922510827d8b41f62cfe7639eea0af3c..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Protocol/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APL/TBB_Protocol
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/TBB_Protocol/src/Makefile.am b/MAC/APL/PIC/TBB_Protocol/src/Makefile.am
deleted file mode 100644
index 8bc59d4a71efa7701ee934937b84adc4b77f3da3..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/TBB_Protocol/src/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/TBB_Protocol
-
-EXTRA_DIST = \
-	TBB_Protocol.prot
-
-BUILT_SOURCES = \
-	TBB_Protocol.ph\
-	TBB_Protocol.cc
-	
-pkgincludedir=$(includedir)/APL/TBB_Protocol
-pkginclude_HEADERS = \
-	$(BUILT_SOURCES)
-
-lib_LTLIBRARIES         = libtbb_protocol.la
-
-libtbb_protocol_la_SOURCES = Package__Version.cc  \
-	$(BUILT_SOURCES) 
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versiontbb_protocol
-
-versiontbb_protocol_SOURCES      = versiontbb_protocol.cc
-versiontbb_protocol_LDADD        = libtbb_protocol.la
-versiontbb_protocol_DEPENDENCIES = libtbb_protocol.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/bootstrap b/MAC/APL/PIC/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/PIC/lofarconf.in b/MAC/APL/PIC/lofarconf.in
deleted file mode 100644
index 991e9a077a4e30c518a098213358597cc8075d55..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/lofarconf.in
+++ /dev/null
@@ -1,4 +0,0 @@
-RSP_Protocol
-RSP_Driver
-TBB_Protocol
-TBB_Driver
diff --git a/MAC/APL/PIC/rsuctl/Makefile.am b/MAC/APL/PIC/rsuctl/Makefile.am
deleted file mode 100644
index f6f64dfa771b390e22b4c557baef16fc356be738..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/rsuctl/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-sbin_SCRIPTS = \
-	rsuctl\
-	rsuctl3 \
-	rsuctl3_reset \
-	README.rsuctl
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/rsuctl/bootstrap b/MAC/APL/PIC/rsuctl/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/rsuctl/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/APL/PIC/rsuctl/configure.in b/MAC/APL/PIC/rsuctl/configure.in
deleted file mode 100644
index 2de2c5ebe76cfeffe3885f61678d676362870f03..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/rsuctl/configure.in
+++ /dev/null
@@ -1,42 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(rsuctl)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(rsuctl, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_LN_S
-
-dnl Checks for header files.
-dnl AC_HEADER_STDC
-dnl AC_CHECK_HEADERS(unistd.h sys/timepps.h sys/mman.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl AC_C_CONST
-dnl AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-d nlAC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-dnl lofar_PVSS(1)
-
-dnl PPS_API needed by RSPDriver
-dnl AC_CHECK_HEADER([sys/timepps.h])
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-	Makefile
-)
diff --git a/MAC/APL/RTCCommon/Makefile.am b/MAC/APL/RTCCommon/Makefile.am
deleted file mode 100644
index cb471a70d908a4a4fc398f3d4768c469dc521001..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-SUBDIRS = src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-common=$(prefix) \
-	--with-suite=$(prefix)\
-	--with-gcftm=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      RTCCommon.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
-
-
diff --git a/MAC/APL/RTCCommon/RTCCommon.spec.in b/MAC/APL/RTCCommon/RTCCommon.spec.in
deleted file mode 100644
index 48145a7a95d434e1f7ae9f5a5fffc8a09a7aed52..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/RTCCommon.spec.in
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# RTCCommon.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: RTCCommon contains a library of widely used classes in the LOFAR RTC software.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The RTCCommon package contains a library of widely used classes in the the RTC
-(real-time control) software.
-The following classes are part of this package:
-	Timestamp.[cc|h]	- Timestamp class
-	PSAccess.h		- Macro's for access to property sets.
-	Marshalling.h		- Macro's to marshall blitz arrays as part of events.
-	Observer.[cc|h]         - Observer/Subject pattern
-	Subject.[cc|h]		- Observer/Subject pattern
-	TestSuite.h		- Macro's to ease use of test suite classes.
-	gnuplot_i.h		- API to use gnuplot from within software
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/RTCCommon/bootstrap b/MAC/APL/RTCCommon/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/RTCCommon/configure.in b/MAC/APL/RTCCommon/configure.in
deleted file mode 100644
index f354bc673afb16a3538c628325345b18dc48958b..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/Timestamp.cc)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(RTCCommon, 6.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([string.h sys/time.h unistd.h sys/types.h sys/stat.h sys/resource.h signal.h])
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-	RTCCommon.spec
-	Makefile
-	src/Makefile
-	test/Makefile
-	include/Makefile
-	include/APL/RTCCommon/Makefile
-)
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Makefile.am b/MAC/APL/RTCCommon/include/APL/RTCCommon/Makefile.am
deleted file mode 100644
index a15fbab7950878bfe029ed25a13ea0162fa7a958..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgincludedir = $(includedir)/APL/RTCCommon
-
-pkginclude_HEADERS = Package__Version.h  \
-					 gnuplot_i.h \
-					 MarshallBlitz.h \
-					 Observer.h \
-					 PSAccess.h \
-					 Subject.h \
-					 TestSuite.h \
-					 Timestamp.h \
-					 daemonize.h \
-					 RegisterState.h 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTCCommon/include/Makefile.am b/MAC/APL/RTCCommon/include/Makefile.am
deleted file mode 100644
index 6a3689028b333722748e29f82db2214eba98dd91..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APL/RTCCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTCCommon/src/Makefile.am b/MAC/APL/RTCCommon/src/Makefile.am
deleted file mode 100644
index 14045064b42a617ce62ee4ccd68138b43288d05e..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/src/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-BUILT_SOURCES = 
-
-clean-local:
-	rm -f *.ph
-
-EXTRA_DIST 	= $(BUILT_SOURCES) \
-			  rc.status
-
-etcdir		= $(prefix)/etc
-etc_SCRIPTS = rc.status
-
-sysconf_DATA =
-
-lib_LTLIBRARIES = librtccommon.la libgnuplot_i.la
-
-librtccommon_la_SOURCES   = Package__Version.cc  \
-							Timestamp.cc \
-							Subject.cc \
-							daemonize.c \
-							RegisterState.cc
-
-libgnuplot_i_la_SOURCES  = gnuplot_i.cc
-
-bin_PROGRAMS = versionrtccommon
-
-versionrtccommon_SOURCES      = versionrtccommon.cc
-versionrtccommon_LDADD        = librtccommon.la
-versionrtccommon_DEPENDENCIES = librtccommon.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTCCommon/test/Makefile.am b/MAC/APL/RTCCommon/test/Makefile.am
deleted file mode 100644
index 255cc99f9ebc8d8ace30cb5ca6aec571764043b5..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/test/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-CHECKTOOLPROGS				= tMarshallBlitz tBlitz 
-
-check_PROGRAMS				= $(CHECKTOOLPROGS)
-
-TESTSCRIPTS					= 
-
-TESTS						= $(TESTSCRIPTS)
-
-tMarshallBlitz_SOURCES		= tMarshallBlitz.cc
-tMarshallBlitz_LDADD		= 
-tMarshallBlitz_DEPENCIES	= $(LOFAR_DEPEND)
-
-tBlitz_SOURCES				= tBlitz.cc
-tBlitz_LDADD				= 
-tBlitz_DEPENCIES			= $(LOFAR_DEPEND)
-
-EXTRA_DIST					= 
-
-NOINSTHDRS =
-
-INSTHDRS =
-
-pkginclude_HEADERS = $(NOINSTHDRS) $(INSTHDRS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTDBCommon/Makefile.am b/MAC/APL/RTDBCommon/Makefile.am
deleted file mode 100644
index afcb8632d61a12656c527b1696ca8516e9174785..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      RTDBCommon.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTDBCommon/RTDBCommon.spec.in b/MAC/APL/RTDBCommon/RTDBCommon.spec.in
deleted file mode 100644
index 6540514dde8f5a5a5aaf8296d4634034d4f7e15d..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/RTDBCommon.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# RTDBCommon.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Generic routines for communicating with the RTDB applications.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: GCFPVSS = 6.0
-Requires: GCFRTDB = 6.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-RTDBCommon contains routines for communicating with RTDB-based applications.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/RTDBCommon/bootstrap b/MAC/APL/RTDBCommon/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/RTDBCommon/configure.in b/MAC/APL/RTDBCommon/configure.in
deleted file mode 100644
index 4b6aabd45007c347219c8d1f937620ade6ad1354..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/configure.in
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(RTDBCommon, 3.1, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_PVSS(1)
-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/PVSS, GCFPVSS, , 1, GCF/PVSS/PVSSservice.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/APL/RTDBCommon/Makefile
-src/Makefile
-test/Makefile
-Makefile
-RTDBCommon.spec
-)
diff --git a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am
deleted file mode 100644
index 8b8a74bc5dd3f78d956601e0e5d1dbef6f2fa97a..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-INSTHDRS 			= RTDButilities.h ClaimMgrTask.h
-
-NOINSTHDRS 			=
-TCCHDRS 			=
-pkgincludedir 		= $(includedir)/APL/RTDBCommon
-pkginclude_HEADERS 	= Package__Version.h  $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS 		= $(NOINSTHDRS)
-
-DOCHDRS 			= $(INSTHDRS) $(NOINSTHDRS)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/RTDBCommon/include/Makefile.am b/MAC/APL/RTDBCommon/include/Makefile.am
deleted file mode 100644
index 94347630a75040c204c5d580caff46f38079b590..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS = APL/RTDBCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTDBCommon/src/Makefile.am b/MAC/APL/RTDBCommon/src/Makefile.am
deleted file mode 100644
index 608db06e9118ffa71b155f971c6ef866adb9efaf..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/src/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AM_CPPFLAGS = -DUSES_NEW_IOSTREAMS
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/APL/RTDBCommon
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versionrtdbcommon
-
-INSTHDRS					= CM_Protocol.ph 
-NOINSTHDRS					=    
-BUILT_SOURCES 				= CM_Protocol.cc \
-							  CM_Protocol.ph
-
-pkgincludedir				= $(includedir)/APL/RTDBCommon
-pkginclude_HEADERS			= $(NOINSTHDRS) $(INSTHDRS)
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-EXTRA_DIST 					= $(sysconf_DATA)
-
-# libraries
-lib_LTLIBRARIES 			= librtdbcommon.la
-
-librtdbcommon_la_SOURCES	= Package__Version.cc \
-							  $(BUILT_SOURCES) \
-							  RTDButilities.cc \
-							  ClaimMgrTask.cc 
-
-# version stuff
-versionrtdbcommon_SOURCES      = versionrtdbcommon.cc
-versionrtdbcommon_LDADD        = librtdbcommon.la
-versionrtdbcommon_DEPENDENCIES = librtdbcommon.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/RTDBCommon/test/Makefile.am b/MAC/APL/RTDBCommon/test/Makefile.am
deleted file mode 100644
index 1076c5c72816890ef2fc44638e9a0b630128f2bb..0000000000000000000000000000000000000000
--- a/MAC/APL/RTDBCommon/test/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AM_CPPFLAGS 					= -DUSES_NEW_IOSTREAMS -I../src
-
-check_PROGRAMS 					= tRTDButilities tClaimManager
-
-TESTS							= 
-
-tRTDButilities_SOURCES 			= $(BUILT_SOURCES) tRTDButilities.cc
-tRTDButilities_LDADD			= ../src/librtdbcommon.la $(LOFAR_DEPEND)
-tRTDButilities_DEPENDENCIES		= ../src/librtdbcommon.la $(LOFAR_DEPEND)
-
-tClaimManager_SOURCES 			= $(BUILT_SOURCES) tClaimManager.cc
-tClaimManager_LDADD				= ../src/librtdbcommon.la $(LOFAR_DEPEND)
-tClaimManager_DEPENDENCIES		= ../src/librtdbcommon.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
-
-
diff --git a/MAC/APL/StationCU/Makefile.am b/MAC/APL/StationCU/Makefile.am
deleted file mode 100644
index f0ae03f7b2741584d82622c80d6b423b5279b834..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      StationCU.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StationCU/StationCU.spec.in b/MAC/APL/StationCU/StationCU.spec.in
deleted file mode 100644
index 3ce67609b8589603e577ab65d5c0a48dfeab2e99..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/StationCU.spec.in
+++ /dev/null
@@ -1,171 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# StationCU.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The StationCU contains all controllers for the stations.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: OTDB = 1.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: GCFPAL = 6.0
-Requires: APLCommon = 3.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The StationCU contains all controllers for the stations.
-BeamControl to control the BeamServer.
-CalibartionControl to control the CalibrationServer.
-ClockControl to control the station clock.
-StationControl is the master controlller of the station.
-TBBControl to control the TBB boards.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/StationCU/bootstrap b/MAC/APL/StationCU/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/StationCU/configure.in b/MAC/APL/StationCU/configure.in
deleted file mode 100644
index 58965ec4b3fdee678381f89e6fab95ed3381c61d..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/configure.in
+++ /dev/null
@@ -1,93 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(StationCU, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_PVSS(1)
-lofar_BLITZ
-lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.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,,)
-lofar_INTERNAL(MAC/GCF/PVSS, GCFPVSS,, 1, GCF/PVSS/PVSSservice.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB,, 1, GCF/RTDB/RTDB_PropertySet.h,,)
-lofar_INTERNAL(MAC/APL/VHECR, VHECR,, 1, VHECR/VHECRTask.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(MAC/APL/PAC/BS_Protocol, BS_Protocol,, 1, APL/BS_Protocol/BS_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol,, 1, APL/CAL_Protocol/CAL_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol,, 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PIC/TBB_Protocol, TBB_Protocol,, 1, APL/TBB_Protocol/TBB_Protocol.ph,,)
-lofar_EXTERNAL(boost,1.32,boost/date_time/date.hpp, boost_date_time-gcc)
-dnl lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
-dnl lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-include/Makefile
-include/APL/ClockProtocol/Makefile
-src/Makefile
-src/BeamControl/Makefile
-src/CalibrationControl/Makefile
-src/ClockProtocol/Makefile
-src/ClockControl/Makefile
-src/StationControl/Makefile
-src/TBBControl/Makefile
-src/HardwareMonitor/Makefile
-Makefile
-StationCU.spec
-)
diff --git a/MAC/APL/StationCU/include/APL/ClockProtocol/Makefile.am b/MAC/APL/StationCU/include/APL/ClockProtocol/Makefile.am
deleted file mode 100644
index a67d7f9da916b7643f92acd287c94a0b88d849f7..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/include/APL/ClockProtocol/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/StationCU/include/Makefile.am b/MAC/APL/StationCU/include/Makefile.am
deleted file mode 100644
index 0a329cd8b8eec63aa7f76fc3ecaa0351e7d345d3..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/include/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-SUBDIRS = APL/ClockProtocol
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/StationCU/src/BeamControl/Makefile.am b/MAC/APL/StationCU/src/BeamControl/Makefile.am
deleted file mode 100644
index 3724edcfd166063bf4319d9a72d834d235e5af26..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/BeamControl/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-bin_PROGRAMS 				= BeamControl
-
-BeamControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once
-
-BeamControl_SOURCES			= ../Package__Version.cc \
-							  BeamControl.cc \
-							  BeamControlMain.cc 
-
-BeamControl_LDADD			= $(LOFAR_DEPEND)
-BeamControl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= BeamControl.h \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StationCU/src/CalibrationControl/Makefile.am b/MAC/APL/StationCU/src/CalibrationControl/Makefile.am
deleted file mode 100644
index 0d1e13a9d30f3c487e5615fff9b754ed51e8bdd1..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/CalibrationControl/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-bin_PROGRAMS 				= CalibrationControl
-
-CalibrationControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once
-
-CalibrationControl_SOURCES		= ../Package__Version.cc \
-							  	  CalibrationControl.cc \
-								  CalibrationControlMain.cc 
-
-CalibrationControl_LDADD		= $(LOFAR_DEPEND)
-CalibrationControl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= CalibrationControl.h \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-sysconf_DATA		= CalibrationControl.conf 
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StationCU/src/ClockControl/Makefile.am b/MAC/APL/StationCU/src/ClockControl/Makefile.am
deleted file mode 100644
index 9e060c845c14f4fb13da85475964e431033271d0..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/ClockControl/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-AM_CPPFLAGS					= -I../../src/ClockProtocol
-
-bin_PROGRAMS 				= ClockControl clkctl
-
-ClockControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once \
-								  -I$(top_builddir)/include \
-								  -I../../src/ClockProtocol
-
-ClockControl_SOURCES		= ../Package__Version.cc \
-								  ClockControl.cc \
-								  ClockControlMain.cc 
-ClockControl_LDADD			= $(top_builddir)/src/ClockProtocol/libclock_protocol.la $(LOFAR_DEPEND)
-ClockControl_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-
-clkctl_SOURCES				= clkctl.cc
-clkctl_LDADD				= $(top_builddir)/src/ClockProtocol/libclock_protocol.la $(LOFAR_DEPEND)
-clkctl_DEPENDENCIES			= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= ClockControl.h \
-							  PVSSDatapointDefs.h \
-							  clkctl.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	= 
-sysconf_DATA		= 
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StationCU/src/ClockProtocol/Makefile.am b/MAC/APL/StationCU/src/ClockProtocol/Makefile.am
deleted file mode 100644
index f5ef97a2ad7edda05eb00e3b8ec7401bd638c528..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/ClockProtocol/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO  $<
-	cp $*.ph $(top_builddir)/include/APL/ClockProtocol
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-EXTRA_DIST 				= Clock_Protocol.prot
-
-BUILT_SOURCES 			= Clock_Protocol.ph Clock_Protocol.cc
-
-pkgincludedir			= $(includedir)/APL/ClockProtocol
-pkginclude_HEADERS		= $(BUILT_SOURCES)
-
-lib_LTLIBRARIES			= libclock_protocol.la
-
-libclock_protocol_la_SOURCES = $(BUILT_SOURCES)
-
-clean-local:
-	rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/Makefile.am b/MAC/APL/StationCU/src/HardwareMonitor/Makefile.am
deleted file mode 100644
index 985c01711c929dc14ba64a59770dff513add5039..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/HardwareMonitor/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-#	cp $*.ph $(top_builddir)/include/APL/StationCU/
-	
-BUILT_SOURCES = \
-	EC_Protocol.ph \
-	EC_Protocol.cc 
-
-
-bin_PROGRAMS 				= HardwareMonitor
-
-HardwareMonitor_CPPFLAGS	= -Wno-deprecated \
-							  -fmessage-length=0 \
-							  -fdiagnostics-show-location=once
-
-HardwareMonitor_SOURCES		= ../Package__Version.cc \
-							  HardwareMonitorMain.cc \
-							  RSPMonitor.cc  \
-							  TBBMonitor.cc \
-							  ECMonitor.cc \
-							  EC_Protocol.cc 
-
-HardwareMonitor_LDADD		= $(LOFAR_DEPEND)
-HardwareMonitor_DEPENDENCIES= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= RSPMonitor.h \
-							  TBBMonitor.h \
-							  RCUConstants.h \
-							  ECMonitor.h \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-sysconf_DATA				= HardwareMonitor.conf
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StationCU/src/Makefile.am b/MAC/APL/StationCU/src/Makefile.am
deleted file mode 100644
index 10f0d2a4bb0135831cce8d8ecd7fd9d5c381a4a7..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AM_CPPFLAGS = -DUSES_NEW_IOSTREAMS
-
-
-lib_LTLIBRARIES 		= libstationcu.la
-libstationcu_la_SOURCES = Package__Version.cc
-
-#pkginclude_HEADERS = Package__Version.h
-
-SUBDIRS = BeamControl CalibrationControl ClockProtocol ClockControl StationControl TBBControl HardwareMonitor
-
-bin_PROGRAMS = versionstationcu
-
-versionstationcu_SOURCES      = versionstationcu.cc
-versionstationcu_LDADD        = libstationcu.la
-versionstationcu_DEPENDENCIES = libstationcu.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/StationCU/src/StationControl/Makefile.am b/MAC/APL/StationCU/src/StationControl/Makefile.am
deleted file mode 100644
index 941f1245af989f7fc3647ddbb19f75b9c52aac01..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/StationControl/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-AM_CPPFLAGS					= -I../../src/ClockProtocol
-
-bin_PROGRAMS 				= StationControl
-
-StationControl_CPPFLAGS		= -Wno-deprecated \
-								  -fmessage-length=0 \
-								  -fdiagnostics-show-location=once \
-								  -I../../src//ClockProtocol
-
-StationControl_SOURCES		= ../Package__Version.cc \
-							  StationControl.cc \
-							  ActiveObs.cc \
-							  StationControlMain.cc 
-
-StationControl_LDADD		= $(LOFAR_DEPEND) $(top_builddir)/src/ClockProtocol/libclock_protocol.la
-StationControl_DEPENDENCIES	= $(LOFAR_DEPEND) $(top_builddir)/src/ClockProtocol/libclock_protocol.la
-
-NOINSTHDRS 					= StationControl.h \
-							  ActiveObs.h \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA 	=
-sysconf_DATA		= StationControl.conf
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StationCU/src/TBBControl/Makefile.am b/MAC/APL/StationCU/src/TBBControl/Makefile.am
deleted file mode 100644
index 6448ffcc70cc2a343f69326125ec6619744fba00..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/TBBControl/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-bin_PROGRAMS 				= TBBControl
-
-TBBControl_CPPFLAGS			= -Wno-deprecated \
-							  -fmessage-length=0 \
-							  -fdiagnostics-show-location=once
-
-TBBControl_SOURCES			= ../Package__Version.cc \
-							  TBBControl.cc \
-							  TBBObservation.cc \
-							  TBBControlMain.cc 
-TBBControl_LDADD			= $(LOFAR_DEPEND)
-TBBControl_DEPENDENCIES		= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= TBBControl.h \
-							  TBBObservation.h  \
-							  PVSSDatapointDefs.h
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir				= $(bindir)
-configfiles_DATA 			= 
-sysconf_DATA				= TBBControl.conf
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StsMisc/Makefile.am b/MAC/APL/StsMisc/Makefile.am
deleted file mode 100644
index b238420da9aa70ba226e1bc5622394b1907a05dd..0000000000000000000000000000000000000000
--- a/MAC/APL/StsMisc/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src 
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      StsMisc.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/StsMisc/StsMisc.spec.in b/MAC/APL/StsMisc/StsMisc.spec.in
deleted file mode 100644
index 4801e11093e6929e20501831c749fe32a0f2ddad..0000000000000000000000000000000000000000
--- a/MAC/APL/StsMisc/StsMisc.spec.in
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# StsMisc.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: APLCommon contains the common MAC-APL classes.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-APLCommon is the package containing the common classes for the APL layer 
-of MAC.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/StsMisc/bootstrap b/MAC/APL/StsMisc/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/StsMisc/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/StsMisc/configure.in b/MAC/APL/StsMisc/configure.in
deleted file mode 100644
index 53f187422e0338e53439a0758cecfacd7e6bcf90..0000000000000000000000000000000000000000
--- a/MAC/APL/StsMisc/configure.in
+++ /dev/null
@@ -1,67 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(StsMisc, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-dnl lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-StsMisc.spec
-)
diff --git a/MAC/APL/TestCtlr/Makefile.am b/MAC/APL/TestCtlr/Makefile.am
deleted file mode 100644
index 972b3523d38f868cf15d98dec944912db5e9eed7..0000000000000000000000000000000000000000
--- a/MAC/APL/TestCtlr/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      MainCU.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/TestCtlr/TestCtlr.spec.in b/MAC/APL/TestCtlr/TestCtlr.spec.in
deleted file mode 100644
index 2af4d649de77ee12f12075864f17e5a1f6cec2e7..0000000000000000000000000000000000000000
--- a/MAC/APL/TestCtlr/TestCtlr.spec.in
+++ /dev/null
@@ -1,164 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Test.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Contain a utility to simply the manual testing of controllers.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: GCFTM = 6.0
-Requires: GCFCommon = 6.0
-Requires: APLCommon = 3.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Contains a utility to simply the manual testing of controllers.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/TestCtlr/bootstrap b/MAC/APL/TestCtlr/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/TestCtlr/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/TestCtlr/configure.in b/MAC/APL/TestCtlr/configure.in
deleted file mode 100644
index 959d32db54b2a9f3c967d4cdb5d32178af7299b6..0000000000000000000000000000000000000000
--- a/MAC/APL/TestCtlr/configure.in
+++ /dev/null
@@ -1,71 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(TestCtlr, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,"gcftm",)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,"aplcommon",)
-lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-TestCtlr.spec
-)
diff --git a/MAC/APL/TestCtlr/src/Makefile.am b/MAC/APL/TestCtlr/src/Makefile.am
deleted file mode 100644
index 6936fb5a12fa274ae6c0ec7b12c77fc21ca7c189..0000000000000000000000000000000000000000
--- a/MAC/APL/TestCtlr/src/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-
-sbin_PROGRAMS 				= versiontestctlr ControllerMenu TestController CodeLoggingTest
-
-ControllerMenu_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
-							  -Wno-deprecated \
-							  -fmessage-length=0 \
-							  -fdiagnostics-show-location=once
-
-ControllerMenu_SOURCES		= Package__Version.cc \
-							  ControllerMenu.cc \
-							  ControllerMenuMain.cc
-ControllerMenu_LDADD		= $(LOFAR_DEPEND)
-ControllerMenu_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-TestController_SOURCES		= Package__Version.cc \
-							  TestController.cc \
-							  TestControllerMain.cc
-TestController_LDADD		= $(LOFAR_DEPEND)
-TestController_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-CodeLoggingTest_SOURCES		= Package__Version.cc \
-							  CodeLoggingTest.cc
-CodeLoggingTest_LDADD		= $(LOFAR_DEPEND)
-CodeLoggingTest_DEPENDENCIES	= $(LOFAR_DEPEND)
-
-NOINSTHDRS 					= ControllerMenu.h 
-
-INSTHDRS 					= 
-
-pkginclude_HEADERS 			= Package__Version.h  $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-
-EXTRA_DIST 					= 
-
-versiontestctlr_SOURCES      = versiontestctlr.cc Package__Version.cc
-versiontestctlr_LDADD        = 
-versiontestctlr_DEPENDENCIES = $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/TestSuite/Makefile.am b/MAC/APL/TestSuite/Makefile.am
deleted file mode 100644
index 1ada844b8396a57a9eaacdc236c620b7dd7ade91..0000000000000000000000000000000000000000
--- a/MAC/APL/TestSuite/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      Suite.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/TestSuite/TestSuite.spec.in b/MAC/APL/TestSuite/TestSuite.spec.in
deleted file mode 100644
index ddb36255bb26d2ce0833d0615d1819db569cb83c..0000000000000000000000000000000000000000
--- a/MAC/APL/TestSuite/TestSuite.spec.in
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Suite.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: The test Suite package contains the base classes for the test suite framework.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The test Suite package contains the base classes for the test suite framework.
-
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/TestSuite/bootstrap b/MAC/APL/TestSuite/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/TestSuite/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/TestSuite/configure.in b/MAC/APL/TestSuite/configure.in
deleted file mode 100644
index dba71459ad07189e0d0bde4a993f95ef460aa132..0000000000000000000000000000000000000000
--- a/MAC/APL/TestSuite/configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(TestSuite, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-include/Makefile
-include/TestSuite/Makefile
-src/Makefile
-Makefile
-TestSuite.spec
-)
diff --git a/MAC/APL/TestSuite/include/Makefile.am b/MAC/APL/TestSuite/include/Makefile.am
deleted file mode 100644
index 9d40ec31f223c343f1c6a054230e9fdda3a00f3f..0000000000000000000000000000000000000000
--- a/MAC/APL/TestSuite/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= TestSuite
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/TestSuite/include/TestSuite/Makefile.am b/MAC/APL/TestSuite/include/TestSuite/Makefile.am
deleted file mode 100644
index 618e89ecebaa8ff9dccd6b3041160d479e44fb47..0000000000000000000000000000000000000000
--- a/MAC/APL/TestSuite/include/TestSuite/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	test.h \
-	suite.h
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/TestSuite/src/Makefile.am b/MAC/APL/TestSuite/src/Makefile.am
deleted file mode 100644
index 950a62cd3a1bad043ee6e5ada5d18fec3fa2888d..0000000000000000000000000000000000000000
--- a/MAC/APL/TestSuite/src/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-#pkgincludedir = $(includedir)/Suite
-
-NOINSTHDRS = 
-
-INSTHDRS =
-
-pkginclude_HEADERS = $(NOINSTHDRS) $(INSTHDRS)
-
-DOCHDRS	=	$(pkginclude_HEADERS)
-      
-lib_LTLIBRARIES         = libtestsuite.la
-
-libaplcommon_la_CPPFLAGS= \
-	-I$(top_srcdir)/include \
-	-DBOOST_DISABLE_THREADS \
-	-Wno-deprecated \
-	-fmessage-length=0 \
-        -fdiagnostics-show-location=once
-
-libtestsuite_la_SOURCES= Package__Version.cc  $(DOCHDRS) \
-        suite.cpp \
-        test.cpp
-
-BUILT_SOURCES = 
-
-EXTRA_DIST =
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS = versiontestsuite
-
-versiontestsuite_SOURCES      = versiontestsuite.cc
-versiontestsuite_LDADD        = libtestsuite.la
-versiontestsuite_DEPENDENCIES = libtestsuite.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/APL/VHECR/Makefile.am b/MAC/APL/VHECR/Makefile.am
deleted file mode 100644
index e15a0c53046f786522580d5c87b53f0ba81db15d..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src include test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      VHECR.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/VHECR/VHECR.spec.in b/MAC/APL/VHECR/VHECR.spec.in
deleted file mode 100644
index a7f650ff1a17857c579af31e90d7268efc72acb2..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/VHECR.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# VHECR.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: VHECR contains the VHECR algoritms and I/O structures.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common = 2.3
-Requires: APS = 2.0
-Requires: GCFTM = 6.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-VHECR contains the VHECR algoritms and I/O structures.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/APL/VHECR/bootstrap b/MAC/APL/VHECR/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/APL/VHECR/configure.in b/MAC/APL/VHECR/configure.in
deleted file mode 100644
index 1bdf41f949fa3f06ef4a9f029ddc9667dbfe7a61..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/configure.in
+++ /dev/null
@@ -1,74 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(VHECR, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_EXTERNAL(BOOST_DATE_TIME,1,boost/date_time/date.hpp, "boost_date_time")
-dnl lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/StationInfo.h,,)
-dnl lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol macio",)
-dnl lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
-dnl lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-include/Makefile
-include/VHECR/Makefile
-test/Makefile
-Makefile
-VHECR.spec
-)
diff --git a/MAC/APL/VHECR/include/Makefile.am b/MAC/APL/VHECR/include/Makefile.am
deleted file mode 100644
index 8731c9b927a57c29ea1b10b2f4db96a126c100da..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= VHECR
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/VHECR/include/VHECR/Makefile.am b/MAC/APL/VHECR/include/VHECR/Makefile.am
deleted file mode 100644
index e70a85b108574cc7c28d26aa9c88dc3d1f0a5358..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/include/VHECR/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	VHECRTask.h \
-	TBBTrigger.h \
-	TBBReadCmd.h 
-
-noinst_HEADERS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/VHECR/src/Makefile.am b/MAC/APL/VHECR/src/Makefile.am
deleted file mode 100644
index bded68cb9d4b00a9e0551c48ad632191fbb78faa..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/src/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-lib_LTLIBRARIES 	= libvhecr.la
-
-libvhecr_la_SOURCES 	= Package__Version.cc \
-	VHECRTask.cc \
-	TBBTrigger.cc \
-	TBBReadCmd.cc
-
-libvhecr_la_SOURCES	+= $(backtrace_SRCS)
-
-bin_PROGRAMS = versionvhecr
-
-versionvhecr_SOURCES      = versionvhecr.cc
-versionvhecr_LDADD        = libvhecr.la
-versionvhecr_DEPENDENCIES = libvhecr.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/VHECR/test/Makefile.am b/MAC/APL/VHECR/test/Makefile.am
deleted file mode 100644
index 6c486da37e4a6ccb76acfdd1e1f94c35542d452c..0000000000000000000000000000000000000000
--- a/MAC/APL/VHECR/test/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-sbin_PROGRAMS 				= VHECRtest
-
-VHECRtest_SOURCES			= VHECRtest.cc
-VHECRtest_LDADD				= ../src/libvhecr.la $(LOFAR_DEPEND)
-VHECRtest_DEPENDENCIES		= ../src/libvhecr.la $(LOFAR_DEPEND)
-
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir				= $(bindir)
-configfiles_DATA 			= 
-sysconf_DATA				= 
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/lofarconf.in b/MAC/APL/lofarconf.in
deleted file mode 100644
index a6b68cd144f800bf01a90267aea11fe5a65b8fdb..0000000000000000000000000000000000000000
--- a/MAC/APL/lofarconf.in
+++ /dev/null
@@ -1,12 +0,0 @@
-APLCommon
-CEPCU
-CUDaemons
-CURTDBDaemons
-MainCU
-PAC
-PIC
-RTCCommon
-RTDBCommon
-StationCU
-TestCtlr
-TestSuite
diff --git a/MAC/Deployment/Deployment.spec.in b/MAC/Deployment/Deployment.spec.in
deleted file mode 100644
index 135b838a9706ec62564b0df2d7860b1ea3138b34..0000000000000000000000000000000000000000
--- a/MAC/Deployment/Deployment.spec.in
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Deployment.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Deployments contains all deployment-related issues and nameconventions.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Deployments contains all deployment-related issues and nameconventions.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/Deployment/Makefile.am b/MAC/Deployment/Makefile.am
deleted file mode 100644
index 3c7b14b2ad7a2f3497e3f52e953bd4fb8b768239..0000000000000000000000000000000000000000
--- a/MAC/Deployment/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=data
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      Deployment.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Deployment/bootstrap b/MAC/Deployment/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/MAC/Deployment/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/MAC/Deployment/configure.in b/MAC/Deployment/configure.in
deleted file mode 100644
index f15f09a3d9e58ab1db4240162d2ac72becb0b9fd..0000000000000000000000000000000000000000
--- a/MAC/Deployment/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Deployment, 0.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR general things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/ApplCommon,ApplCommon,,1,ApplCommon/Observation.h,,)
-lofar_INTERNAL(SAS/OTDB,OTDB,,1,OTDB/OTDBtypes.h,,)
-lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, "boost_date_time boost_regex")
-lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
-lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
-
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-Makefile
-data/Makefile
-data/bin/Makefile
-data/StaticMetaData/Makefile
-data/PVSS/Makefile
-Deployment.spec
-)
diff --git a/MAC/Deployment/data/Makefile.am b/MAC/Deployment/data/Makefile.am
deleted file mode 100644
index e928ec83d3bc2d5c742727f22107941ab63d725d..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= bin StaticMetaData PVSS
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Deployment/data/PVSS/Makefile.am b/MAC/Deployment/data/PVSS/Makefile.am
deleted file mode 100644
index b80b01c0415644769183067808774f52ea424c6c..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/PVSS/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-sbin_SCRIPTS = create_db_files
-
-dist_sbin_SCRIPTS = $(sbin_SCRIPTS)
-
-pvss_dpdir = $(prefix)/pvss/dpdef
-
-pvss_dp_DATA = 	PVSSDataPoints.base 
-pvss_dp_DATA += $(srcdir)/*.dpdef
-pvss_dp_DATA += $(srcdir)/*.list
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Deployment/data/StaticMetaData/Makefile.am b/MAC/Deployment/data/StaticMetaData/Makefile.am
deleted file mode 100644
index 702456bafd9fe0836083155f8d94767c12005219..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/StaticMetaData/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-sbin_SCRIPTS = createFiles
-
-dist_sbin_SCRIPTS = $(sbin_SCRIPTS)
-
-staticmetadir = $(sysconfdir)/StaticMetaData
-
-# These end up in $PREFIX/etc
-sysconf_DATA = $(srcdir)/*.conf
-
-# These end up in $PREFIX/etc/StaticMetaData
-staticmeta_DATA = $(srcdir)/*.tmpl
-staticmeta_DATA += $(srcdir)/*.test
-staticmeta_DATA += $(srcdir)/*.dat
-staticmeta_DATA += $(srcdir)/AntennaArrays/*.conf
-staticmeta_DATA += $(srcdir)/CableDelays/*.conf
-staticmeta_DATA += $(srcdir)/HBADeltas/*.conf
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Deployment/data/bin/Makefile.am b/MAC/Deployment/data/bin/Makefile.am
deleted file mode 100644
index 3ab80538a379b68b46a2c8f3d6aac6f8d639bcb3..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/bin/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-
-sbin_PROGRAMS = load_OTDB_comps load_PICtree PVSS2SAS
-
-load_OTDB_comps_SOURCES   = load_OTDB_comps.cc
-load_OTDB_comps_DEPENCIES = $(LOFAR_DEPEND)
-load_OTDB_comps_LDADD	  =
-
-load_PICtree_SOURCES   = load_PICtree.cc
-load_PICtree_DEPENCIES = $(LOFAR_DEPEND)
-load_PICtree_LDADD	   =
-
-PVSS2SAS_SOURCES   = PVSS2SAS.cc
-PVSS2SAS_DEPENCIES = $(LOFAR_DEPEND)
-PVSS2SAS_LDADD	   =
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Drivers/spid/AUTHORS b/MAC/Drivers/spid/AUTHORS
deleted file mode 100755
index ed98705d22fdacc161b8879542af791b78f071a7..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Authors of the drivers
-
-Tilman Muller <tilman.mueller@ordina.nl> 
diff --git a/MAC/Drivers/spid/ChangeLog b/MAC/Drivers/spid/ChangeLog
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/MAC/Drivers/spid/Makefile.am b/MAC/Drivers/spid/Makefile.am
deleted file mode 100755
index d8482de5f877e29dc70c42c68b1a1a6d03dbb7b5..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-EXTRA_DIST = \
-	mac-spid.spec
-
-SUBDIRS = \
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-	src \
-	aclocal \
-	tools
-
-sbin_SCRIPTS = \
-	load_spid
-  
-if MAKE_RPMS
-rpm: @RPM_TARGET@
-.PHONY: rpm
-
-$(RPM_TARGET): $(DISTFILES)
-	${MAKE} dist
-	-mkdir -p $(RPM_DIR)/SRPMS
-	-mkdir -p `dirname $(RPM_TARGET)`
-	$(RPM_PROG) $(RPM_ARGS) $(RPM_TARBALL)
-	@echo Congratulations, $(RPM_TARGET) "(and friends)" should now exist.
-
-else
-endif
diff --git a/MAC/Drivers/spid/NEWS b/MAC/Drivers/spid/NEWS
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/MAC/Drivers/spid/aclocal/Makefile.am b/MAC/Drivers/spid/aclocal/Makefile.am
deleted file mode 100755
index 1cf8d6184c7548fc5824156110349a20c8be5456..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/aclocal/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
-        am_rpm_init.m4 
\ No newline at end of file
diff --git a/MAC/Drivers/spid/bootstrap b/MAC/Drivers/spid/bootstrap
deleted file mode 100755
index 12c3209dc562337805af78e9b3958b2b63d2bc43..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/bootstrap
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-set -x
-aclocal -I aclocal \
-&& autoheader \
-&& libtoolize --automake --ltdl --copy --force \
-&& autoheader \
-&& automake --gnu --add-missing \
-&& autoconf 
diff --git a/MAC/Drivers/spid/configure.in b/MAC/Drivers/spid/configure.in
deleted file mode 100755
index be42e4bfa572676a10e7780245919ebd515f8bc7..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/configure.in
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/spid.c)
-AM_INIT_AUTOMAKE(mac-spid, 1.0)
-AM_CONFIG_HEADER(config.h)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-
-dnl Checks for library functions.
-
-dnl Check for st_blksize in struct stat
-
-dnl For my am_rpm_init.m4 macros
-RPM_RELEASE=1
-BUILD_KERNEL_VERSION=`uname -r`
-AC_SUBST(RPM_RELEASE)
-AC_SUBST([BUILD_KERNEL_VERSION])
-
-AM_RPM_INIT
-dnl Enable or disable the rpm making rules in Makefile.am
-AM_CONDITIONAL(MAKE_RPMS, test x$make_rpms = xtrue)
-
-dnl internationalization macros
-AC_OUTPUT([		 
-	mac-spid.spec
-	load_spid
-	Makefile
-	src/Makefile
-	aclocal/Makefile
-	tools/Makefile
-])
diff --git a/MAC/Drivers/spid/mac-spid.spec.in b/MAC/Drivers/spid/mac-spid.spec.in
deleted file mode 100755
index 16cd729ed2f06979db4a7ff21e68c2b7bb9a2af4..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/mac-spid.spec.in
+++ /dev/null
@@ -1,199 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# mac-spid.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: This is the simple parallel port driver for the LOFAR ITS control software.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /usr/local/spid
-#define configure_args @RPM_CONFIGURE_ARGS@
-%define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-mac-spid is a simple parallel port driver used in the LOFAR Initial
-Test Station (ITS) control software to drive the distributed clock
-board. A trigger is sent through the parallel port to the clock board
-which distributes it to the connected Twin Input Module (TIM) boards. 
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-%files
-%defattr(-, root, root)
-%prefix
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-%doc COPYING ChangeLog README AUTHORS NEWS
-#doc doc/*
-
-# link the module to the correct path
-%post 
-if [ "%{build_kernel_version}" != "`uname -r`" ]; then
-   echo ""
-   echo "Warning: RPM was built for kernel version %{build_kernel_version}."
-   echo "         Current system is running different kernel version `uname -r`".
-   echo "         The module is installed but may not load or work properly."
-fi
-
-if [ ! -d /lib/modules/`uname -r`/kernel/drivers/char/ ]; then
-	mkdir -p /lib/modules/`uname -r`/kernel/drivers/char
-fi
-ln -s %{prefix}/lib/modules/"%{build_kernel_version}"/kernel/drivers/char/spid.o \
-    /lib/modules/`uname -r`/kernel/drivers/char/spid.o
-depmod -a 
-
-module=spid
-device=spid
-group=users
-mode="664"
-
-# invoke insmod 
-/sbin/rmmod  $module
-/sbin/modprobe $module
-
-# remove stale nodes
-rm -f /dev/${device}?
-
-# get the current major number of the module
-major=`cat /proc/devices | awk "\\$2==\"$module\" {print \\$1}"`
-
-# create the char device(s)
-mknod /dev/${device}0 c $major 0
-
-# give appropriate file permissions
-
-chgrp $group /dev/${device}?
-chmod $mode  /dev/${device}?
-
-%preun
-
-%postun
-# unload the driver
-rmmod spid
-# Remove the symbolic link
-rm /lib/modules/`uname -r`/kernel/drivers/char/spid.o
-depmod -a
-
-# Remove the /dev entries
-rm -f /dev/spid0
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/Drivers/spid/src/Makefile.am b/MAC/Drivers/spid/src/Makefile.am
deleted file mode 100755
index 6d2466a2f8e770ab7aa681f15a3ac0f5813ba6f9..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/src/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-KERNELDIR=/lib/modules/`uname -r`/build
-
-moduledir = $(libdir)/modules/`uname -r`/kernel/drivers/char
-
-module_PROGRAMS = \
-	spid.o
-
-spid_o_SOURCES = \
-	spid.c
-
-spid_o_CFLAGS = \
-	-Wno-unused \
-	-Wall \
-	-D__KERNEL__ \
-	-DMODULE \
-	-I$(KERNELDIR)/include \
-	-O2 
-#
-# To enable the PPSAPI support in the spid driver add
-# -DCONFIG_NTP_PPS_SPID to the spid_o_CFLAGS
-#
-#	-DCONFIG_NTP_PPS_SPID
diff --git a/MAC/Drivers/spid/tools/Makefile.am b/MAC/Drivers/spid/tools/Makefile.am
deleted file mode 100644
index 809d06ed43f64a247edc0daf83f2c7d71b73e11c..0000000000000000000000000000000000000000
--- a/MAC/Drivers/spid/tools/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-bin_PROGRAMS 		= clocksim spidreset
-
-clocksim_SOURCES = ClockSim.c
-
-spidreset_SOURCES = SPIDreset.c
\ No newline at end of file
diff --git a/MAC/GCF/LogSys/CLP/Makefile.am b/MAC/GCF/LogSys/CLP/Makefile.am
deleted file mode 100644
index a014c15b3e0cc91454edade91ee05c7b57830868..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/CLP/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/LogSys/CLP/src/Makefile.am b/MAC/GCF/LogSys/CLP/src/Makefile.am
deleted file mode 100644
index 8aa473db01a41215832e335256faa8afec4b4cc5..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/CLP/src/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-DOCHDRS								= CodeLoggingProcessor.h \
-									  PropertyProxy.h
-   
-noinst_LTLIBRARIES 					= libclp.la
-
-libclp_la_SOURCES					= $(DOCHDRS) \
-									  CodeLoggingProcessor.cc \
-									  PropertyProxy.cc
-
-libclp_la_LIBADD					= 
-AM_CPPFLAGS							= -DLOFARLOGGER_SUBPACKAGE=\"CLP\"
-
-bin_PROGRAMS   						= CodeLoggingProcessor
-  
-CodeLoggingProcessor_SOURCES		= CLPMain.cc
-CodeLoggingProcessor_LDADD		    = libclp.la $(LOFAR_DEPEND) \
-									  $(top_builddir)/KVLogSys/src/libgcfkvlc.la
-CodeLoggingProcessor_DEPENDENCIES	= libclp.la $(LOFAR_DEPEND) \
-									  $(top_builddir)/KVLogSys/src/libgcfkvlc.la
-
-BUILT_SOURCES 						=
-
-EXTRA_DIST 							= $(sysconf_DATA)
-
-sysconf_DATA						= CodeLoggingProcessor.log_prop
-	
-%.conf: %.conf.in
-	cp $< $@
-
-%.log_prop: %.log_prop.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/LogSys/GCFLogSys.spec.in b/MAC/GCF/LogSys/GCFLogSys.spec.in
deleted file mode 100644
index 3f76879b2e74a3049aa21eea717691e0c09dd9b4..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/GCFLogSys.spec.in
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# GCFLogSys.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: GCFLogSys contains the components, which provides the possibility to all kind of MAC applications to (let) log its value changes or save code logging in the OTDB.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: GCFCommon >= 6.1
-Requires: GCFTM >= 6.1
-Requires: GCFProtocols >= 6.1
-Requires: GCFPAL >= 6.1
-#Requires: OTDB
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-GCFLogSys contains the components, which provides the possibility to all kind of MAC applications to (let)
-log its value changes or save code logging in the OTDB.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/GCF/LogSys/KVLogSys/Makefile.am b/MAC/GCF/LogSys/KVLogSys/Makefile.am
deleted file mode 100644
index 161f7455d022a4bf60641cbe45447f4764e96d94..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/KVLogSys/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src test
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am b/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
deleted file mode 100644
index 4a9be72d86d79c42a8941ea205511e522d2e22eb..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-AUTOGEN 							= autogen
-SUFFIXES 							= .ph
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-DOCHDRS								= KVLDefines.h \
-									  KeyValueLoggerDaemon.h \
-									  KeyValueLoggerMaster.h \
-									  KVLUtils.h \
-									  $(BUILT_SOURCES)
-#									  PropertyLogger.h
-   
-bin_PROGRAMS   						= KeyValueLoggerDaemon KeyValueLoggerMaster 
-lib_LTLIBRARIES 					= libgcfkvlc.la libcepkvlc.la
-noinst_LTLIBRARIES 					= libkvld.la libkvlm.la libkvlprot.la
-
-libgcfkvlc_la_SOURCES				= $(DOCHDRS) GCF_KeyValueLogger.cc
-libgcfkvlc_la_LIBADD				= libkvlprot.la
-libgcfkvlc_la_DEPENDENCIES			= libkvlprot.la $(LOFAR_DEPEND)
-libgcfkvlc_la_CPPFLAGS				= -DLOFARLOGGER_SUBPACKAGE=\"KVLC\"
-
-libcepkvlc_la_SOURCES				= $(DOCHDRS) CEPKeyValueLogger.cc
-libcepkvlc_la_LIBADD				= libkvlprot.la
-libcepkvlc_la_DEPENDENCIES			= libkvlprot.la $(LOFAR_DEPEND)
-
-libkvlprot_la_SOURCES				= $(DOCHDRS) \
-									  KVL_Protocol.cc \
-									  KVLUtils.cc
-  
-libkvld_la_SOURCES					= $(DOCHDRS) \
-									  KeyValueLoggerDaemon.cc
-#									  PropertyLogger.cc
-libkvld_la_LIBADD					= libkvlprot.la
-libkvld_la_CPPFLAGS					= -DLOFARLOGGER_SUBPACKAGE=\"KVLD\"
-
-KeyValueLoggerDaemon_SOURCES		= KVLDMain.cc
-KeyValueLoggerDaemon_LDADD		    = libkvld.la $(LOFAR_DEPEND)
-KeyValueLoggerDaemon_DEPENDENCIES	= libkvld.la $(LOFAR_DEPEND)
-KeyValueLoggerDaemon_CPPFLAGS		= $(libkvld_la_CPPFLAGS)
-
-libkvlm_la_SOURCES					= $(DOCHDRS) \
-									  KeyValueLoggerMaster.cc
-libkvlm_la_LIBADD					= libkvlprot.la
-libkvlm_la_CPPFLAGS					= -DLOFARLOGGER_SUBPACKAGE=\"KVLM\"
-
-KeyValueLoggerMaster_SOURCES		= KVLMMain.cc
-KeyValueLoggerMaster_LDADD		    = libkvlm.la $(LOFAR_DEPEND)
-KeyValueLoggerMaster_DEPENDENCIES	= libkvlm.la $(LOFAR_DEPEND)
-KeyValueLoggerMaster_CPPFLAGS		= $(libkvlm_la_CPPFLAGS)
-
-BUILT_SOURCES 						= KVL_Protocol.ph \
-									  KVL_Protocol.cc
-
-EXTRA_DIST 							= $(sysconf_DATA)
-	
-sysconf_DATA						= KeyValueLoggerDaemon.conf \
-									  KeyValueLoggerMaster.conf \
-									  KeyValueLoggerDaemon.log_prop \
-									  KeyValueLoggerMaster.log_prop
-	
-
-%.conf: KeyValueLoggerSys.conf.in
-	cp $< $@
-
-%.log_prop: KeyValueLoggerSys.log_prop.in
-	cp $< $@
-	
-clean-local:
-	rm -f *.ph
-	
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/LogSys/KVLogSys/test/Makefile.am b/MAC/GCF/LogSys/KVLogSys/test/Makefile.am
deleted file mode 100644
index 75554ca51e78bd76a387dbf5f61f953341080570..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/KVLogSys/test/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-check_PROGRAMS 			= tKVLlogger
-
-tKVLlogger_SOURCES 		= tKVLlogger.cc
-tKVLlogger_LDADD		= ../src/libcepkvlc.la $(libdir)/libeventport.la
-tKVLlogger_DEPENDENCIES	= ../src/libcepkvlc.la $(LOFAR_DEPEND)
-
-clean-local:
-	rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/LogSys/Makefile.am b/MAC/GCF/LogSys/Makefile.am
deleted file mode 100644
index f22ac634d4639b83afb955fa17777137596cf098..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=KVLogSys CLP include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-#pkgextdir     = $(prefix)/config/$(PACKAGE)
-#pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-#DISTCHECK_CONFIGURE_FLAGS=\
-#      --with-common=$(prefix) # "common" is an example
-
-EXTRA_DIST = \
-      Makefile.common \
-      GCFLogSys.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/LogSys/bootstrap b/MAC/GCF/LogSys/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/GCF/LogSys/configure.in b/MAC/GCF/LogSys/configure.in
deleted file mode 100644
index 49030ff9928659cecfcb83553f0a60f262d5d3f2..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/configure.in
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(include/GCF/LogSys/GCF_KeyValueLogger.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFLogSys, 6.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_PVSS
-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/TM, eventport, , 1, GCF/TM/EventPort.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(SAS/OTDB, otdb, , 1, OTDB/OTDBconnection.h,,)
-lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
-lofar_EXTERNAL(pq,,libpq-fe.h,)
-
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-KVLogSys/src/Makefile
-KVLogSys/test/Makefile
-KVLogSys/Makefile
-CLP/src/Makefile
-CLP/Makefile
-include/Makefile
-include/GCF/LogSys/Makefile
-Makefile
-GCFLogSys.spec
-)
diff --git a/MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am b/MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am
deleted file mode 100644
index e1a99ad17176631a310ce3d1400a46c03b4e929b..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/include/GCF/LogSys/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-pkgincludedir 				= $(includedir)/GCF/LogSys
-pkginclude_HEADERS 			= GCF_KeyValueLogger.h \
-							  CEPKeyValueLogger.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/LogSys/include/Makefile.am b/MAC/GCF/LogSys/include/Makefile.am
deleted file mode 100644
index f1b5b81990c822f8391c0354b3e2b889df1b3fda..0000000000000000000000000000000000000000
--- a/MAC/GCF/LogSys/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= GCF/LogSys
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/PVSS/GCFPVSS.spec.in b/MAC/GCF/PVSS/GCFPVSS.spec.in
deleted file mode 100644
index d4469ad0d2384e2e70ea45252c0f59a043b611a4..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/GCFPVSS.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# GCFPVSS.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: GCFPVSS is a wrapper around the ETM PVSS classes providing a more convenient interface.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: GCFCommon >= 6.1
-Requires: GCFTM >= 6.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-GCFPVSS is a wrapper around the ETM PVSS classes providing a more convenient interface.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/GCF/PVSS/Makefile.am b/MAC/GCF/PVSS/Makefile.am
deleted file mode 100644
index c8ceb44ec6ae66a97cdc2ed116648df1a32b167a..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-#DISTCHECK_CONFIGURE_FLAGS=\
-#      --with-common=$(prefix) # "common" is an example
-
-EXTRA_DIST = \
-      Makefile.common \
-      GCFPVSS.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/PVSS/bootstrap b/MAC/GCF/PVSS/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/GCF/PVSS/configure.in b/MAC/GCF/PVSS/configure.in
deleted file mode 100644
index dd8ad710b89a2ffd36aa31cc58ff7ed5285745e2..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/configure.in
+++ /dev/null
@@ -1,55 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(include/GCF/PVSS/PVSSservice.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFPVSS, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-include/Makefile
-include/GCF/PVSS/Makefile
-Makefile
-GCFPVSS.spec
-)
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am b/MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am
deleted file mode 100644
index 477ecea8f25623604c0c28499f5c9cc74554e4e6..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/include/GCF/PVSS/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgincludedir 			= $(includedir)/GCF/PVSS
-pkginclude_HEADERS 		= Package__Version.h  GCF_PValue.h \
- 						  GCF_Defines.h \
-						  GCF_PVChar.h \
-						  GCF_PVBlob.h \
-						  GCF_PVBool.h \
-						  GCF_PVDateTime.h \
-						  GCF_PVDouble.h \
-						  GCF_PVDynArr.h \
-						  GCF_PVInteger.h \
-						  GCF_PVString.h \
-						  GCF_PVTypes.h \
-						  GCF_PVUnsigned.h \
-						  PVSSinfo.h \
-						  PVSSresponse.h \
-						  PVSSresult.h \
-						  PVSSservice.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/PVSS/include/Makefile.am b/MAC/GCF/PVSS/include/Makefile.am
deleted file mode 100644
index 0f250e2c8d6a71bdf591c445aeb947072af7088f..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= GCF/PVSS
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/PVSS/src/Makefile.am b/MAC/GCF/PVSS/src/Makefile.am
deleted file mode 100644
index 6738edf886e36a999913f229fddb31d05a6331e0..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/src/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-NODOCHDRS			= GSA_SCADAHandler.h \
-					  GSA_PvssApi.h \
-					  GSA_Resources.h \
-					  GSA_WaitForAnswer.h 
-    
-lib_LTLIBRARIES 	= libgcfpvss.la
-
-libgcfpvss_la_SOURCES= Package__Version.cc $(NODOCHDRS) \
-					  GCF_PValue.cc \
-					  GCF_PVChar.cc \
-					  GCF_PVBool.cc \
-					  GCF_PVDateTime.cc \
-					  GCF_PVDouble.cc \
-					  GCF_PVString.cc \
-					  GCF_PVInteger.cc \
-					  GCF_PVUnsigned.cc \
-					  GCF_PVDynArr.cc \
-					  GCF_PVBlob.cc \
-					  GSA_SCADAHandler.cc \
-					  GSA_PvssApi.cc \
-					  GSA_Resources.cc \
-					  PVSSinfo.cc \
-					  PVSSservice.cc
-
-AM_CPPFLAGS = -DUSES_NEW_IOSTREAMS -DLOFARLOGGER_SUBPACKAGE=\"PVSS\"
-		
-bin_PROGRAMS = versiongcfpvss
-
-versiongcfpvss_SOURCES      = versiongcfpvss.cc
-versiongcfpvss_LDADD        = libgcfpvss.la
-versiongcfpvss_DEPENDENCIES = libgcfpvss.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/PVSS/test/Makefile.am b/MAC/GCF/PVSS/test/Makefile.am
deleted file mode 100644
index 745632437aea24c9144b1a65cbc01bfc378ef66c..0000000000000000000000000000000000000000
--- a/MAC/GCF/PVSS/test/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/PVSS/src
-
-check_PROGRAMS 		= tPVSSservice tPerformance tPVSSconnect tMonitorState tPVSSinfo
-
-TESTS				= tPVSSservice.sh
-
-tPVSSservice_SOURCES 		= $(BUILT_SOURCES) tPVSSservice.cc Response.cc
-tPVSSservice_LDADD			=  ../src/libgcfpvss.la $(LOFAR_DEPEND)
-tPVSSservice_DEPENDENCIES	= ../src/libgcfpvss.la $(LOFAR_DEPEND)
-
-tPerformance_SOURCES 		= $(BUILT_SOURCES) tPerformance.cc PerformanceResponse.cc
-tPerformance_LDADD			=  ../src/libgcfpvss.la $(LOFAR_DEPEND)
-tPerformance_DEPENDENCIES	= ../src/libgcfpvss.la $(LOFAR_DEPEND)
-
-tPVSSconnect_SOURCES 		= $(BUILT_SOURCES) tPVSSconnect.cc
-tPVSSconnect_LDADD			=  ../src/libgcfpvss.la $(LOFAR_DEPEND)
-tPVSSconnect_DEPENDENCIES	= ../src/libgcfpvss.la $(LOFAR_DEPEND)
-
-tPVSSinfo_SOURCES 			= $(BUILT_SOURCES) tPVSSinfo.cc Response.cc
-tPVSSinfo_LDADD				=  ../src/libgcfpvss.la $(LOFAR_DEPEND)
-tPVSSinfo_DEPENDENCIES		= ../src/libgcfpvss.la $(LOFAR_DEPEND)
-
-tMonitorState_SOURCES 		= $(BUILT_SOURCES) tMonitorState.cc Response.cc
-tMonitorState_LDADD			=  ../src/libgcfpvss.la $(LOFAR_DEPEND)
-tMonitorState_DEPENDENCIES	= ../src/libgcfpvss.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
-
-
diff --git a/MAC/GCF/RTDB/GCFRTDB.spec.in b/MAC/GCF/RTDB/GCFRTDB.spec.in
deleted file mode 100644
index b25dd5c5307c4c0fd23f12c30a751df283434c08..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/GCFRTDB.spec.in
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# GCFRTDB.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: GCFRTDB is the layer that supports PropertySets to the applications.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: GCFCommon >= 6.1
-Requires: GCFTM >= 6.1
-Requires: PVSS >= 1.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-GCFRTDB is the layer that supports PropertySets to the applications.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/GCF/RTDB/Makefile.am b/MAC/GCF/RTDB/Makefile.am
deleted file mode 100644
index a40d204c566485545ae0770d3586dc60f2011494..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = src include test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/RTDB/bootstrap b/MAC/GCF/RTDB/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/GCF/RTDB/configure.in b/MAC/GCF/RTDB/configure.in
deleted file mode 100644
index 9dcf3a23ae116530fbf282864ae6a5da1ab80da0..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/configure.in
+++ /dev/null
@@ -1,57 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/RTDB_PropertySet.cc)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFRTDB, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PVSS, GCFPVSS, , 1, GCF/PVSS/PVSSservice.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-include/Makefile
-include/GCF/RTDB/Makefile
-Makefile
-GCFRTDB.spec
-)
diff --git a/MAC/GCF/RTDB/include/GCF/RTDB/Makefile.am b/MAC/GCF/RTDB/include/GCF/RTDB/Makefile.am
deleted file mode 100644
index 49084b3250c5140131c966d08f05b0f7df6b8385..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/include/GCF/RTDB/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INSTHDRS 			= DPservice.h \
-					  RTDB_PropertySet.h
-
-NOINSTHDRS 			=
-TCCHDRS 			=
-pkgincludedir 		= $(includedir)/GCF/RTDB
-pkginclude_HEADERS 	= Package__Version.h  $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS 		= $(NOINSTHDRS)
-
-DOCHDRS 			= $(INSTHDRS) $(NOINSTHDRS)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/RTDB/include/Makefile.am b/MAC/GCF/RTDB/include/Makefile.am
deleted file mode 100644
index 5c1f75d5ea7af8eeba08d8dd7de4562ab33d0a9a..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS = GCF/RTDB
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/RTDB/src/Makefile.am b/MAC/GCF/RTDB/src/Makefile.am
deleted file mode 100644
index 079fc04325aa86fbef725a497f2223d5816e45f3..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/src/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-AM_CPPFLAGS 		= -DUSES_NEW_IOSTREAMS -I$(top_builddir)/include
-AUTOGEN 			= autogen
-SUFFIXES 			= .ph
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-	cp $*.ph $(top_builddir)/include/GCF/RTDB/
-
-clean-local:
-	rm -f *.ph
-
-DOCHDRS				= RTDB_PropertySet.h \
-					  PropSetResponse.h \
-					  DPanswer.h
-   
-libgcfrtdb_la_CPPFLAGS	= -I$(top_srcdir)/PVSS/src
-
-BUILT_SOURCES 		= DP_Protocol.ph \
-					  DP_Protocol.cc
-
-EXTRA_DIST 			= DP_Protocol.prot \
-					  $(sysconf_DATA)
-
-pkgincludedir		= $(includedir)/GCF/RTDB
-pkginclude_HEADERS	= $(BUILT_SOURCES)
-
-lib_LTLIBRARIES 	= libgcfrtdb.la
-
-libgcfrtdb_la_SOURCES	= Package__Version.cc  $(BUILT_SOURCES) \
-					  RTDB_PropertySet.cc \
-					  DPservice.cc \
-					  DPanswer.cc
-
-bin_PROGRAMS = versiongcfrtdb
-
-versiongcfrtdb_SOURCES      = versiongcfrtdb.cc
-versiongcfrtdb_LDADD        = libgcfrtdb.la
-versiongcfrtdb_DEPENDENCIES = libgcfrtdb.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/RTDB/test/Makefile.am b/MAC/GCF/RTDB/test/Makefile.am
deleted file mode 100644
index 5199c3d06a6e46e80d26c21fb8369a5586bfd422..0000000000000000000000000000000000000000
--- a/MAC/GCF/RTDB/test/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CPPFLAGS	= -DUSES_NEW_IOSTREAMS -I$(top_srcdir)/RTDB/src -I../src
-
-check_PROGRAMS 					= tPropertySet tRTDBPerformance tDPservice testQuery tPerformanceReport
-
-TESTS							= tPropertySet tDPservice
-
-tPropertySet_SOURCES 			= $(BUILT_SOURCES) tPropertySet.cc
-tPropertySet_LDADD				= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-tPropertySet_DEPENDENCIES		= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-
-tRTDBPerformance_SOURCES 		= $(BUILT_SOURCES) tRTDBPerformance.cc RTDBPerfResp.cc
-tRTDBPerformance_LDADD			= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-tRTDBPerformance_DEPENDENCIES	= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-
-tDPservice_SOURCES 				= $(BUILT_SOURCES) tDPservice.cc DPresponse.cc
-tDPservice_LDADD				= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-tDPservice_DEPENDENCIES			= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-
-testQuery_SOURCES 				= $(BUILT_SOURCES) testQuery.cc
-testQuery_LDADD					= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-testQuery_DEPENDENCIES			= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-
-tPerformanceReport_SOURCES 		= $(BUILT_SOURCES) tPerformanceReport.cc RTDBPerfResp.cc
-tPerformanceReport_LDADD		= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-tPerformanceReport_DEPENDENCIES	= ../src/libgcfrtdb.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
-
-
diff --git a/MAC/GCF/TM/GCFTM.spec.in b/MAC/GCF/TM/GCFTM.spec.in
deleted file mode 100644
index 897b72555fe66d7b19efeb83de8b8750e91ca109..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/GCFTM.spec.in
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# GCFTM.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: GCFTM is the common GCF software package providing event and state driven programming. 
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: GCFCommon >= 6.1
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-GCFTM is the common GCF software package providing event and state driven 
-programming. For this purpose a number of communication protocols can be used in a
-transparent way. This package is special designed for MAC applications and replaces
-therefore the Transport package of LCS.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-  f=%{prefix}/etc/ServiceBroker.conf;
-  hs=`hostname -s`;
-  h=`hostname`;
-  n=`sed -e  "/mac.gcf.sb.host=/ s/\(.*\)=\(.*\)/\1=$hs/" -e "/mac.gcf.sb.range1.host=/ s/\(.*\)=\(.*\)/\1=$h/" $f`;
-  echo "$n" > $f
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/GCF/TM/Makefile.am b/MAC/GCF/TM/Makefile.am
deleted file mode 100644
index b3abf54f3f6a7e48e0447ec0cd5cd610d5903c69..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-#DISTCHECK_CONFIGURE_FLAGS=\
-#      --with-common=$(prefix) # "common" is an example
-
-EXTRA_DIST = \
-      Makefile.common \
-      GCFTM.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/TM/bootstrap b/MAC/GCF/TM/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/GCF/TM/configure.in b/MAC/GCF/TM/configure.in
deleted file mode 100644
index 358dc5205fac2852c7e50de0ecf746d2aed5cd31..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/configure.in
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(include/GCF/TM/GCF_Task.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFTM, 6.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-include/Makefile
-include/GCF/TM/Makefile
-Makefile
-GCFTM.spec
-)
diff --git a/MAC/GCF/TM/include/GCF/TM/Makefile.am b/MAC/GCF/TM/include/GCF/TM/Makefile.am
deleted file mode 100644
index 56eac1648e47d5a99d04f8afe2494d01f5ed876d..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/include/GCF/TM/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgincludedir = $(includedir)/GCF/TM
-pkginclude_HEADERS = Package__Version.h  \
-	GCF_Control.h \
-	GCF_Scheduler.h \
-	GCF_DevicePort.h \
-	GCF_ETHRawPort.h \
-	GCF_Fsm.h \
-	GCF_Handler.h \
-	GCF_ITCPort.h \
-	GCF_Port.h \
-	GCF_PortInterface.h \
-	GCF_Protocols.h \
-	GCF_RawPort.h \
-	GCF_Task.h \
-	GCF_TCPPort.h \
-	GCF_TimerPort.h
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/TM/include/Makefile.am b/MAC/GCF/TM/include/Makefile.am
deleted file mode 100644
index d759e2f287f4e650c7fd29402c90773800e89d7d..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= GCF/TM
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/TM/src/Makefile.am b/MAC/GCF/TM/src/Makefile.am
deleted file mode 100644
index 70d01bf98af8a91442e5b3e4170636692b70214e..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/src/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-SUBDIRS	= . 
-
-DOCHDRS = \
-  GTM_Defines.h \
-  Timer/GTM_Timer.h \
-  Timer/GTM_TimerHandler.h \
-  PortImpl/GTM_File.h \
-  PortImpl/GTM_FileHandler.h \
-  PortImpl/GTM_TCPSocket.h \
-  PortImpl/GTM_TCPServerSocket.h \
-  PortImpl/GTM_ETHSocket.h \
-  PortImpl/GTM_Device.h \
-  ServiceBroker/GTM_SBTCPPort.h \
-  ServiceBroker/ServiceBrokerTask.h \
-  $(BUILT_SOURCES)
-    
-lib_LTLIBRARIES 	= libgcftm.la
-
-libgcftm_la_SOURCES= Package__Version.cc  $(DOCHDRS) \
-  GCF_Handler.cc \
-  GCF_Scheduler.cc \
-  GCF_Fsm.cc \
-  GCF_Protocols.cc \
-  Port/GCF_PortInterface.cc \
-  Port/GCF_Port.cc \
-  Port/GCF_RawPort.cc \
-  Timer/GTM_Timer.cc \
-  Timer/GTM_TimerHandler.cc \
-  PortImpl/GCF_DevicePort.cc \
-  PortImpl/GCF_ETHRawPort.cc \
-  PortImpl/GCF_ITCPort.cc \
-  PortImpl/GCF_TCPPort.cc \
-  PortImpl/GTM_Device.cc \
-  PortImpl/GTM_ETHSocket.cc \
-  PortImpl/GTM_File.cc \
-  PortImpl/GTM_FileHandler.cc \
-  PortImpl/GTM_TCPServerSocket.cc \
-  PortImpl/GTM_TCPSocket.cc \
-  ServiceBroker/GTM_SBTCPPort.cc \
-  ServiceBroker/ServiceBrokerTask.cc 
-
-libgcftm_la_CPPFLAGS=-I$(top_srcdir)/src/ServiceBroker 
-
-libgcftm_la_CXXFLAGS=-fmessage-length=0
-
-BUILT_SOURCES 		= 
-
-EXTRA_DIST 			= $(sysconf_DATA)
-	
-sysconf_DATA 		= mac.log_prop
-
-bin_PROGRAMS = versiongcftm
-
-versiongcftm_SOURCES      = versiongcftm.cc
-versiongcftm_LDADD        = libgcftm.la
-versiongcftm_DEPENDENCIES = libgcftm.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/TM/test/Makefile.am b/MAC/GCF/TM/test/Makefile.am
deleted file mode 100644
index 5950bf1b2e9970abf0e7c9d590851d90d0ff8420..0000000000000000000000000000000000000000
--- a/MAC/GCF/TM/test/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
-
-check_PROGRAMS 			= tAutoOpen tEventQueue tStateResult tmEcho tmPing tGCFPort tITCPort tGCFTimer \
-						tGCFTask1 tGCFTask2 tGCFTask3 tGCFTask4 tGCFTask5
-
-tmEcho_SOURCES 			= $(BUILT_SOURCES) Echo.cc Echo_Protocol.cc
-tmEcho_LDADD			= ../src/libgcftm.la
-tmEcho_DEPENDENCIES		= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tmPing_SOURCES 			= $(BUILT_SOURCES) Ping.cc Echo_Protocol.cc
-tmPing_LDADD			= ../src/libgcftm.la
-tmPing_DEPENDENCIES		= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tGCFPort_SOURCES 		= $(BUILT_SOURCES) Echo_Protocol.cc \
-						  tGCFPort.cc tGCFPort.h 
-tGCFPort_LDADD			= ../src/libgcftm.la
-tGCFPort_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tITCPort_SOURCES 		= $(BUILT_SOURCES) tITCPort.cc Echo_Protocol.cc
-tITCPort_LDADD			= ../src/libgcftm.la
-tITCPort_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tGCFTimer_SOURCES 		= $(BUILT_SOURCES) tTimer.cc
-tGCFTimer_LDADD			= ../src/libgcftm.la
-tGCFTimer_DEPENDENCIES		= ../src/libgcftm.la tTimer.h $(LOFAR_DEPEND)
-
-tEventQueue_SOURCES 	= $(BUILT_SOURCES) tEventQueue.cc tClient.cc Echo_Protocol.cc
-tEventQueue_LDADD		= ../src/libgcftm.la
-tEventQueue_DEPENDENCIES= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tAutoOpen_SOURCES 		= $(BUILT_SOURCES) tAutoOpen.cc tServer.cc Echo_Protocol.cc
-tAutoOpen_LDADD			= ../src/libgcftm.la
-tAutoOpen_DEPENDENCIES  = ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tStateResult_SOURCES	 = $(BUILT_SOURCES) tStateResult.cc tServer.cc Echo_Protocol.cc
-tStateResult_LDADD		 = ../src/libgcftm.la
-tStateResult_DEPENDENCIES= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tGCFTask1_SOURCES 		= $(BUILT_SOURCES) tGCFTask1.cc testTask.cc
-tGCFTask1_LDADD			= ../src/libgcftm.la
-tGCFTask1_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tGCFTask2_SOURCES 		= $(BUILT_SOURCES) tGCFTask2.cc testTask.cc
-tGCFTask2_LDADD			= ../src/libgcftm.la
-tGCFTask2_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tGCFTask3_SOURCES 		= $(BUILT_SOURCES) tGCFTask3.cc testTask.cc
-tGCFTask3_LDADD			= ../src/libgcftm.la
-tGCFTask3_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tGCFTask4_SOURCES 		= $(BUILT_SOURCES) tGCFTask4.cc testTask.cc
-tGCFTask4_LDADD			= ../src/libgcftm.la
-tGCFTask4_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-tGCFTask5_SOURCES 		= $(BUILT_SOURCES) tGCFTask5.cc testTask.cc
-tGCFTask5_LDADD			= ../src/libgcftm.la
-tGCFTask5_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-
-BUILT_SOURCES = Echo_Protocol.ph 
-
-EXTRA_DIST = \
-	tmEcho.conf \
-	tmPing.conf \
-	tGCFPort.conf
-	
-%.conf:	tm-test.conf.in
-	ln -sf $< $@
-
-clean-local:
-	rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
-
-
-
diff --git a/MAC/GCF/_PAL/GCFPAL.spec.in b/MAC/GCF/_PAL/GCFPAL.spec.in
deleted file mode 100644
index 78837052951ce6069eeb19e828ef7e36a3c8cbec..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/GCFPAL.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# GCFPAL.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: GCFPAL is the Property Access Layer of MAC/GCF. It provides the executables: PropertyAgent and PropertyInterface, a number of GCFPAL API headerfiles and a GCFPAL API lib.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: GCFCommon >= 6.1
-Requires: GCFTM >= 6.1
-Requires: GCFProtocols >= 6.1
-Requires: Transport >= 2.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-GCFPAL is the Property Access Layer of MAC/GCF. It provides the executables: PropertyAgent and PropertyInterface, 
-a number of GCFPAL API headerfiles and a GCFPAL API lib.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/GCF/_PAL/Makefile.am b/MAC/GCF/_PAL/Makefile.am
deleted file mode 100644
index bba1bc3fe57f35a4155821fc5ed49e377c39a8f2..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=SAL PA PML PI include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-#DISTCHECK_CONFIGURE_FLAGS=\
-#      --with-common=$(prefix) # "common" is an example
-
-EXTRA_DIST = \
-      Makefile.common \
-      GCFPAL.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/PA/Makefile.am b/MAC/GCF/_PAL/PA/Makefile.am
deleted file mode 100644
index 00a990e3a66352158aaebbdcdedb3f9301d792a9..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PA/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src pvss
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/PA/pvss/Makefile.am b/MAC/GCF/_PAL/PA/pvss/Makefile.am
deleted file mode 100644
index 5b17a1d8c47a4c6ea35186e2b61ad4ab04eb7694..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PA/pvss/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=panels scripts/libs
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/PA/pvss/panels/Makefile.am b/MAC/GCF/_PAL/PA/pvss/panels/Makefile.am
deleted file mode 100644
index 5735f60849eb1b313c9d72c368b9d2985cbf8c93..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PA/pvss/panels/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-pkgdatadir = $(datadir)/pvss/panels
-pkgdata_DATA = GCFPATest.pnl \
-	GCFPropSetLoader.pnl
-
-EXTRA_DIST = $(pkgdata_DATA)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/Makefile.am b/MAC/GCF/_PAL/PA/pvss/scripts/libs/Makefile.am
deleted file mode 100644
index f5424594597fadc3e4646d1002c80328c1d4f68f..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-pkgdatadir = $(datadir)/pvss/scripts/libs
-pkgdata_DATA = gcfpa-com.ctl \
-	gcfpa-cwd.ctl \
-	gcfpa-pml.ctl
-
-EXTRA_DIST = $(pkgdata_DATA)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/_PAL/PA/src/Makefile.am b/MAC/GCF/_PAL/PA/src/Makefile.am
deleted file mode 100644
index 6ee604425cd72f6d67c6ff29e588b396d3007797..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PA/src/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-DOCHDRS	=	\
-	GPA_Controller.h \
-	GPA_PropertySet.h \
-	GPA_RequestManager.h \
-	GPA_Converter.h \
-	GPA_Defines.h \
-	GPA_PropSetSession.h
-
-noinst_LTLIBRARIES 	= libpa.la
-
-libpa_la_SOURCES= $(DOCHDRS) \
-	GPA_Controller.cc \
-	GPA_PropertySet.cc \
-	GPA_RequestManager.cc \
-	GPA_Converter.cc \
-	GPA_PropSetSession.cc
-	
-
-bin_PROGRAMS   		= PropertyAgent
-  
-PropertyAgent_SOURCES		    	= GPA_Main.cc
-PropertyAgent_LDADD		     			= libpa.la $(LOFAR_DEPEND) \
-	$(top_builddir)/SAL/src/libsal.la
-	
-PropertyAgent_DEPENDENCIES	= libpa.la $(LOFAR_DEPEND) \
-	$(top_builddir)/SAL/src/libsal.la
-	
-AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"PA\" -I$(top_srcdir)/SAL/src
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA= \
-	loadAPC \
-	preparePVSS-DB
-
-BUILT_SOURCES = 
-
-EXTRA_DIST = $(configfiles_DATA) $(sysconf_DATA) 
-
-sysconf_DATA= \
-	PropertyAgent.conf
-
-%.conf: gcf-pa.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/_PAL/PI/Makefile.am b/MAC/GCF/_PAL/PI/Makefile.am
deleted file mode 100644
index a014c15b3e0cc91454edade91ee05c7b57830868..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PI/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/PI/src/Makefile.am b/MAC/GCF/_PAL/PI/src/Makefile.am
deleted file mode 100644
index 018e88aadbacc50b12c8f1f64c17bf9da119efef..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PI/src/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-DOCHDRS	=	\
-  GPI_Defines.h \
-  GPI_Controller.h \
-  GPI_PMLlightServer.h \
-  GPI_PropertyProxy.h \
-  GPI_PropertySet.h \
-  GPI_CEPServer.h \
-  GPI_RTCServer.h \
-  GPI_TH_Port.h
-    
-noinst_LTLIBRARIES 	= libpi.la
-
-libpi_la_SOURCES= $(DOCHDRS) \
-  GPI_Controller.cc \
-  GPI_PMLlightServer.cc \
-  GPI_CEPServer.cc \
-  GPI_RTCServer.cc \
-  GPI_PropertyProxy.cc \
-  GPI_PropertySet.cc \
-  GPI_TH_Port.cc
-
-bin_PROGRAMS   		= PropertyInterface
-  
-PropertyInterface_SOURCES		= GPI_Main.cc
-PropertyInterface_LDADD		      	= libpi.la  \
-	$(top_builddir)/PML/src/libpml.la \
-	$(top_builddir)/SAL/src/libsal.la \
-	$(LOFAR_DEPEND)
-	
-PropertyInterface_DEPENDENCIES	= libpi.la \
-	$(top_builddir)/PML/src/libpml.la \
-	$(top_builddir)/SAL/src/libsal.la \
-	$(LOFAR_DEPEND) 
-
-AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"PI\"
-
-BUILT_SOURCES = 
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/_PAL/PML/Makefile.am b/MAC/GCF/_PAL/PML/Makefile.am
deleted file mode 100644
index a014c15b3e0cc91454edade91ee05c7b57830868..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PML/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/PML/src/Makefile.am b/MAC/GCF/_PAL/PML/src/Makefile.am
deleted file mode 100644
index 2f9c47eba5094f92a54fde96a9475409064d9a52..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PML/src/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-DOCHDRS	=	\
-	GPM_Controller.h \
-	GPM_PropertyService.h \
-	GPM_PropertyProxy.h \
-	GPM_Defines.h
-   
-lib_LTLIBRARIES 	= libgcfpal.la
-
-libgcfpal_la_SOURCES=
-libgcfpal_la_LIBADD= libpml.la \
-	$(top_builddir)/SAL/src/libsal.la
-	
-libgcfpal_la_DEPENDENCIES= libpml.la $(LOFAR_DEPEND) \
-	$(top_builddir)/SAL/src/libsal.la
-
-noinst_LTLIBRARIES 	= libpml.la
-
-libpml_la_SOURCES= $(DOCHDRS) \
-	GCF_Property.cc \
-	GCF_PropertyProxy.cc \
-	GCF_MyProperty.cc \
-	GCF_ExtProperty.cc \
-	GCF_PropertySet.cc \
-	GCF_MyPropertySet.cc \
-	GCF_ExtPropertySet.cc \
-	GCF_Answer.cc \
-	GCF_PropertySetAnswer.cc \
-	GPM_Controller.cc \
-	GPM_PropertyService.cc 
-
-libpml_la_CPPFLAGS= -I$(top_srcdir)/SAL/src
-
-AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"PML\"
-	
-BUILT_SOURCES = 
-
-EXTRA_DIST = $(sysconf_DATA)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/_PAL/PML/test/Makefile.am b/MAC/GCF/_PAL/PML/test/Makefile.am
deleted file mode 100644
index 8b8adb3a5b7f0fea6c1b290e82d52aa2db24d545..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/PML/test/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/PML/src
-
-check_PROGRAMS 		= tPAPerformance
-
-TESTS				= 
-
-tPAPerformance_SOURCES 		= $(BUILT_SOURCES) tPAPerformance.cc PerformanceService.cc
-tPAPerformance_LDADD		= ../src/libpml.la ../../SAL/src/libsal.la $(LOFAR_DEPEND)
-tPAPerformance_DEPENDENCIES	= ../src/libpml.la ../../SAL/src/libsal.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
-
-
diff --git a/MAC/GCF/_PAL/SAL/Makefile.am b/MAC/GCF/_PAL/SAL/Makefile.am
deleted file mode 100644
index 161f7455d022a4bf60641cbe45447f4764e96d94..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/SAL/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src test
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/SAL/src/Makefile.am b/MAC/GCF/_PAL/SAL/src/Makefile.am
deleted file mode 100644
index 61598575c21d824e46d6b6131aad46976ba14bb9..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/SAL/src/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-DOCHDRS	=	\
-	GSA_SCADAHandler.h \
-	GSA_PvssApi.h \
-	GSA_Resources.h \
-	GSA_Service.h \
-	GSA_WaitForAnswer.h \
-	GSA_Defines.h \
-	GSA_PortService.h \
-	GSA_SysConnGuard.h
-    
-noinst_LTLIBRARIES 	= libsal.la
-
-libsal_la_SOURCES= $(DOCHDRS) \
-	GSA_SCADAHandler.cc \
-	GSA_PvssApi.cc \
-	GSA_Resources.cc \
-	GSA_Service.cc \
-	GSA_WaitForAnswer.cc \
-	GSA_PortService.cc \
-	GCF_PVSSPort.cc \
-	GCF_PVSSInfo.cc \
-	GCF_SysConnGuard.cc \
-	GSA_SysConnGuard.cc
-
-AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"SAL\"
-		
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/_PAL/SAL/test/Makefile.am b/MAC/GCF/_PAL/SAL/test/Makefile.am
deleted file mode 100644
index ac4f7e90416d47e2de11df57248c34977a90076d..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/SAL/test/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/SAL/src
-
-check_PROGRAMS 		= salEcho salPing tGSAService tGSAPerformance
-
-TESTS				= tGSAService #salEcho salPing
-
-salEcho_SOURCES 		= $(BUILT_SOURCES) Echo.cc Service.cc Echo_Protocol.cc
-salEcho_LDADD			= ../src/libsal.la $(LOFAR_DEPEND)
-salEcho_DEPENDENCIES	= ../src/libsal.la $(LOFAR_DEPEND)
-
-salPing_SOURCES 		= $(BUILT_SOURCES) Ping.cc  Echo_Protocol.cc
-salPing_LDADD			=  ../src/libsal.la $(LOFAR_DEPEND)
-salPing_DEPENDENCIES	= ../src/libsal.la $(LOFAR_DEPEND)
-
-tGSAService_SOURCES 		= $(BUILT_SOURCES) tGSAService.cc Service.cc
-tGSAService_LDADD			=  ../src/libsal.la $(LOFAR_DEPEND)
-tGSAService_DEPENDENCIES	= ../src/libsal.la $(LOFAR_DEPEND)
-
-tGSAPerformance_SOURCES 	= $(BUILT_SOURCES) tGSAPerformance.cc PerformanceService.cc
-tGSAPerformance_LDADD		=  ../src/libsal.la $(LOFAR_DEPEND)
-tGSAPerformance_DEPENDENCIES= ../src/libsal.la $(LOFAR_DEPEND)
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-BUILT_SOURCES = Echo_Protocol.ph
-
-EXTRA_DIST = $(sysconf_DATA)
-
-sysconf_DATA= \
-	salEcho.conf \
-	salPing.conf
-
-%.conf: sal-test.conf.in
-	ln -sf $< $@
-
-clean-local:
-	rm -f *.ph
-	
-include $(top_srcdir)/Makefile.common
-
-
-
diff --git a/MAC/GCF/_PAL/bootstrap b/MAC/GCF/_PAL/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/GCF/_PAL/configure.in b/MAC/GCF/_PAL/configure.in
deleted file mode 100644
index 6f763566266e30ece423a11859bdd3d2f578be07..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/configure.in
+++ /dev/null
@@ -1,71 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(include/GCF/PAL/GCF_Property.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFPAL, 6.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_PVSS(1)
-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,,)
-lofar_INTERNAL(MAC/GCF/Protocols, gcfpaprot, , 1, GCF/Protocols/PA_Protocol.ph,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-PA/src/Makefile
-PA/pvss/Makefile
-PA/pvss/panels/Makefile
-PA/pvss/scripts/libs/Makefile
-PA/Makefile
-PI/src/Makefile
-PI/Makefile
-PML/src/Makefile
-PML/test/Makefile
-PML/Makefile
-SAL/src/Makefile
-SAL/test/Makefile
-SAL/Makefile
-include/Makefile
-include/GCF/PAL/Makefile
-Makefile
-GCFPAL.spec
-)
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/Makefile.am b/MAC/GCF/_PAL/include/GCF/PAL/Makefile.am
deleted file mode 100644
index 151f5fc5be388c48acade453f3a44709d557ff11..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/include/GCF/PAL/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgincludedir = $(includedir)/GCF/PAL
-pkginclude_HEADERS = \
-	GCF_Property.h \
-	GCF_PropertyProxy.h \
-	GCF_MyProperty.h \
-	GCF_ExtProperty.h \
-	GCF_PropertySet.h \
-	GCF_MyPropertySet.h \
-	GCF_ExtPropertySet.h \
-	GCF_Answer.h \
-	GCF_PropertySetAnswer.h \
-	GCF_PropertySetAnswerHandlerInterface.h \
-	GCF_PVSSPort.h \
-	GCF_PVSSInfo.h \
-	GCF_SysConnGuard.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PAL/include/Makefile.am b/MAC/GCF/_PAL/include/Makefile.am
deleted file mode 100644
index 1e71b663886cb4addb285e737d1cbffef304d61b..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PAL/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= GCF/PAL
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/Makefile.am b/MAC/GCF/_PALlight/CEP-PMLlight/Makefile.am
deleted file mode 100644
index a014c15b3e0cc91454edade91ee05c7b57830868..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/CEP-PMLlight/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/Makefile.am b/MAC/GCF/_PALlight/CEP-PMLlight/src/Makefile.am
deleted file mode 100644
index 058943826e67808d05a8f5a106736f0aa60e3249..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-DOCHDRS	=	\
-  PIClient.h \
-  PICEPDefines.h
-        
-noinst_LTLIBRARIES 	= libceppmllight.la
-
-libceppmllight_la_SOURCES= $(DOCHDRS) \
-  CEPProperty.cc \
-  CEPPropertySet.cc \
-  PIClient.cc
-  
-lib_LTLIBRARIES 	= libgcfceppallight.la
-
-libgcfceppallight_la_SOURCES=
-libgcfceppallight_la_LIBADD= libceppmllight.la
-
-libgcfceppallight_la_DEPENDENCIES= libceppmllight.la $(LOFAR_DEPEND)
-
-AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"CEP\"
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/_PALlight/GCFPALlight.spec.in b/MAC/GCF/_PALlight/GCFPALlight.spec.in
deleted file mode 100644
index 8992d99a3ca79ba1118e82fdd5e22fbc6f61215a..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/GCFPALlight.spec.in
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# GCFPALlight.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: GCFPALlight contains the components, which provides the possibility to a PVSS independent application to be monitorable/controllable for MAC users like the LOFAR operator.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: GCFCommon >= 6.1
-Requires: GCFTM >= 6.1
-Requires: GCFProtocols >= 6.1
-Requires: GCFPAL >= 6.1
-Requires: Transport >= 2.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-GCFPALlight contains the components, which provides the possibility to a PVSS independent application to be
-monitorable/controllable for MAC users like the LOFAR operator.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/GCF/_PALlight/Makefile.am b/MAC/GCF/_PALlight/Makefile.am
deleted file mode 100644
index a92f6e4b8564a5293ad148996edac532898ae19d..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=PMLlight CEP-PMLlight include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-#DISTCHECK_CONFIGURE_FLAGS=\
-#      --with-common=$(prefix) # "common" is an example
-
-EXTRA_DIST = \
-      Makefile.common \
-      GCFPALlight.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PALlight/PMLlight/Makefile.am b/MAC/GCF/_PALlight/PMLlight/Makefile.am
deleted file mode 100644
index a014c15b3e0cc91454edade91ee05c7b57830868..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/PMLlight/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=src
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PALlight/PMLlight/src/Makefile.am b/MAC/GCF/_PALlight/PMLlight/src/Makefile.am
deleted file mode 100644
index fa3f0d1bcf1d9b7a79461b1b259822cfde27b043..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/PMLlight/src/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-DOCHDRS	=	\
-  GPM_RTController.h \
-  GPM_RTDefines.h
-        
-noinst_LTLIBRARIES 	= libpmllight.la
-
-libpmllight_la_SOURCES= $(DOCHDRS) \
-  GCF_RTAnswer.cc \
-  GCF_RTMyProperty.cc \
-  GCF_RTMyPropertySet.cc \
-  GPM_RTController.cc
-  
-lib_LTLIBRARIES 	= libgcfpallight.la
-
-libgcfpallight_la_SOURCES=
-libgcfpallight_la_LIBADD= libpmllight.la
-
-libgcfpallight_la_DEPENDENCIES= libpmllight.la $(LOFAR_DEPEND)
-
-AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"RTC\"
-
-EXTRA_DIST= $(configfiles_DATA) $(sysconf_DATA)
-
-sysconf_DATA= \
-	gcf-pmllight.conf
-	
-configfilesdir=$(bindir)
-configfiles_DATA= \
-	genTypeInfo
-
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
\ No newline at end of file
diff --git a/MAC/GCF/_PALlight/bootstrap b/MAC/GCF/_PALlight/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/GCF/_PALlight/configure.in b/MAC/GCF/_PALlight/configure.in
deleted file mode 100644
index 1540956d6b2d7c421d9d984c2f69e14e5f3daa30..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/configure.in
+++ /dev/null
@@ -1,59 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(include/GCF/PALlight/GCF_RTMyProperty.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFPALlight, 6.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-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
-dnl
-AC_OUTPUT(
-PMLlight/src/Makefile
-PMLlight/Makefile
-CEP-PMLlight/src/Makefile
-CEP-PMLlight/Makefile
-include/Makefile
-include/GCF/PALlight/Makefile
-Makefile
-GCFPALlight.spec
-)
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/Makefile.am b/MAC/GCF/_PALlight/include/GCF/PALlight/Makefile.am
deleted file mode 100644
index aa7142faebbf88e7f257755d70989679eb5fe1de..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-pkgincludedir = $(includedir)/GCF/PALlight
-pkginclude_HEADERS = \
-	GCF_RTMyProperty.h \
-	GCF_RTMyPropertySet.h \
-	GCF_RTAnswer.h \
-	CEPProperty.h \
-	CEPPropertySet.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/_PALlight/include/Makefile.am b/MAC/GCF/_PALlight/include/Makefile.am
deleted file mode 100644
index 2174ab4886566d26453f1105d555423c8a7f1df9..0000000000000000000000000000000000000000
--- a/MAC/GCF/_PALlight/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= GCF/PALlight
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/bootstrap b/MAC/GCF/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/MAC/GCF/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/MAC/GCF/lofarconf.in b/MAC/GCF/lofarconf.in
deleted file mode 100644
index c81aa9ce4c0806819c188c3dc856a1906dee29de..0000000000000000000000000000000000000000
--- a/MAC/GCF/lofarconf.in
+++ /dev/null
@@ -1,3 +0,0 @@
-PVSS
-RTDB
-TM
diff --git a/MAC/MACIO/MACIO.spec.in b/MAC/MACIO/MACIO.spec.in
deleted file mode 100644
index 1f9a87895fdda7deb90da7ff409c52042b331cc0..0000000000000000000000000000000000000000
--- a/MAC/MACIO/MACIO.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# MACIO.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: This package contains all daemons that should run on a ControlUnit.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: RTCCommon = 1.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Collection of protocols used within and outside MAC.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/MACIO/Makefile.am b/MAC/MACIO/Makefile.am
deleted file mode 100644
index 0efee9e8f940087a05ca199eb3db2385c2feb956..0000000000000000000000000000000000000000
--- a/MAC/MACIO/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=autogen src include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      MACIO.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/MACIO/autogen/Makefile.am b/MAC/MACIO/autogen/Makefile.am
deleted file mode 100644
index 1b769ff602fc0580b9c156ea2bee50c8ca42355a..0000000000000000000000000000000000000000
--- a/MAC/MACIO/autogen/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgdatadir = $(datadir)/MACIO
-pkgdata_DATA = protocol.tpl
-
-EXTRA_DIST = $(pkgdata_DATA)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/MACIO/bootstrap b/MAC/MACIO/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/MAC/MACIO/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/MAC/MACIO/configure.in b/MAC/MACIO/configure.in
deleted file mode 100644
index 362d43b096c0bcc631c0c56e92af0b543c71001f..0000000000000000000000000000000000000000
--- a/MAC/MACIO/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MACIO, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-autogen/Makefile
-src/Makefile
-test/Makefile
-include/Makefile
-include/MACIO/Makefile
-Makefile
-MACIO.spec
-)
diff --git a/MAC/MACIO/include/MACIO/Makefile.am b/MAC/MACIO/include/MACIO/Makefile.am
deleted file mode 100644
index 94b113444b2f22524d88908bccdf59862a69d721..0000000000000000000000000000000000000000
--- a/MAC/MACIO/include/MACIO/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-pkgincludedir 		= $(includedir)/MACIO
-pkginclude_HEADERS	= Package__Version.h  EventPort.h \
-					  GCF_Event.h \
-					  KVTLogger.h \
-					  MACServiceInfo.h \
-					  Marshalling.h \
-					  ProtocolDefs.h \
-					  StringVector.h
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/MACIO/include/Makefile.am b/MAC/MACIO/include/Makefile.am
deleted file mode 100644
index 31133d6b0fba0b31a8c8e2bb663ec8b3f0737725..0000000000000000000000000000000000000000
--- a/MAC/MACIO/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS = MACIO
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/MACIO/src/Makefile.am b/MAC/MACIO/src/Makefile.am
deleted file mode 100644
index 2084cee7fee0b4fd6230ac8c27284f0b51ec950f..0000000000000000000000000000000000000000
--- a/MAC/MACIO/src/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(top_srcdir)/autogen $<
-	cp $*.ph $(top_builddir)/include/MACIO/
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(top_srcdir)/autogen $<
-
-clean-local:
-	rm -f *.ph
-
-bin_PROGRAMS 				= versionmacio 
-bin_SCRIPTS					= 
-INSTHDRS 					= LOG_Protocol.ph KVT_Protocol.ph SB_Protocol.ph
-NOINSTHDRS 					= 
-BUILT_SOURCES				= LOG_Protocol.cc \
-							  LOG_Protocol.ph \
-							  KVT_Protocol.cc \
-							  KVT_Protocol.ph \
-							  SB_Protocol.cc \
-							  SB_Protocol.ph
-
-pkgincludedir				= $(includedir)/MACIO
-pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
-DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
-EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
-
-# Libraries
-lib_LTLIBRARIES         	= liblog_protocol.la \
-							  libkvt_protocol.la \
-							  libmacio.la
-liblog_protocol_la_SOURCES 	= LOG_Protocol.cc
-libkvt_protocol_la_SOURCES 	= KVT_Protocol.cc
-libmacio_la_SOURCES 		= Package__Version.cc GCF_Event.cc EventPort.cc KVTLogger.cc ProtocolDefs.cc SB_Protocol.cc
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir				= $(bindir)
-configfiles_DATA 			= 
-sysconf_DATA				= 
-
-versionmacio_SOURCES      = versionmacio.cc
-versionmacio_LDADD        = libmacio.la
-versionmacio_DEPENDENCIES = libmacio.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/MACIO/test/Makefile.am b/MAC/MACIO/test/Makefile.am
deleted file mode 100644
index 0fd0eef91f9fc27036d2fd3e7be5ebb30d1eda1e..0000000000000000000000000000000000000000
--- a/MAC/MACIO/test/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(top_srcdir)/autogen $<
-
-%.cc: %.prot
-	$(AUTOGEN) --writable -L $(top_srcdir)/autogen $<
-
-check_PROGRAMS 		= tEventPort tProtocol tClone
-
-tProtocol_SOURCES 		= testprotocol.ph testprotocol.cc \
-						  Echo_Protocol.ph Echo_Protocol.cc \
-						  tProtocol.cc 
-tProtocol_LDADD			= ../src/libmacio.la
-tProtocol_DEPENDENCIES	= ../src/libmacio.la $(LOFAR_DEPEND)
-
-tEventPort_SOURCES 		= Echo_Protocol.ph Echo_Protocol.cc \
-						  tEventPort.cc
-tEventPort_LDADD		= ../src/libmacio.la
-tEventPort_DEPENDENCIES	= ../src/libmacio.la $(LOFAR_DEPEND)
-
-tClone_SOURCES 			= Clone_Protocol.ph Clone_Protocol.cc \
-						  tClone.cc
-tClone_LDADD			= ../src/libmacio.la
-tClone_DEPENDENCIES		= ../src/libmacio.la $(LOFAR_DEPEND)
-
-BUILT_SOURCES = Echo_Protocol.ph testprotocol.ph Clone_Protocol.ph
-
-EXTRA_DIST =  tProtocol.log_prop
-	
-clean-local:
-	rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
-
-
-
diff --git a/MAC/Navigator2/Makefile.am b/MAC/Navigator2/Makefile.am
deleted file mode 100644
index b6be29e9a9d37c7830fd5e73e9d06969c3637aa2..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=config scripts
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Navigator2/bootstrap b/MAC/Navigator2/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/MAC/Navigator2/config/Makefile.am b/MAC/Navigator2/config/Makefile.am
deleted file mode 100644
index 310d953f6f2935f2c72168474c3c2a27c59b6273..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/config/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-configdir=$(prefix)/pvss/config
-
-config_SCRIPTS=	config.maincu \
-		config.station \
-		progs.maincu \
-		progs.station
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Navigator2/configure.in b/MAC/Navigator2/configure.in
deleted file mode 100644
index 86d53184cc9bd3e111260caae17552dd5fac902e..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Navigator2, 1.0, no-define)
-
-AC_PROG_LIBTOOL
-
-AC_OUTPUT(
-	Makefile
-	config/Makefile
-	scripts/Makefile
-	scripts/libs/Makefile
-)
diff --git a/MAC/Navigator2/scripts/Makefile.am b/MAC/Navigator2/scripts/Makefile.am
deleted file mode 100644
index 3a9364732ddadc67392414f9ea7b6155d25a318e..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/scripts/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS=libs
-
-pvssdir= $(prefix)/pvss/scripts
-pvss_SCRIPTS= 	claim.ctl \
-		monitorAlarms.ctl \
-		monitorStateChanges.ctl \
-		monitorStateReset.ctl \
-		readStationConfigs.ctl
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Navigator2/scripts/libs/Makefile.am b/MAC/Navigator2/scripts/libs/Makefile.am
deleted file mode 100644
index 6e00e64d9c5cce549a6ce1ae0e2434aac183fd81..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/scripts/libs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-pvsslibsdir= $(prefix)/pvss/scripts/libs
-pvsslibs_SCRIPTS=	GCFAlarm.ctl \
-			GCFCommon.ctl \
-			GCFCWD.ctl \
-			GCFLogging.ctl \
-			navFunct.ctl
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/GCF/CEP/Makefile.am b/MAC/Test/GCF/CEP/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/CEP/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/GCF/CEP/bootstrap b/MAC/Test/GCF/CEP/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/CEP/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/Test/GCF/CEP/configure.in b/MAC/Test/GCF/CEP/configure.in
deleted file mode 100644
index a3fef47f43c47f32bda84cc113366a67ef63bf97..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/CEP/configure.in
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/DH_EchoPing.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Test/GCF/CEP, 6.0)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_INTERNAL(MAC/GCF/PALlight, gcfceppallight, , 1, GCF/PALlight/CEPProperty.h,,)
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/GCF/CEP/src/Makefile.am b/MAC/Test/GCF/CEP/src/Makefile.am
deleted file mode 100644
index 15908ac7dbbaad04ae7eadcfbd12625bb5e753f7..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/CEP/src/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-noinst_LTLIBRARIES 	= libgcfceptest.la
-
-libgcfceptest_la_DOCHDRS = \
-	DH_EchoPing.h
-	
-libgcfceptest_la_SOURCES= $(libgcfceptest_la_DOCHDRS) \
-	DH_EchoPing.cc
-
-bin_PROGRAMS   		= CEPEcho CEPPing
-  
-CEPEcho_SOURCES							= CEPEcho.cc
-CEPEcho_LDADD								= libgcfceptest.la
-CEPEcho_DEPENDENCIES				= libgcfceptest.la $(LOFAR_DEPEND)
-
-CEPPing_SOURCES							= CEPPing.cc
-CEPPing_LDADD								= libgcfceptest.la
-CEPPing_DEPENDENCIES				= libgcfceptest.la $(LOFAR_DEPEND)
-
-AM_CXXFLAGS=-fmessage-length=0
-	
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA= \
-	typeStruct_TTypeF.dpl
-	
-%.dpl: %.dpl.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/GCF/MAC/Makefile.am b/MAC/Test/GCF/MAC/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/MAC/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/GCF/MAC/bootstrap b/MAC/Test/GCF/MAC/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/MAC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/Test/GCF/MAC/configure.in b/MAC/Test/GCF/MAC/configure.in
deleted file mode 100644
index db49bbde68f792203210d03d944c2b9aebbb9cb2..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/MAC/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/Application1.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Test/GCF/MAC, 6.0)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_PVSS(1)
-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)
-
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/GCF/MAC/src/Makefile.am b/MAC/Test/GCF/MAC/src/Makefile.am
deleted file mode 100644
index 414531f184f2abf1ee7969ccaae3be67e4ed09e0..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/MAC/src/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-	
-libgcftest_la_DOCHDRS	=	\
-	SupervisedTask.h \
-  PropertyProxy.h \
-  Answer.h \
-  Defines.h
-
-noinst_LTLIBRARIES 	= libgcftest.la
-
-libgcftest_la_SOURCES= $(libgcftest_la_DOCHDRS) \
-	SupervisedTask.cc \
- 	PropertyProxy.cc \
- 	Answer.cc \
- 	TST_Protocol.cc
-
-bin_PROGRAMS   		= Application1 Application2 Application3
-  
-Application1_SOURCES		    = Application1.cc
-Application1_LDADD		      = libgcftest.la 
-Application1_DEPENDENCIES		= libgcftest.la $(LOFAR_DEPEND)
-
-Application2_SOURCES		    = Application2.cc
-Application2_LDADD		      = libgcftest.la 
-Application2_DEPENDENCIES		= libgcftest.la $(LOFAR_DEPEND)
-
-Application3_SOURCES		    = Application3.cc
-Application3_LDADD		      = libgcftest.la 
-Application3_DEPENDENCIES		= libgcftest.la $(LOFAR_DEPEND)
-
-BUILT_SOURCES = \
-	TST_Protocol.ph
-
-EXTRA_DIST = $(BUILT_SOURCES)
-	
-AM_CXXFLAGS=-fmessage-length=0
-	
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA= \
-	customPrepPVSSDB.ctl
-
-sysconf_DATA= \
-	Application1.conf \
-	Application2.conf \
-	Application3.conf
-
-%.conf: gcf-test.conf.in
-	cp $< $@
-
-%.ctl: *.ctl
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-  
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/GCF/RTC/Makefile.am b/MAC/Test/GCF/RTC/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/RTC/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/GCF/RTC/bootstrap b/MAC/Test/GCF/RTC/bootstrap
deleted file mode 100755
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/RTC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/Test/GCF/RTC/configure.in b/MAC/Test/GCF/RTC/configure.in
deleted file mode 100644
index 37c4e05673284e29abf31da05c04ada4d8e94434..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/RTC/configure.in
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/RTDefines.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Test/GCF/RTC, 6.0)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, , 1, GCF/PALlight/GCF_RTMyProperty.h,,)
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/GCF/RTC/src/Makefile.am b/MAC/Test/GCF/RTC/src/Makefile.am
deleted file mode 100644
index 30c2f262fe695526e70dc4b257919075d3913dad..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/RTC/src/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-	
-DOCHDRS	=	\
-  RTAnswer.h \
-  RTDefines.h
-
-noinst_LTLIBRARIES 	= librtc.la
-
-librtc_la_SOURCES= $(DOCHDRS) \
- 	RTAnswer.cc \
-	Echo_Protocol.cc
-
-bin_PROGRAMS   		= RTEcho RTPing
-  
-RTEcho_SOURCES							= RTEcho.cc
-RTEcho_LDADD								= librtc.la
-RTEcho_DEPENDENCIES					= librtc.la $(LOFAR_DEPEND)
-
-RTPing_SOURCES							= RTPing.cc
-RTPing_LDADD								= librtc.la
-RTPing_DEPENDENCIES					= librtc.la $(LOFAR_DEPEND)
-
-BUILT_SOURCES = \
-	Echo_Protocol.ph
-
-EXTRA_DIST = $(BUILT_SOURCES)
-	
-AM_CXXFLAGS=-fmessage-length=0
-	
-#in case of make install these files will be copied to the bindir beside the test apps
-sysconf_DATA= \
-	RTEcho.conf \
-	RTPing.conf
-	
-%.conf: gcf-test.conf.in
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-  
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/GCF/bootstrap b/MAC/Test/GCF/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/Test/GCF/lofarconf.in b/MAC/Test/GCF/lofarconf.in
deleted file mode 100644
index bbb5e80f0e31a56df05337881ba9215d05eb39b6..0000000000000000000000000000000000000000
--- a/MAC/Test/GCF/lofarconf.in
+++ /dev/null
@@ -1,3 +0,0 @@
-RTC
-CEP
-MAC
diff --git a/MAC/Test/PROTO/GPI/Makefile.am b/MAC/Test/PROTO/GPI/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/GPI/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/GPI/configure.in b/MAC/Test/PROTO/GPI/configure.in
deleted file mode 100644
index d85ff38c88fde0618614121b17e88d38320fb1be..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/GPI/configure.in
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/GCF_PortManager.hxx)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Common, 0.1)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_PVSS(1)
-lofar_MPI(0)
-lofar_PACKAGE(MAC/GCF/PROTO/TASK)
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/PROTO/GPI/src/Makefile.am b/MAC/Test/PROTO/GPI/src/Makefile.am
deleted file mode 100644
index 35d1450c0c21830a17a3c97d1f1a20d584e5e59b..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/GPI/src/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-DOCHDRS	=	\
-  GCF_PortManager.hxx \
-  GCF_Port.hxx 
-
-lib_LTLIBRARIES 	= libgpi.la
-
-libgpi_la_SOURCES 	= $(DOCHDRS) \
-  GCF_PortManager.cxx \
-  GCF_Port.cxx 
-
-  
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/PROTO/PI/Makefile.am b/MAC/Test/PROTO/PI/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PI/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/PI/configure.in b/MAC/Test/PROTO/PI/configure.in
deleted file mode 100644
index bbd6bbc4f3870f7d7cdc4c11ec1402b6a1b567e4..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PI/configure.in
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/GPI_Controller.hxx)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Common, 0.1)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_PVSS(1)
-lofar_MPI(0)
-lofar_PACKAGE(MAC/GCF/PROTO/TASK)
-lofar_PACKAGE(MAC/GCF/PROTO/GPI)
-lofar_PACKAGE(MAC/GCF/PROTO/PVSSAPI)
-lofar_PACKAGE(MAC/GCF/PROTO/PROP)
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/PROTO/PI/src/Makefile.am b/MAC/Test/PROTO/PI/src/Makefile.am
deleted file mode 100644
index a0810866e4e25e439db80432d50a0cb5bb1338d3..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PI/src/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Rules for autogen code generation
-#
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) -L $(top_srcdir)/autogen $<
-	$(chmod +w $<)
-
-BUILT_SOURCES = \
-	F_Supervisory_Protocol.ph
-
-DOCHDRS	=	\
-GPI_Controller.hxx GPI_Resources.hxx
-
-bin_PROGRAMS		= PropertyInterface
-PropertyInterface_SOURCES	= $(DOCHDRS) \
-  GPI_Main.cxx \
-  GPI_Controller.cxx  \
-  GPI_Resources.cxx
-
-PropertyInterface_LDADD	    =
-
-PropertyInterface_DEPENDENCIES =
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/PROTO/PROP/Makefile.am b/MAC/Test/PROTO/PROP/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PROP/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/PROP/configure.in b/MAC/Test/PROTO/PROP/configure.in
deleted file mode 100644
index 46f0e1f63c87ebc573cbcef7bae7b7135b770343..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PROP/configure.in
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/FProperty.h)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Common, 0.1)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_MPI(0)
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/PROTO/PROP/src/Makefile.am b/MAC/Test/PROTO/PROP/src/Makefile.am
deleted file mode 100644
index 965569af7bbc5719cb2b3bfe55509adece3a2b28..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PROP/src/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-DOCHDRS	=	\
-  FProperty.h \
-  FPValue.h \
-  FPByteValue.h \
-  FPBoolValue.h \
-  FPLongLongValue.h \
-  FPWordValue.h \
-  FPDWordValue.h \
-  FPFloatValue.h \
-  FPDoubleValue.h
-
-lib_LTLIBRARIES 	= libprop.la
-
-libprop_la_SOURCES 	= $(DOCHDRS) \
-  FProperty.cc \
-  FPValue.cc \
-  FPByteValue.cc \
-  FPBoolValue.cc \
-  FPLongLongValue.cc \
-  FPWordValue.cc \
-  FPDWordValue.cc \
-  FPFloatValue.cc \
-  FPDoubleValue.cc 
-
-
-include $(top_srcdir)/Makefile.common
\ No newline at end of file
diff --git a/MAC/Test/PROTO/PVSSAPI/Makefile.am b/MAC/Test/PROTO/PVSSAPI/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PVSSAPI/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/PVSSAPI/configure.in b/MAC/Test/PROTO/PVSSAPI/configure.in
deleted file mode 100644
index f2212a17af626714249d8ab6a9e0314399b0ff58..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PVSSAPI/configure.in
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/GCF_PVSSAPI.hxx)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Common, 0.1)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_PVSS(1)
-lofar_MPI(0)
-lofar_PACKAGE(MAC/GCF/PROTO/TASK)
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/PROTO/PVSSAPI/src/Makefile.am b/MAC/Test/PROTO/PVSSAPI/src/Makefile.am
deleted file mode 100644
index 3bd131e9da751e240f5df39f3af34309e657b604..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/PVSSAPI/src/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-DOCHDRS	=	\
-  GCF_PVSSAPI.hxx 
-
-lib_LTLIBRARIES 	= libpvssapi.la
-
-libpvssapi_la_SOURCES 	= $(DOCHDRS) \
-  addVerInfo.cxx \
-  GCF_PVSSAPI.cxx
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/PROTO/TASK/Makefile.am b/MAC/Test/PROTO/TASK/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/TASK/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/TASK/configure.in b/MAC/Test/PROTO/TASK/configure.in
deleted file mode 100644
index e3ad397d3962f07bbca6806a974ddc14c6e933f3..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/TASK/configure.in
+++ /dev/null
@@ -1,64 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/GCF_Task.hxx)
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Common, 0.1)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-#lofar_QT
-lofar_PVSS(1)
-lofar_MPI(0)
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/PROTO/TASK/src/Makefile.am b/MAC/Test/PROTO/TASK/src/Makefile.am
deleted file mode 100644
index 66b00687b1f91336bfb1ade3827e8a4a3417a888..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/TASK/src/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-DOCHDRS	=	\
-  GCF_Defines.hxx \
-  GCF_Event.hxx \
-  GCF_Fsm.hxx \
-  GCF_Protocols.hxx \
-  GCF_PortInterface.hxx \
-  GCF_Task.hxx  \
-  GCF_SCADAAPI.hxx
-
-lib_LTLIBRARIES 	= libtask.la
-
-libtask_la_SOURCES= $(DOCHDRS) \
-  GCF_Fsm.cxx \
-  GCF_Protocols.cxx \
-  GCF_Task.cxx
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/PROTO/lofarconf.in b/MAC/Test/PROTO/lofarconf.in
deleted file mode 100644
index 05ebceff4211bb109322e66b0abc01c4a6766d47..0000000000000000000000000000000000000000
--- a/MAC/Test/PROTO/lofarconf.in
+++ /dev/null
@@ -1,5 +0,0 @@
-TASK
-PVSSAPI
-GPI
-PROP
-PI
diff --git a/MAC/Test/TestHarness/THEcho/Makefile.am b/MAC/Test/TestHarness/THEcho/Makefile.am
deleted file mode 100644
index ae4997a5605ed98b2bf87aa99aafa15bc6c97377..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THEcho/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/THEcho/bootstrap b/MAC/Test/TestHarness/THEcho/bootstrap
deleted file mode 100644
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THEcho/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/Test/TestHarness/THEcho/configure.in b/MAC/Test/TestHarness/THEcho/configure.in
deleted file mode 100644
index 2a0e9757b4d495f8dd7e5423e7cae0c15533ae18..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THEcho/configure.in
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/THEcho.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(THEcho, 1.0)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-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)
-
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-)
diff --git a/MAC/Test/TestHarness/THEcho/src/Makefile.am b/MAC/Test/TestHarness/THEcho/src/Makefile.am
deleted file mode 100644
index 317e7294f23e9da9ced56c101c94a8753ec86248..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THEcho/src/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-bin_PROGRAMS 		= THEcho
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-THEcho_CPPFLAGS= \
-  -Wno-deprecated \
-	-fmessage-length=0 \
-	-fdiagnostics-show-location=once
-
-THEcho_SOURCES 		= \
-	THEcho.cc \
-	THEcho_Protocol.cc \
-	THEchoRouting_Protocol.cc
-	
-THEcho_LDADD		= 
-	
-include_HEADERS = 
-
-BUILT_SOURCES = \
-	THEcho_Protocol.ph \
-	THEchoRouting_Protocol.ph
-
-EXTRA_DIST = $(BUILT_SOURCES)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-sysconf_DATA = \
-	THEcho.conf \
-	THEcho.log_prop
-	
-%.log_prop: %.log_prop.in
-	cp $< $@
-	
-%.conf: %.conf.in
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/THEcho/test/Makefile.am b/MAC/Test/TestHarness/THEcho/test/Makefile.am
deleted file mode 100644
index 18549a4762a3a922f4d33a24ff161a2a1d35f55c..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THEcho/test/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-bin_PROGRAMS 		= THEchoTest
-
-THEchoTest_CPPFLAGS= \
-  -Wno-deprecated \
-	-fmessage-length=0 \
-	-fdiagnostics-show-location=once
-
-THEchoTest_SOURCES 		= \
-	THEchoTest.cc \
-	../src/THEcho_Protocol.cc \
-	../src/THEchoRouting_Protocol.cc
-	
-THEchoTest_LDADD		= 
-	
-include_HEADERS = 
-
-BUILT_SOURCES =
-EXTRA_DIST =
-
-#in case of make install these files will be copied to the bindir beside the test apps
-configfilesdir=$(bindir)
-configfiles_DATA = \
-	THEchoTest.conf \
-	THEchoTest.log_prop
-	
-%.log_prop: %.log_prop.in
-	cp $< $@
-	
-%.conf: %.conf.in
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/THPVSSBridge/Makefile.am b/MAC/Test/TestHarness/THPVSSBridge/Makefile.am
deleted file mode 100644
index 9b46e2c39082dccad8a0dcf3d2f0cf4cdef4f2c8..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THPVSSBridge/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/THPVSSBridge/bootstrap b/MAC/Test/TestHarness/THPVSSBridge/bootstrap
deleted file mode 100644
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THPVSSBridge/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/Test/TestHarness/THPVSSBridge/configure.in b/MAC/Test/TestHarness/THPVSSBridge/configure.in
deleted file mode 100644
index cd9401085a41a61c9a0c1fd26bae58adacc82082..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THPVSSBridge/configure.in
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/THPVSSBridge.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(THPVSSBridge, 1.0)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_PVSS(1)
-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,"")
-
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-)
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/Makefile.am b/MAC/Test/TestHarness/THPVSSBridge/src/Makefile.am
deleted file mode 100644
index 9086489063b8875675da4e2ce8ff7082bca1f77b..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/THPVSSBridge/src/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-bin_PROGRAMS 		= THPVSSBridge
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-THPVSSBridge_CPPFLAGS= \
-  -Wno-deprecated \
-	-fmessage-length=0 \
-	-fdiagnostics-show-location=once
-
-THPVSSBridge_SOURCES 		= $(BUILT_SOURCES) \
-	PropertyProxy.cc \
-	THPVSSBridge.cc \
-	THPVSSBridgeMain.cc \
-	THPVSSBridge_Protocol.cc
-	
-THPVSSBridge_LDADD		= 
-	
-include_HEADERS = 
-
-BUILT_SOURCES = 	\
-	THPVSSBridge_Protocol.ph
-
-EXTRA_DIST =  $(sysconf_DATA)
-
-#in case of make install these files will be copied to the bindir beside the test apps
-sysconf_DATA = \
-	THPVSSBridge.conf \
-	THPVSSBridge.log_prop
-	
-%.log_prop: %.log_prop.in
-	cp $< $@
-	
-%.conf: %.conf.in
-	cp $< $@
-
-clean-local:
-	rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/TSE/Makefile.am b/MAC/Test/TestHarness/TSE/Makefile.am
deleted file mode 100644
index 7d15cd1d3c3eab10b6b4593cb38cf69f9e19a7a2..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src 
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-     --with-common=$(prefix)
-     
-EXTRA_DIST = \
-     Makefile.common \
-     TSE.spec \
-     autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/TSE/TSE.spec.in b/MAC/Test/TestHarness/TSE/TSE.spec.in
deleted file mode 100644
index 3189b9a64d8593a43ea2807a041c56f1419e2d6f..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/TSE.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# TSE.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Transport is the common LOFAR software package handling the transport of node in various ways (Socket, MPI, shared memory).
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-#Requires: None 
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-TSE is the test engine used to test the MAC layer.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/Test/TestHarness/TSE/bootstrap b/MAC/Test/TestHarness/TSE/bootstrap
deleted file mode 100644
index 7f674c416802db5e7c438f093a99e63f63c784aa..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/MAC/Test/TestHarness/TSE/configure.in b/MAC/Test/TestHarness/TSE/configure.in
deleted file mode 100644
index 09141a3f037cf41ec69ada02ea3d79d0bad6112f..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/configure.in
+++ /dev/null
@@ -1,51 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/tsek/atkernel.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(TSE, 1.0)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_YACC
-AM_PROG_LEX
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-                       
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-src/tsed/Makefile
-src/tsek/Makefile
-src/dbg/Makefile
-src/tseg/Makefile
-Makefile
-TSE.spec
-)
diff --git a/MAC/Test/TestHarness/TSE/src/Makefile.am b/MAC/Test/TestHarness/TSE/src/Makefile.am
deleted file mode 100644
index 5e7e51bb7491387723bdfa28ab40397cad7afddb..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/src/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS=tsed tsek dbg tseg
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/TestHarness/TSE/src/dbg/Makefile.am b/MAC/Test/TestHarness/TSE/src/dbg/Makefile.am
deleted file mode 100644
index faf30aa211c5b3b06522b50d90686c26ce22835c..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/src/dbg/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-noinst_LTLIBRARIES 	= libdbg.la
-
-DOCHDRS = \
-	dbgtrace.h
-
-libdbg_la_SOURCES= $(DOCHDRS) \
-	dbgtrace.c
-
-libdbg_la_CFLAGS = \
-	-DDEBUG_AUTOTEST \
-	-D_NO_CONTROL_PANEL_ \
-	-DARITHMETRIC
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/TSE/src/tsed/Makefile.am b/MAC/Test/TestHarness/TSE/src/tsed/Makefile.am
deleted file mode 100644
index f2aaf2de3ed6504c0a1855bdc36aafca3f8c7515..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/src/tsed/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-noinst_LTLIBRARIES 	= libtsed.la
-
-DOCHDRS = \
-	atdriver.h \
-	atd_socket.h \
-	devicelist.h \
-	protocollist.h \
-	receivebuffer.h
-
-libtsed_la_SOURCES= $(DOCHDRS) \
-	atdriver.c \
-	atd_socket_linux.c \
-	devicelist.c \
-	protocollist.c \
-	receivebuffer.c
-
-libtsed_la_CFLAGS = \
-	-DDEBUG_AUTOTEST \
-	-D_NO_CONTROL_PANEL_ \
-	-DARITHMETRIC \
-	-I$(top_srcdir)/src/tseg \
-	-I$(top_srcdir)/src/tsek \
-	-I$(top_srcdir)/src/dbg
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/TSE/src/tseg/Makefile.am b/MAC/Test/TestHarness/TSE/src/tseg/Makefile.am
deleted file mode 100644
index 4657c5693370506f32d41422a3203c95c7fb1485..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/src/tseg/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-DOCHDRS = \
-	bsegui.h \
-	ini_parser.h
-
-bin_PROGRAMS = tse
-
-tse_SOURCES = bsegui.c ini_parser.c $(DOCHDRS)
-tse_LDADD		= \
-	$(top_builddir)/src/tsek/libtsek.la \
-	$(top_builddir)/src/tsed/libtsed.la \
-	$(top_builddir)/src/dbg/libdbg.la
-	
-tse_CFLAGS = \
-	-DDEBUG_AUTOTEST \
-	-D_NO_CONTROL_PANEL_ \
-	-DARITHMETRIC \
-	-I$(top_srcdir)/src/tsek \
-	-I$(top_srcdir)/src/tsed \
-	-I$(top_srcdir)/src/dbg
-
-#in case of make install these files will be copied to the bindir beside the test apps
-#configfilesdir=$(bindir)
-
-EXTRA_DIST = \
-	tse.ini.in
-
-sysconf_DATA = \
-	tse.ini
-
-%.ini: %.ini.in 
-	cp $< $@
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/TSE/src/tsek/Makefile.am b/MAC/Test/TestHarness/TSE/src/tsek/Makefile.am
deleted file mode 100644
index bc9255ec8b4b0686f172b465d64c4b48cbb13946..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/TSE/src/tsek/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-
-DOCHDRS = arithmetric.h \
-	atkernel_intern.h \
-	atkernel.h \
-	basic_parser.h \
-	bp.h \
-	bp_admin.h \
-	bp_file.h \
-	bp_log.h \
-	codingstandard.h \
-	driver_configuration.h \
-	eventprocessor.h \
-	eventreceiver.h \
-	executor_lib.h \
-	executor_master.h \
-	expirator.h \
-	general_lib.h \
-	parser.h \
-	parser_lib.h \
-	scanner.h \
-	stepper.h \
-	stores.h \
-	test_kernel.h \
-	test_parser.h \
-	teststuff.h
-
-noinst_LTLIBRARIES 	= libtsek.la
-
-libtsek_la_SOURCES = $(DOCHDRS) \
-	atkernel.c \
-	basic_parser.c \
-	bp.c \
-	bp_file.c \
-	bp_log.c \
-	driver_configuration.c \
-	eventprocessor.c \
-	eventreceiver.c \
-	executor.c \
-	executor_lib.c \
-	executor_master.c \
-	expirator.c \
-	general_lib.c \
-	parser.c \
-	parser_arithmetric.c \
-	parser_debug.c \
-	parser_lib.c \
-	scanner.c \
-	stepper.c \
-	test_kernel.c \
-	test_parser.c 
-	
-
-libtsek_la_CFLAGS = \
-	-DDEBUG_AUTOTEST \
-	-D_NO_CONTROL_PANEL_ \
-	-DARITHMETRIC \
-	-I$(top_srcdir)/src/tseg \
-	-I$(top_srcdir)/src/tsed \
-	-I$(top_srcdir)/src/dbg
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/bootstrap b/MAC/Test/TestHarness/bootstrap
deleted file mode 100644
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/Test/TestHarness/lofarconf.in b/MAC/Test/TestHarness/lofarconf.in
deleted file mode 100644
index 4f210c5c62a4b36ccb4e38f091849616cb120b77..0000000000000000000000000000000000000000
--- a/MAC/Test/TestHarness/lofarconf.in
+++ /dev/null
@@ -1,3 +0,0 @@
-THEcho
-THPVSSBridge
-
diff --git a/MAC/Test/bootstrap b/MAC/Test/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/MAC/Test/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/MAC/Test/lofarconf.in b/MAC/Test/lofarconf.in
deleted file mode 100644
index 06fab3b2e3111e3bed3a26793a1fea662f4a2b52..0000000000000000000000000000000000000000
--- a/MAC/Test/lofarconf.in
+++ /dev/null
@@ -1,3 +0,0 @@
-Suite
-GCF
-TestHarness
diff --git a/MAC/Tools/Clock/Makefile.am b/MAC/Tools/Clock/Makefile.am
deleted file mode 100644
index fbaa6b392ccc5d68e101633f2b2eabfab4a039ee..0000000000000000000000000000000000000000
--- a/MAC/Tools/Clock/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin_SCRIPTS = plotclock
-
-sbin_PROGRAMS = ppsctl
-
-ppsctl_SOURCES = ppsctl.c
-
-dist_sbin_SCRIPTS = $(sbin_SCRIPTS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Tools/Makefile.am b/MAC/Tools/Makefile.am
deleted file mode 100644
index 83dad532d5bf3dd36fe862302da024f7efd32616..0000000000000000000000000000000000000000
--- a/MAC/Tools/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS=Clock NTP
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/Tools/NTP/Makefile.am b/MAC/Tools/NTP/Makefile.am
deleted file mode 100644
index a3568f3e9ab1472e18113763e15f547b481b2a00..0000000000000000000000000000000000000000
--- a/MAC/Tools/NTP/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS	= src
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Tools/NTP/src/Makefile.am b/MAC/Tools/NTP/src/Makefile.am
deleted file mode 100644
index 359dfd7eb1b4033a70a202904cfa89a12d2c325c..0000000000000000000000000000000000000000
--- a/MAC/Tools/NTP/src/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-sbin_SCRIPTS = resetNTPcoords
-
-dist_sbin_SCRIPTS = $(sbin_SCRIPTS)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Tools/bootstrap b/MAC/Tools/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/MAC/Tools/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/MAC/Tools/configure.in b/MAC/Tools/configure.in
deleted file mode 100644
index b90a547d309a671ad5876fc1daf878722ace49f5..0000000000000000000000000000000000000000
--- a/MAC/Tools/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MACTools, 1.0, no-define)
-
-AC_PROG_LIBTOOL
-
-AC_OUTPUT(
-        NTP/Makefile
-	NTP/src/Makefile
-	Clock/Makefile
-	Makefile
-)
diff --git a/MAC/bootstrap b/MAC/bootstrap
deleted file mode 100755
index be0aa5082f702905c4cb89db7d6df5b590303556..0000000000000000000000000000000000000000
--- a/MAC/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../autoconf_share/bootstrap ../autoconf_share
diff --git a/MAC/lofarconf.in b/MAC/lofarconf.in
deleted file mode 100644
index 8f7b097c89b7eec2e8e4f37e13ea0543393d35df..0000000000000000000000000000000000000000
--- a/MAC/lofarconf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-APL
-Deployment
-GCF
-MACIO
-Navigator2
-Tools
diff --git a/RTCP/CNProc/CNProc.spec.in b/RTCP/CNProc/CNProc.spec.in
deleted file mode 100644
index a5585c238297fdaa6eee06c1e6a860f43aabbc9b..0000000000000000000000000000000000000000
--- a/RTCP/CNProc/CNProc.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CNProc.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: CNProc is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-CNProc ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/CNProc/Makefile.am b/RTCP/CNProc/Makefile.am
deleted file mode 100644
index 8e654afc3e65a2904c810fd11693a4a403ec50a5..0000000000000000000000000000000000000000
--- a/RTCP/CNProc/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      CNProc.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/CNProc/bootstrap b/RTCP/CNProc/bootstrap
deleted file mode 100755
index 8cbc9d639eced53854617cc8f75f2784a16d8d59..0000000000000000000000000000000000000000
--- a/RTCP/CNProc/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share 0
diff --git a/RTCP/CNProc/configure.in b/RTCP/CNProc/configure.in
deleted file mode 100644
index 4d9212e4eb11791e028909f1e0655e2cd66119ae..0000000000000000000000000000000000000000
--- a/RTCP/CNProc/configure.in
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(CNProc, 1.0, no-define)
-AM_PROG_AS(gcc)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-lofar_MPI
-lofar_FFTW3F(0)
-lofar_FFTW2(0)
-
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Stream,Stream,,1,Stream/Stream.h,,)
-lofar_INTERNAL(RTCP/Interface,Interface,,1,Interface/Config.h,,)
-lofar_INTERNAL(RTCP/FCNP,FCNP,,0,FCNP/fcnp_cn.h,fcnp_cn)
-lofar_EXTERNAL(boost,1,boost/multi_array.hpp,"")
-lofar_EXTERNAL(mass,0,"",,/opt/mass)
-dnl lofar_EXTERNAL(fcnp,0,fcnp_cn.h,fcnp_cn,/cephome/romein/packages/fcnp)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-CNProc.spec
-)
diff --git a/RTCP/CNProc/src/Makefile.am b/RTCP/CNProc/src/Makefile.am
deleted file mode 100644
index 0ed7c7591df5f000ab5838c321d4a0baeb45f8af..0000000000000000000000000000000000000000
--- a/RTCP/CNProc/src/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-INSTHDRS         	=\
-Package__Version.h      \
-BandPass.h		\
-LocationInfo.h		\
-CorrelatorAsm.h		\
-FFT_Asm.h		\
-FIR_Asm.h		\
-FIR.h			\
-PPF.h			\
-AsyncTranspose.h	\
-BeamFormerAsm.h         \
-Correlator.h		\
-CN_Processing.h	        \
-FCNP_ClientStream.h     \
-AsyncCommunication.h    \
-PencilBeams.h           \
-CN_Math.h               \
-Stokes.h
-
-NOINSTHDRS 		=
-
-TCCHDRS 		=
-
-AM_CPPFLAGS		= $(EXTRA_CPPFLAGS)
-
-pkginclude_HEADERS 	= $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS 		= $(NOINSTHDRS)
-
-DOCHDRS 		= $(INSTHDRS) $(NOINSTHDRS)
-
-bin_PROGRAMS 		= CN_Processing 
-
-CCASFLAGS		= $(patsubst -q%,,$(CPPFLAGS)) $(EXTRA_CPPFLAGS)
-
-CN_Processing_SOURCES	= $(DOCHDRS) \
-Package__Version.cc             \
-BandPass.cc			\
-BeamFormerAsm.S			\
-BeamFormerAsm3st6Bm.inc		\
-BeamFormerAsm6st3Bm.inc		\
-LocationInfo.cc			\
-CorrelatorAsm.S			\
-FIR_Asm.S			\
-FFT_Asm.S			\
-FIR.cc				\
-AsyncTranspose.cc		\
-PPF.cc				\
-Correlator.cc			\
-CN_Processing_main.cc    	\
-CN_Processing.cc		\
-FCNP_ClientStream.cc            \
-AsyncCommunication.cc           \
-PencilBeams.cc                  \
-Stokes.cc
-
-configfilesdir=$(bindir)
-configfiles_DATA	=	\
-CN_Processing.machinefile	\
-CNProc.log_prop	
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/CNProc/test/Makefile.am b/RTCP/CNProc/test/Makefile.am
deleted file mode 100644
index b7445ced8a54b84fe18c009e234fcb08f5955bfe..0000000000000000000000000000000000000000
--- a/RTCP/CNProc/test/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-
-check_PROGRAMS = tCN_Processing tBeamForming tPencilBeamFormer tStokes
-
-
-AM_CPPFLAGS = $(EXTRA_CPPFLAGS)
-
-AM_CXXFLAGS = \
-	-I../../../src
-
-tCN_Processing_SOURCES =			\
-tCN_Processing.cc				\
-../src/BandPass.cc				\
-../src/BeamFormerAsm.S				\
-../src/CN_Processing.cc		        	\
-../src/Correlator.cc				\
-../src/CorrelatorAsm.S				\
-../src/FFT_Asm.S				\
-../src/FIR.cc					\
-../src/FIR_Asm.S				\
-../src/LocationInfo.cc				\
-../src/PPF.cc					\
-../src/PencilBeams.cc				\
-../src/Stokes.cc				\
-../src/AsyncCommunication.cc			\
-../src/AsyncTranspose.cc
-
-tBeamForming_SOURCES =				\
-tBeamForming.cc					\
-../src/BeamFormerAsm.S
-
-tPencilBeamFormer_SOURCES =			\
-tPencilBeamFormer.cc				\
-../src/PencilBeams.cc                           \
-../src/BeamFormerAsm.S
-
-tStokes_SOURCES =		        	\
-tStokes.cc	        			\
-../src/PencilBeams.cc                           \
-../src/Stokes.cc                                \
-../src/BeamFormerAsm.S
-
-CCASFLAGS		= $(patsubst -q%,,$(CPPFLAGS)) $(EXTRA_CPPFLAGS)
-
-
-TESTS   = 					\
-tCN_Processing.sh                               \
-tPencilBeamFormer.sh                            \
-tStokes.sh
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/FCNP/FCNP.spec.in b/RTCP/FCNP/FCNP.spec.in
deleted file mode 100644
index 93220a49565a3114af5f36770a6bad1980a75e5f..0000000000000000000000000000000000000000
--- a/RTCP/FCNP/FCNP.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# FCNP.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: FCNP is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-FCNP ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/FCNP/Makefile.am b/RTCP/FCNP/Makefile.am
deleted file mode 100644
index 86a6f56af593b3be56baa29b7b5a4c27f1eb1f98..0000000000000000000000000000000000000000
--- a/RTCP/FCNP/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS=src test
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      FCNP.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/FCNP/bootstrap b/RTCP/FCNP/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/RTCP/FCNP/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/RTCP/FCNP/configure.in b/RTCP/FCNP/configure.in
deleted file mode 100644
index a057280f6609d834444dd94f3fb64042c1cbbd72..0000000000000000000000000000000000000000
--- a/RTCP/FCNP/configure.in
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(FCNP, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-FCNP.spec
-)
diff --git a/RTCP/FCNP/src/Makefile.am b/RTCP/FCNP/src/Makefile.am
deleted file mode 100644
index 2e31ec31492d658a9885bb71923c5b8b9799c46b..0000000000000000000000000000000000000000
--- a/RTCP/FCNP/src/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-lib_LTLIBRARIES         = libfcnp_cn.la libfcnp_ion.la
-
-pkginclude_HEADERS	= Package__Version.h fcnp_cn.h fcnp_ion.h protocol.h
-
-libfcnp_cn_la_SOURCES	= Package__Version.cc fcnp_cn.cc
-libfcnp_ion_la_SOURCES	= Package__Version.cc fcnp_ion.cc
-
-bin_PROGRAMS		= versionfcnp
-
-versionfcnp_SOURCES	= versionfcnp.cc
-versionfcnp_LDADD	= libfcnp_cn.la libfcnp_ion.la
-versionfcnp_DEPENDENCIES= libfcnp_ion.la libfcnp_ion.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/FCNP/test/Makefile.am b/RTCP/FCNP/test/Makefile.am
deleted file mode 100644
index d94c4b83083ab98bc5ca3ecc37fbf415d4ff9750..0000000000000000000000000000000000000000
--- a/RTCP/FCNP/test/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-check_PROGRAMS			= tBandwidth_cn tBandwidth_ion
-
-tBandwidth_cn_SOURCES		= tBandwidth_cn.cc
-tBandwidth_cn_LDADD		= ../src/libfcnp_cn.la
-tBandwidth_cn_DEPENDENCIES	= ../src/libfcnp_cn.la $(LOFAR_DEPEND)
-
-tBandwidth_ion_SOURCES		= tBandwidth_ion.cc
-tBandwidth_ion_LDADD		= ../src/libfcnp_ion.la
-tBandwidth_ion_DEPENDENCIES	= ../src/libfcnp_ion.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/IONProc/IONProc.spec.in b/RTCP/IONProc/IONProc.spec.in
deleted file mode 100644
index 7c1ea0ded0f5709fbf9977bb9d6441885e976c1a..0000000000000000000000000000000000000000
--- a/RTCP/IONProc/IONProc.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# IONProc.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: IONProc is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-IONProc ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/IONProc/Makefile.am b/RTCP/IONProc/Makefile.am
deleted file mode 100644
index 8bebd067e09ad18261052e2a6823c84fbbba93a8..0000000000000000000000000000000000000000
--- a/RTCP/IONProc/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src test
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      IONProc.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/IONProc/bootstrap b/RTCP/IONProc/bootstrap
deleted file mode 100755
index 8cbc9d639eced53854617cc8f75f2784a16d8d59..0000000000000000000000000000000000000000
--- a/RTCP/IONProc/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share 0
diff --git a/RTCP/IONProc/configure.in b/RTCP/IONProc/configure.in
deleted file mode 100644
index 5ea779387bbfa96b358744fa36f13b2e5a49724f..0000000000000000000000000000000000000000
--- a/RTCP/IONProc/configure.in
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(IONProc, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-AM_PROG_AS
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/Converter.h)
-lofar_INTERNAL(LCS/AMC/AMCImpl,AMCImpl,,1,AMCImpl/ConverterImpl.h)
-lofar_INTERNAL(LCS/Stream,Stream,,1,Stream/Stream.h,,)
-lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ACCmain.h,,)
-lofar_INTERNAL(RTCP/Interface,Interface,,1,Interface/Config.h,,)
-lofar_INTERNAL(RTCP/FCNP,FCNP,,0,FCNP/fcnp_ion.h,fcnp_ion)
-lofar_EXTERNAL(boost,1,boost/date_time/date.hpp,boost_date_time)
-dnl lofar_EXTERNAL(fcnp,0,fcnp_ion.h,fcnp_ion,/cephome/romein/packages/fcnp)
-lofar_EXTERNAL(mpi,0,mpi.h,"mpi_cxx mpi open-rte open-pal",/bgsys/LOFAR/openmpi-ion)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-test/Makefile
-Makefile
-IONProc.spec
-)
diff --git a/RTCP/IONProc/src/Makefile.am b/RTCP/IONProc/src/Makefile.am
deleted file mode 100644
index f323f21b3baa26d556e697ccdbfac07bd2d793fa..0000000000000000000000000000000000000000
--- a/RTCP/IONProc/src/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-pkginclude_HEADERS = Package__Version.h \
-BeamletBuffer.h			\
-BeamletBufferToComputeNode.h	\
-InputSection.h			\
-InputThread.h			\
-InputThreadAsm.h		\
-ION_Allocator.h			\
-LockedRanges.h			\
-LogThread.h			\
-OutputThread.h			\
-OutputSection.h			\
-ReaderWriterSynchronization.h	\
-RSP.h				\
-Scheduling.h			\
-SlidingPointer.h		\
-StreamMultiplexer.h		\
-WallClockTime.h			\
-WH_DelayCompensation.h		\
-FCNP_ServerStream.h
-
-liblofar_impl_la_SOURCES = $(pkginclude_HEADERS) \
-BeamletBuffer.cc		\
-BeamletBufferToComputeNode.cc	\
-ION_main.cc		 	\
-InputSection.cc			\
-InputThread.cc			\
-InputThreadAsm.S		\
-ION_Allocator.cc		\
-LogThread.cc			\
-OutputThread.cc			\
-OutputSection.cc		\
-ReaderWriterSynchronization.cc	\
-Scheduling.cc			\
-StreamMultiplexer.cc		\
-WH_DelayCompensation.cc		\
-FCNP_ServerStream.cc		\
-Package__Version.cc
-
-IONProc_SOURCES			= $(liblofar_impl_la_SOURCES)
-IONProc_DEPENDENCIES		= $(LOFAR_DEPEND)
-
-bin_PROGRAMS			= versionionproc IONProc
-
-versionionproc_SOURCES      = versionionproc.cc Package__Version.cc 
-versionionproc_DEPENDENCIES = $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/IONProc/test/Makefile.am b/RTCP/IONProc/test/Makefile.am
deleted file mode 100644
index 6405fff863c626654c41c61115890cd726596f46..0000000000000000000000000000000000000000
--- a/RTCP/IONProc/test/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-check_PROGRAMS = tDelayCompensation
-
-
-AM_CPPFLAGS = $(EXTRA_CPPFLAGS)
-
-AM_CXXFLAGS = \
-	-I../../../src
-
-tDelayCompensation_SOURCES =			\
-tDelayCompensation.cc				\
-../src/WH_DelayCompensation.cc
-
-EXTRA_DIST =					\
-tDelayCompensation.parset
-
-CCASFLAGS		= $(patsubst -q%,,$(CPPFLAGS)) $(EXTRA_CPPFLAGS)
-
-
-TESTS   = 					\
-tDelayCompensation.sh
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Interface/Interface.spec.in b/RTCP/Interface/Interface.spec.in
deleted file mode 100644
index 59c336a0b5a575173550a4878e0f1a6f274d7b8c..0000000000000000000000000000000000000000
--- a/RTCP/Interface/Interface.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Interface.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Interface is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Interface ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/Interface/Makefile.am b/RTCP/Interface/Makefile.am
deleted file mode 100644
index 8d4f1a55b93629c1ba0d33baa19b7e6400bc59d6..0000000000000000000000000000000000000000
--- a/RTCP/Interface/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix) \
-      --with-transport=$(prefix) \
-      --with-aps=$(prefix) \
-      --with-tinycep=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      Interface.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Interface/bootstrap b/RTCP/Interface/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/RTCP/Interface/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/RTCP/Interface/configure.in b/RTCP/Interface/configure.in
deleted file mode 100644
index ae51a124b44e9313d5ea6f733b350f1f1e9ba572..0000000000000000000000000000000000000000
--- a/RTCP/Interface/configure.in
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Interface, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-dnl AC_PROG_AWK
-dnl AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-dnl AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_MPI
-
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/Stream,Stream,,1,Stream/Stream.h,,)
-lofar_EXTERNAL(boost,1,boost/date_time/date.hpp,"")
-
-dnl lofar_BLITZ
-dnl lofar_MPI
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/Interface/Makefile
-src/Makefile
-test/Makefile
-Makefile
-Interface.spec
-)
diff --git a/RTCP/Interface/include/Interface/Makefile.am b/RTCP/Interface/include/Interface/Makefile.am
deleted file mode 100644
index ffe16c7a669f657451c57bc01f0bb43accdc2801..0000000000000000000000000000000000000000
--- a/RTCP/Interface/include/Interface/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-pkginclude_HEADERS = Package__Version.h \
-		     Align.h \
-		     AlignedStdAllocator.h \
-		     Allocator.h \
-		     CN_Command.h \
-		     CN_Configuration.h \
-		     CN_Mapping.h \
-		     CorrelatedData.h \
-		     Config.h \
-		     FilteredData.h \
-		     MultiDimArray.h \
-		     Mutex.h \
-		     Parset.h \
-		     SubbandMetaData.h \
-		     PrintVector.h \
-		     Queue.h \
-		     RSPTimeStamp.h \
-		     SparseSet.h \
-		     Exceptions.h \
-		     StreamableData.h \
-		     PencilBeamData.h \
-		     PencilCoordinates.h \
-                     StokesData.h \
-		     BFRawFormat.h \
-                     ProcessingPlan.h \
-                     CN_ProcessingPlan.h \
-		     Thread.h \
-                     TransposedData.h \
-                     InputData.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Interface/include/Makefile.am b/RTCP/Interface/include/Makefile.am
deleted file mode 100644
index af38e8c68a64d9bb75f0d756a16ba78b7ec36ef0..0000000000000000000000000000000000000000
--- a/RTCP/Interface/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= Interface
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Interface/src/Makefile.am b/RTCP/Interface/src/Makefile.am
deleted file mode 100644
index 93ea5d3c99d31e7e2a86757d826330382aa6c786..0000000000000000000000000000000000000000
--- a/RTCP/Interface/src/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-lib_LTLIBRARIES			= libinterface.la
-
-libinterface_la_SOURCES	        = Package__Version.cc \
-				  Allocator.cc \
-				  CN_Configuration.cc \
-				  CN_Mapping.cc \
-				  CN_ProcessingPlan.cc \
-				  Parset.cc \
-				  PencilCoordinates.cc \
-				  RSPTimeStamp.cc
-
-configfilesdir			= $(bindir)
-
-bin_PROGRAMS = versioninterface
-
-versioninterface_SOURCES      = versioninterface.cc
-versioninterface_LDADD        = libinterface.la
-versioninterface_DEPENDENCIES = libinterface.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Interface/test/Makefile.am b/RTCP/Interface/test/Makefile.am
deleted file mode 100644
index 6ab2ef6aa9e09d1894c6cc1bd5c0c13dffb61d24..0000000000000000000000000000000000000000
--- a/RTCP/Interface/test/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-check_PROGRAMS		= tSparseSet tRSPTimeStamp
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS		= tSparseSet tRSPTimeStamp
-#ENDCHECKTOOLPROGS
-
-# scripts used to run tests
-TESTSCRIPTS		=
-
-# scripts and possible programs to run tests
-TESTS			= $(TESTSCRIPTS) \
-			  tSparseSet \
-			  tRSPTimeStamp
-
-XFAIL_TESTS		=
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST		= $(TESTSCRIPTS)
-
-tSparseSet_SOURCES	= tSparseSet.cc
-tSparseSet_LDADD	= ../src/libinterface.la
-tSparseSet_DEPENDENCIES = ../src/libinterface.la
-
-tRSPTimeStamp_SOURCES	= tRSPTimeStamp.cc
-tRSPTimeStamp_LDADD	= ../src/libinterface.la
-tRSPTimeStamp_DEPENDENCIES = ../src/libinterface.la
-
-# Lines to build a test program testprg
-#testprg_SOURCES		= testprg.cc
-#testprg_LDADD			= ../src/libinterface.la
-#testprg_DEPENDENCIES		= ../src/libinterface.la $(LOFAR_DEPEND)
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/LofarStMan/LofarStMan.spec.in b/RTCP/LofarStMan/LofarStMan.spec.in
deleted file mode 100644
index 207a1809cdac55c078b21a190aa60999476dd22c..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/LofarStMan.spec.in
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# LofarStMan.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: LofarStMan is the package containing specific LOFAR MS storage manager
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-LofarStMan is the package containing specific LOFAR MS storage manager
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/LofarStMan/Makefile.am b/RTCP/LofarStMan/Makefile.am
deleted file mode 100644
index e187fa18ba118589655daae05fecb96fe26a9586..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-EXTRA_DIST = \
-      Makefile.common \
-      Common.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/LofarStMan/bootstrap b/RTCP/LofarStMan/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/RTCP/LofarStMan/configure.in b/RTCP/LofarStMan/configure.in
deleted file mode 100644
index 1235fdcd304d4426e82eba6eb9df52840551c085..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/configure.in
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(LofarStMan, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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_ENABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR general things
-dnl
-lofar_GENERAL
-lofar_MPI
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_AIPSPP(1,"-lmeasures -ltables -lscimath -lscimath_f -lcasa")
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/LofarStMan/Makefile
-src/Makefile
-test/Makefile
-Makefile
-LofarStMan.spec
-)
diff --git a/RTCP/LofarStMan/include/LofarStMan/Makefile.am b/RTCP/LofarStMan/include/LofarStMan/Makefile.am
deleted file mode 100644
index aead48b25e1598359c602f32561b08318e105059..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/include/LofarStMan/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-pkginclude_HEADERS = Package__Version.h  \
-	LofarStMan.h LofarColumn.h Register.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/LofarStMan/include/Makefile.am b/RTCP/LofarStMan/include/Makefile.am
deleted file mode 100644
index c3ebc02fce6967a084e70a802bab837fea57d35c..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= LofarStMan
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/LofarStMan/src/Makefile.am b/RTCP/LofarStMan/src/Makefile.am
deleted file mode 100644
index 14bf3216abece2401cb06e659bb8bdb5b7a5e2ac..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-lib_LTLIBRARIES 	= liblofarstman.la
-
-liblofarstman_la_SOURCES 	= Package__Version.cc \
-	LofarStMan.cc LofarColumn.cc Register.cc
-
-bin_PROGRAMS = versionlofarstman
-
-versionlofarstman_SOURCES      = versionlofarstman.cc
-versionlofarstman_LDADD        = liblofarstman.la
-versionlofarstman_DEPENDENCIES = liblofarstman.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/LofarStMan/test/Makefile.am b/RTCP/LofarStMan/test/Makefile.am
deleted file mode 100644
index 7bbe7868ba6dd0d0b79f8ece23580fce00ad62dd..0000000000000000000000000000000000000000
--- a/RTCP/LofarStMan/test/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# programs to run through supplied checktools
-CHECKTOOLPROGS	=	tLofarStMan tfix
-
-check_PROGRAMS	=	$(CHECKTOOLPROGS)
-
-TESTSCRIPTS	= 	tLofarStMan.sh
-
-TESTS		=	$(TESTSCRIPTS)
-
-tLofarStMan_SOURCES		= tLofarStMan.cc
-
-tfix_SOURCES			= tfix.cc
-
-LDADD				= ../src/liblofarstman.la
-DEPENDENCIES			= ../src/liblofarstman.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/RTCPTools/Makefile.am b/RTCP/RTCPTools/Makefile.am
deleted file mode 100644
index 20c32d4fff5b38e5974bdee37a3c3b4410936965..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      RTCPTools.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/RTCPTools/RTCPTools.spec.in b/RTCP/RTCPTools/RTCPTools.spec.in
deleted file mode 100644
index d61d12541091ee039b1fd0a9f4d2dd486ab0fcb9..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/RTCPTools.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# RTCPTools.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: RTCPTools is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-RTCPTools ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/RTCPTools/bootstrap b/RTCP/RTCPTools/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/RTCP/RTCPTools/configure.in b/RTCP/RTCPTools/configure.in
deleted file mode 100644
index 30d2a6cfa565bece68946b79814baba61a450a05..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/configure.in
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(RTCPTools, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h)
-dnl lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/Converter.h)
-dnl lofar_INTERNAL(LCS/AMC/AMCImpl,AMCImpl,,1,AMCImpl/ConverterImpl.h)
-dnl lofar_INTERNAL(CEP/tinyCEP,tinyCEP,,1,tinyCEP/WorkHolder.h)
-dnl lofar_INTERNAL(CEP/CEPFrame,CEPFrame,,1,CEPFrame/ApplicationHolder.h)
-dnl lofar_INTERNAL(RTCP/Interface,Interface,,1,Interface/Config.h)
-
-dnl lofar_EXTERNAL(boost,1,boost/thread.hpp,"boost_date_time")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/RTCPTools/Makefile
-src/Makefile
-test/Makefile
-Makefile
-RTCPTools.spec
-)
diff --git a/RTCP/RTCPTools/include/Makefile.am b/RTCP/RTCPTools/include/Makefile.am
deleted file mode 100644
index bf0c16ab7087a75bd9afe2ef96322f7460baa7e0..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= RTCPTools
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/RTCPTools/include/RTCPTools/Makefile.am b/RTCP/RTCPTools/include/RTCPTools/Makefile.am
deleted file mode 100644
index db5d3ab761c008b979ba8c4852251938b45f42a1..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/include/RTCPTools/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/RTCPTools/src/Makefile.am b/RTCP/RTCPTools/src/Makefile.am
deleted file mode 100644
index 7d836f49c95f312d0b732029831c8a7f52828c2a..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/src/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-INSTHDRS         	=
-
-NOINSTHDRS 		=
-
-TCCHDRS 		=
-
-AM_CPPFLAGS		= $(EXTRA_CPPFLAGS)
-
-pkginclude_HEADERS 	= $(INSTHDRS) $(TCCHDRS)
-
-noinst_HEADERS 		= $(NOINSTHDRS)
-
-DOCHDRS 		= $(INSTHDRS) $(NOINSTHDRS)
-
-bin_PROGRAMS 				= generator udp_copy
-
-generator_SOURCES			= $(DOCHDRS) \
-generator.c
-
-udp_copy_SOURCES			= $(DOCHDRS) \
-udp-copy.c
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/RTCPTools/test/Makefile.am b/RTCP/RTCPTools/test/Makefile.am
deleted file mode 100644
index 7009cfeeab32709002a9b862f82cbd6f8949080e..0000000000000000000000000000000000000000
--- a/RTCP/RTCPTools/test/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-check_PROGRAMS		= 
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS		= 
-#ENDCHECKTOOLPROGS
-
-# scripts and possible programs to run tests
-TESTS			= 
-
-XFAIL_TESTS		= 
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST		= $(TESTS)
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Run/CS1_Run.spec.in b/RTCP/Run/CS1_Run.spec.in
deleted file mode 100644
index c89528393c5a067f311ff4390845ad23d059ce75..0000000000000000000000000000000000000000
--- a/RTCP/Run/CS1_Run.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# CS1_Run.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: CS1_Run is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-CS1_Run ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/Run/Makefile.am b/RTCP/Run/Makefile.am
deleted file mode 100644
index de155db7d54a21dda585bf3d4c3ec07e850b96b9..0000000000000000000000000000000000000000
--- a/RTCP/Run/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      CS1_Run.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Run/bootstrap b/RTCP/Run/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/RTCP/Run/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/RTCP/Run/configure.in b/RTCP/Run/configure.in
deleted file mode 100644
index 00c43d897e98dc58199dd2898ed056b006157349..0000000000000000000000000000000000000000
--- a/RTCP/Run/configure.in
+++ /dev/null
@@ -1,42 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Run, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-dnl Checks for library functions.
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-dnl lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-CS1_Run.spec
-)
diff --git a/RTCP/Run/src/Makefile.am b/RTCP/Run/src/Makefile.am
deleted file mode 100644
index 3e35ed1f9681ce103dd473a578bfae4d81fd6e52..0000000000000000000000000000000000000000
--- a/RTCP/Run/src/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
-#lib_LTLIBRARIES         = libcs1_run.la
-
-#libcs1_run_la_SOURCES =
-
-# AM_YFLAGS               = -d -p KeyParse
-# AM_LFLAGS               = -PKeyTokenize
-# LEX_OUTPUT_ROOT         = lex.KeyTokenize
-
-# if HAVE_SHMEM
-# libcs1_run_la_LIBADD     = shmem/libshmem.la
-# endif
-
-bin_PROGRAMS = packetanalysis
-
-# Lines to build a program prg
-#prg_SOURCES		= prg.cc
-#prg_LDADD		= libcs1_run.la
-#prg_DEPENDENCIES	= libcs1_run.la $(LOFAR_DEPEND)
-
-glishdir = $(libexecdir)/glish
-dist_glish_SCRIPTS = 
-
-packetanalysis_SOURCES = packetanalysis.c
-
-pythondir = $(bindir)/Run
-dist_python_SCRIPTS = 	\
-			runOLAP.py \
-                        killOLAP \
-			OLAP.parset
-
-lofarpythondir = $(bindir)/Run/LOFAR
-dist_lofarpython_SCRIPTS = 	\
-			LOFAR/BGcontrol.py \
-			LOFAR/__init__.py \
-			LOFAR/Locations.py \
-			LOFAR/Logger.py \
-			LOFAR/ObservationID.py \
-			LOFAR/Parset.py \
-			LOFAR/Partitions.py \
-			LOFAR/Sections.py \
-			LOFAR/Stations.py \
-                        LOFAR/RSPConnections.dat
-
-utilpythondir = $(bindir)/Run/util
-dist_utilpython_SCRIPTS = 	\
-			util/Aborter.py \
-			util/Commands.py \
-			util/dateutil.py \
-			util/Hosts.py \
-			util/__init__.py \
-			util/Parset.py \
-			util/shlex.py \
-			util/tee.py
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Storage/Makefile.am b/RTCP/Storage/Makefile.am
deleted file mode 100644
index 046754133e29511e09b99b7e9d6fc7fb79f229e8..0000000000000000000000000000000000000000
--- a/RTCP/Storage/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      Storage.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Storage/Storage.spec.in b/RTCP/Storage/Storage.spec.in
deleted file mode 100644
index a0e008ab7498105364ed9985bf16f45bb3346b51..0000000000000000000000000000000000000000
--- a/RTCP/Storage/Storage.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# Storage.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: Storage is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-Storage ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/RTCP/Storage/bootstrap b/RTCP/Storage/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/RTCP/Storage/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/RTCP/Storage/configure.in b/RTCP/Storage/configure.in
deleted file mode 100644
index c9e75648379ab8141889e29ce2aefdf3a5963e89..0000000000000000000000000000000000000000
--- a/RTCP/Storage/configure.in
+++ /dev/null
@@ -1,83 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(Storage, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-lofar_MPI
-lofar_AIPSPP(0,"-lms -lmeasures -ltables -lscimath -lscimath_f -lcasa")
-
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-dnl lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/DataHolder.h,,)
-lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/Epoch.h,,)
-dnl lofar_INTERNAL(CEP/tinyCEP,tinyCEP,,1,tinyCEP/TinyDataManager.h,,)
-dnl lofar_INTERNAL(CEP/CEPFrame,CEPFrame,,1,CEPFrame/DataManager.h,,)
-lofar_INTERNAL(RTCP/Interface,Interface,,1,Interface/Parset.h,,)
-lofar_INTERNAL(RTCP/LofarStMan,LofarStMan,,1,LofarStMan/LofarStMan.h,,)
-dnl The property interface is not used right now
-dnl lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_PVString.h,gcfcommon)
-dnl lofar_INTERNAL(MAC/GCF/PALlight,PALlight,,1,GCF/PALlight/CEPPropertySet.h,gcfceppallight)
-
-lofar_EXTERNAL(boost,1,boost/thread.hpp,"boost_date_time")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-include/Makefile
-include/Storage/Makefile
-src/Makefile
-test/Makefile
-Makefile
-Storage.spec
-)
diff --git a/RTCP/Storage/include/Makefile.am b/RTCP/Storage/include/Makefile.am
deleted file mode 100644
index bf3e48a37583b80dbd6245d2b5c25998f557f72f..0000000000000000000000000000000000000000
--- a/RTCP/Storage/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= Storage
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Storage/include/Storage/Makefile.am b/RTCP/Storage/include/Storage/Makefile.am
deleted file mode 100644
index d9c0ab1e68324af765c3dca2ebb9de928e9de0bd..0000000000000000000000000000000000000000
--- a/RTCP/Storage/include/Storage/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-pkginclude_HEADERS = Package__Version.h
-
-noinst_HEADERS =		\
-	InputThread.h		\
-	OutputThread.h		\
-	SubbandWriter.h		\
-	MSWriter.h		\
-	MSWriterNull.h		\
-	MSWriterFile.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/Storage/src/Makefile.am b/RTCP/Storage/src/Makefile.am
deleted file mode 100644
index d1282bc4c97e95094507dab515ee5eb1b898cba1..0000000000000000000000000000000000000000
--- a/RTCP/Storage/src/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-lib_LTLIBRARIES			= libstorage.la
-
-libstorage_la_SOURCES	= Package__Version.cc \
-				  InputThread.cc \
-				  OutputThread.cc \
-				  SubbandWriter.cc \
-				  MSWriter.cc      \
-				  MSWriterNull.cc  \
-				  MSWriterFile.cc  \
-                                  MeasurementSetFormat.cc
-
-bin_PROGRAMS			= versionstorage Storage
-
-Storage_SOURCES		        = Storage_main.cc
-Storage_LDADD		        = libstorage.la
-Storage_DEPENDENCIES	        = libstorage.la $(LOFAR_DEPEND)
-
-configfilesdir			= $(bindir)
-configfiles_DATA                = Storage.log_prop \
-				  PropertyInterface.conf
-
-versionstorage_SOURCES          = versionstorage.cc
-versionstorage_LDADD            = libstorage.la
-versionstorage_DEPENDENCIES     = libstorage.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
-sysconf_DATA = Storage.log_prop
diff --git a/RTCP/Storage/test/Makefile.am b/RTCP/Storage/test/Makefile.am
deleted file mode 100644
index b54995033536feddadb31aa5af77fd80b7360ebb..0000000000000000000000000000000000000000
--- a/RTCP/Storage/test/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-check_PROGRAMS        = tAH_TestStorage
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-# scripts used to run tests
-TESTSCRIPTS           =
-
-# scripts and possible programs to run tests
-TESTS	              = $(TESTSCRIPTS)
-
-XFAIL_TESTS           =
-
-# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS)
-
-tAH_TestStorage_SOURCES		= tAH_TestStorage.cc 
-tAH_TestStorage_LDADD		= ../src/libstorage.la
-tAH_TestStorage_DEPENDENCIES	= ../src/libstorage.la $(LOFAR_DEPEND)
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/RTCP/lofarconf.in b/RTCP/lofarconf.in
deleted file mode 100644
index ee559b20fdf8c1ac1588eb05d7886c1e868ff549..0000000000000000000000000000000000000000
--- a/RTCP/lofarconf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-CNProc			# Compute-Node Processing: application running on the BlueGene compute nodes
-Run                     # Several run scripts to start the RTCP components
-IONProc                 # I/O Node Processing: application running on the BlueGene I/O nodes
-Interface		# Defines interfaces between the different components within the RTCP product
-Storage			# Stores output from the correlator in one or more MeasurmentSet files.
-RTCPTools               # Several RTCP tools
diff --git a/SAS/OTB/jOTDB2/Makefile.am b/SAS/OTB/jOTDB2/Makefile.am
deleted file mode 100644
index 088cbefa9dc121fd3a4723c8946ce40cca2b21fd..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      jOTDB2.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTB/jOTDB2/bootstrap b/SAS/OTB/jOTDB2/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/SAS/OTB/jOTDB2/configure.in b/SAS/OTB/jOTDB2/configure.in
deleted file mode 100644
index 8f87945338e1aea5750adf81206620230c3f7fb5..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/configure.in
+++ /dev/null
@@ -1,74 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-dnl AC_CONFIG_AUX_DIR(config)
-dnl AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(jOTDB2, 1.0, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-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
-dnl AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-dnl lofar_BLITZ
-dnl lofar_MPI
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(SAS/OTDB,OTDB,,1,OTDB/OTDBnode.h,,)
-lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
-lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
-lofar_EXTERNAL(pqxx,2.5.0,pqxx/pqxx, pqxx)
-lofar_EXTERNAL(readline,0,readline/readline.h,,,,,,"-lncurses")
-dnl lofar_EXTERNAL(pq,,libpq-fe.h,)
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-src/Makefile
-include/Makefile
-include/jOTDB2/Makefile
-test/Makefile
-Makefile
-)
diff --git a/SAS/OTB/jOTDB2/include/Makefile.am b/SAS/OTB/jOTDB2/include/Makefile.am
deleted file mode 100644
index a1082a1f4f16b3d7c4945b72796b721da09c8040..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = jOTDB2
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTB/jOTDB2/include/jOTDB2/Makefile.am b/SAS/OTB/jOTDB2/include/jOTDB2/Makefile.am
deleted file mode 100644
index cc34c922d490d9b1e0638ef35c84cec2568ad00f..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/include/jOTDB2/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# if HAVE_SHMEM
-# SUBDIRS = shmem .
-# endif
-
-
-pkginclude_HEADERS = \
-	  nl_astron_lofar_sas_otb_jotdb2_jCampaign.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jClassifConv.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jCommon.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jInitCPPLogger.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jOTDBconnection.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jParamTypeConv.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jTreeMaintenance.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jTreeStateConv.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jTreeTypeConv.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jTreeValue.h \
-	  nl_astron_lofar_sas_otb_jotdb2_jUnitConv.h
-
-
-noinst_HEADERS =
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTB/jOTDB2/jOTDB2.spec.in b/SAS/OTB/jOTDB2/jOTDB2.spec.in
deleted file mode 100644
index 4922e9018b28ffb1c7cbfc843fda7a7840c0da77..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/jOTDB2.spec.in
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# jOTDB2.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: jOTDB2 is ... brief description ...
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-##Requires: Common = 1.2   ## define dependent packages here
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-jOTDB2 ... more detailed description ...
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/SAS/OTB/jOTDB2/src/Makefile.am b/SAS/OTB/jOTDB2/src/Makefile.am
deleted file mode 100644
index c9de2eb713a7f1089b8d0fc83c90d0f9bf020f7d..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/src/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-lib_LTLIBRARIES         = libjotdb2.la
-
-libjotdb2_la_SOURCES   = $(DOCHDRS) \
-		         nl_astron_lofar_sas_otb_jotdb2_jCommon.cc \
-		         nl_astron_lofar_sas_otb_jotdb2_jCampaign.cc \
-		         nl_astron_lofar_sas_otb_jotdb2_jOTDBconnection.cc \
-		         nl_astron_lofar_sas_otb_jotdb2_jTreeMaintenance.cc \
-			 nl_astron_lofar_sas_otb_jotdb2_jClassifConv.cc \
-			 nl_astron_lofar_sas_otb_jotdb2_jParamTypeConv.cc \
-			 nl_astron_lofar_sas_otb_jotdb2_jTreeStateConv.cc \
-			 nl_astron_lofar_sas_otb_jotdb2_jTreeTypeConv.cc \
-			 nl_astron_lofar_sas_otb_jotdb2_jUnitConv.cc \
-			 nl_astron_lofar_sas_otb_jotdb2_jInitCPPLogger.cc \
-			 nl_astron_lofar_sas_otb_jotdb2_jTreeValue.cc
-
-# AM_YFLAGS               = -d -p KeyParse
-# AM_LFLAGS               = -PKeyTokenize
-# LEX_OUTPUT_ROOT         = lex.KeyTokenize
-
-# if HAVE_SHMEM
-# libjotdb2_la_LIBADD     = shmem/libshmem.la
-# endif
-
-bin_PROGRAMS =
-
-glishdir = $(libexecdir)/glish
-dist_glish_SCRIPTS = 
-
-pythondir = $(bindir)
-dist_python_SCRIPTS = 
-
-scriptdir = $(bindir)
-dist_script_SCRIPTS = 
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTB/jOTDB2/test/Makefile.am b/SAS/OTB/jOTDB2/test/Makefile.am
deleted file mode 100644
index 8630aa893dd0f8344d3e53c22b6c47f7cd9af13a..0000000000000000000000000000000000000000
--- a/SAS/OTB/jOTDB2/test/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-check_PROGRAMS        =
-
-# programs to run through supplied checktools
-CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
-
-TESTS	              =
-
-XFAIL_TESTS           =
-
-
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTB/lofarconf.in b/SAS/OTB/lofarconf.in
deleted file mode 100644
index 54176450ec9c8471abc36c22c802a776e7233404..0000000000000000000000000000000000000000
--- a/SAS/OTB/lofarconf.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Add packagenames from pacakages that resort under this Superclass
-# here. Insert a oneline comment
-#
-jOTDB2			#short description
-scripts
-#OTB			#short description
-#MoM-OTDB-adapter	#short description
diff --git a/SAS/OTB/scripts/Makefile.am b/SAS/OTB/scripts/Makefile.am
deleted file mode 100644
index 0d9ae959409a487150e56f15e9e8f917fab56981..0000000000000000000000000000000000000000
--- a/SAS/OTB/scripts/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS = src
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-EXTRA_DIST = Makefile.common
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/SAS/OTB/scripts/bootstrap b/SAS/OTB/scripts/bootstrap
deleted file mode 100644
index 32799b01a95257bb9701e7927d394b835937a018..0000000000000000000000000000000000000000
--- a/SAS/OTB/scripts/bootstrap
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
-
diff --git a/SAS/OTB/scripts/configure.in b/SAS/OTB/scripts/configure.in
deleted file mode 100644
index e2a9ab2c8e333675d30ff8d10e2b5eca4d77b656..0000000000000000000000000000000000000000
--- a/SAS/OTB/scripts/configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-
-dnl Not really necessary (we have no C sources), but autoconf requires it
-AC_CONFIG_HEADERS(config.h)
-
-dnl Needed by automake (e.g. for make dist)
-AM_INIT_AUTOMAKE(SAS-scripts, 1.0, no-define)
-
-dnl This is only needed because bootstrap issues a libtoolize command
-AC_PROG_LIBTOOL
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-         src/Makefile
-         Makefile
-)
-
diff --git a/SAS/OTB/scripts/src/Makefile.am b/SAS/OTB/scripts/src/Makefile.am
deleted file mode 100644
index 93682140aaa551fcca1a6b616755639c6be374f7..0000000000000000000000000000000000000000
--- a/SAS/OTB/scripts/src/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-bin_SCRIPTS = \
-        startOTB
-
-dist_bin_SCRIPTS = $(bin_SCRIPTS)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/SAS/OTDB/AUTHORS b/SAS/OTDB/AUTHORS
deleted file mode 100644
index 9a7668c356125d7bee09bca581202f86998fe04e..0000000000000000000000000000000000000000
--- a/SAS/OTDB/AUTHORS
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Owner/maintainer:
-================
-
-        Ruud Overeem            <overeem@astron.nl>
-
-
-Contributors:
-============
-
diff --git a/SAS/OTDB/COPYING b/SAS/OTDB/COPYING
deleted file mode 100644
index d60c31a97a544b53039088d14fe9114583c0efc3..0000000000000000000000000000000000000000
--- a/SAS/OTDB/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/SAS/OTDB/INSTALL b/SAS/OTDB/INSTALL
deleted file mode 100644
index 584458b4d62614c80b611496e45ad9bea750edfb..0000000000000000000000000000000000000000
--- a/SAS/OTDB/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-Building the OTDB package
-=========================
-
-The LOFAR build environment is built upon the GNU AutoTools. It adds support
-for easily building multiple variants (e.g. different compilers, optimized or
-non-optimized, with MPI support, etc.). 
-
-From the user's perspective there are two important differences:
-  1. use `lofarconf' instead of `configure'
-  2. call `lofarconf' from a build directory.
-
-For example, suppose you want to build the current package using the default
-GNU compiler generating optimized code. You would then do the following:
-
-  1. Change directory to the package root directory (i.e. SAS/OTDB).
-  2. Issue the `./bootstrap' command.
-  3. Create a build/<variant> directory (i.e. mkdir -p build/gnu_opt)
-     and change to that directory.
-  4. Issue the `../../lofarconf' command.
-  5. Issue the commands `make', `make check' [optional], and `make install'.
-
-By default, `make install' will do an install in the directory
-`install/<variant>' relative to the LOFAR root directory
-(e.g. $HOME/LOFAR/install/gnu_opt).
-
diff --git a/SAS/OTDB/Makefile.am b/SAS/OTDB/Makefile.am
deleted file mode 100644
index 9f9ef001fe8d7775b619a571bae4f56a11275618..0000000000000000000000000000000000000000
--- a/SAS/OTDB/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=src test bin include
-
-ACLOCAL_AMFLAGS = -I autoconf_share
-
-pkgextdir     = $(prefix)/config/$(PACKAGE)
-pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
-      --with-common=$(prefix) \
-      --with-aps=$(prefix)
-
-EXTRA_DIST = \
-      Makefile.common \
-      OTDB.spec \
-      autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTDB/NEWS b/SAS/OTDB/NEWS
deleted file mode 100644
index 430b6e47ad3dc3f463b9ac5067711282b0546810..0000000000000000000000000000000000000000
--- a/SAS/OTDB/NEWS
+++ /dev/null
@@ -1,15 +0,0 @@
-SAS/OTDB: Version Candidate 1.0 date: 2005/08/10
-================================================
-
-Version Candidate 1.0
----------------------
-Initial release of the OTDB package. Almost completely functional on all
-tree types.
-
-Known TODO's
-------------
- + Implement getItemList(depth) for VIC components
- + Implement checkTreeConstraints
- + Implement pruneTree
- + Modify ACC/APS/KVpair to place the timestamp in the key-field i.s.o. 
-   the value-field
diff --git a/SAS/OTDB/OTDB.spec.in b/SAS/OTDB/OTDB.spec.in
deleted file mode 100644
index 051a772a11aa0902430b799a02842fb66d977baa..0000000000000000000000000000000000000000
--- a/SAS/OTDB/OTDB.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# OTDB.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: OTDB is the central database used for the lofar specification and scheduling module.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.3
-Requires: APS >= 2.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-The OTDB package provides the central database for scheduling and specifying
-observations. There are three classes - OTDBconnection,TreeMaintenance,TreeValue
-- that represent the interface to the observations trees in the database.
-The package also provides (in the sql directory) the scripts for creating the
-OTDB database and tables in a Postgres database.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
-  echo
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo @                                                                    @
-  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
-  echo @                                                                    @
-  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-  echo
-else
-  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
-  rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post 
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/SAS/OTDB/bin/Makefile.am b/SAS/OTDB/bin/Makefile.am
deleted file mode 100644
index b8b9817f401c638726a41f184557faa09f5729d1..0000000000000000000000000000000000000000
--- a/SAS/OTDB/bin/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS						= . 
-
-#check_PROGRAMS				= tConnection
-
-#tConnection_SOURCES			= tConnection.cc
-#tConnection_LDADD			= ../src/libotdb.la
-#tConnection_DEPENDENCIES	= ../src/libotdb.la $(LOFAR_DEPEND)
-
-
-#TESTS						= tConnection.sh 
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTDB/bootstrap b/SAS/OTDB/bootstrap
deleted file mode 100755
index fd49f5826a5501fdb92c129384c66f2835f940ac..0000000000000000000000000000000000000000
--- a/SAS/OTDB/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../autoconf_share/bootstrap ../../autoconf_share
diff --git a/SAS/OTDB/configure.in b/SAS/OTDB/configure.in
deleted file mode 100644
index 13b7065dbe2077e8465cf8e74124e95db240f4de..0000000000000000000000000000000000000000
--- a/SAS/OTDB/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(OTDB, 1.0, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-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
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
-lofar_EXTERNAL(pqxx,1,pqxx/pqxx, pqxx)
-lofar_EXTERNAL(pq,1,libpq-fe.h, pq, "/usr/local/pgsql /Library/PostgreSQL/8.3")
-
-dnl
-dnl Output Makefiles
-dnl
-AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
-                [chmod +x test/runctest.sh])
-AC_OUTPUT(
-Makefile
-src/Makefile
-test/Makefile
-bin/Makefile
-include/Makefile
-include/OTDB/Makefile
-OTDB.spec
-)
diff --git a/SAS/OTDB/include/Makefile.am b/SAS/OTDB/include/Makefile.am
deleted file mode 100644
index 7740a46bbf8e64c72a1cf43be531f4d94cdb5a71..0000000000000000000000000000000000000000
--- a/SAS/OTDB/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = OTDB
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTDB/include/OTDB/Makefile.am b/SAS/OTDB/include/OTDB/Makefile.am
deleted file mode 100644
index a075ac4ce85254af89374baf898bc5e025357398..0000000000000000000000000000000000000000
--- a/SAS/OTDB/include/OTDB/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-pkginclude_HEADERS 	= Package__Version.h  	Converter.h \
-				ClassifConv.h \
-				ParamTypeConv.h \
-				TreeStateConv.h \
-				TreeTypeConv.h \
-				UnitConv.h \
-				OTDBnode.h \
-				OTDBparam.h \
-				OTDBtree.h \
-				OTDBtypes.h \
-				OTDBvalue.h \
-				TreeState.h \
-				VICnodeDef.h \
-				OTDBconstants.h \
-				misc.h \
-				OTDBconnection.h \
-				TreeMaintenance.h \
-				TreeValue.h \
-				CampaignInfo.h \
-				Campaign.h
-
-noinst_HEADERS	 	= 	wSpaceSplit.h \
-				OTDBaction.h \
-				OTDBactionList.h \
-				OTDBcontrol.h \
-				OTDBevent.h \
-				OTDBeventList.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTDB/src/Makefile.am b/SAS/OTDB/src/Makefile.am
deleted file mode 100644
index 6c07d21a3403a092f7a46cc1bdab146992fa4887..0000000000000000000000000000000000000000
--- a/SAS/OTDB/src/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-lib_LTLIBRARIES			= libotdb.la
-
-libotdb_la_SOURCES 		= Package__Version.cc  $(DOCHDRS) \
-							OTDBconnection.cc	\
-							misc.cc \
-							OTDBtree.cc	\
-							OTDBnode.cc	\
-							OTDBvalue.cc	\
-							OTDBparam.cc	\
-							VICnodeDef.cc \
-							Converter.cc \
-							wSpaceSplit.cc \
-							TreeMaintenance.cc \
-							TreeState.cc \
-							TreeValue.cc \
-							loadCompFile.cc \
-							CampaignInfo.cc \
-							Campaign.cc
-
-#							OTDBaction.cc	\
-#						    OTDBactionList.cc	\
-#						    OTDBevent.cc	\
-#						    OTDBeventList.cc	
-
-bin_PROGRAMS = versionotdb
-
-versionotdb_SOURCES      = versionotdb.cc
-versionotdb_LDADD        = libotdb.la
-versionotdb_DEPENDENCIES = libotdb.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/OTDB/test/Makefile.am b/SAS/OTDB/test/Makefile.am
deleted file mode 100644
index 6dd29c35ecc67b9fd297c0595c07ed5fa82a6973..0000000000000000000000000000000000000000
--- a/SAS/OTDB/test/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-
-check_PROGRAMS				= tPICtree \
-							  tPICvalue \
-							  tVICcomp \
-							  tVTtree \
-							  tVHtree \
-							  tVHvalue \
-							  tConnection \
-							  tParamTypeConv \
-							  tCampaign
-
-tPICtree_SOURCES			= tPICtree.cc
-
-tPICvalue_SOURCES			= tPICvalue.cc
-
-tVICcomp_SOURCES			= tVICcomp.cc
-
-tVTtree_SOURCES				= tVTtree.cc
-
-tVHtree_SOURCES				= tVHtree.cc
-
-tVHvalue_SOURCES			= tVHvalue.cc
-tVHvalue_LDADD				= ../src/libotdb.la -lpqxx
-
-tConnection_SOURCES			= tConnection.cc
-
-tParamTypeConv_SOURCES		= tParamTypeConv.cc
-
-tCampaign_SOURCES			= tCampaign.cc
-
-LDADD						= ../src/libotdb.la -lpqxx
-DEPENDENCIES				= ../src/libotdb.la $(LOFAR_DEPEND)
-
-TESTSCRIPTS					= tParamTypeConv.sh \
-							  tPICtree.sh \
-							  tPICvalue.sh \
-							  tVICcomp.sh \
-							  tVTtree.sh \
-							  tVHtree.sh \
-							  tVHvalue.sh \
-							  tConnection.sh \
-							  tCampaign.sh
-
-TESTS						= $(TESTSCRIPTS)
-
-
-EXTRA_DIST					= DATABASENAME \
-							  tConnection.log_prop \
-							  tPICtree.in \
-							  tPICtree.log_prop \
-							  tPICvalue.in \
-							  tPICvalue.log_prop \
-							  tVHtree.log_prop \
-							  tVHvalue.in \
-							  tVHvalue.log_prop \
-							  tVICcomp.in \
-							  tVICcomp.log_prop \
-							  tVTtree.in \
-							  tVTtree.log_prop \
-							  tParamTypeConv.log_prop \
-							  tCampaign.log_prop \
-							  $(TESTSCRIPTS)
-
-include $(top_srcdir)/Makefile.common
diff --git a/SAS/bootstrap b/SAS/bootstrap
deleted file mode 100644
index be0aa5082f702905c4cb89db7d6df5b590303556..0000000000000000000000000000000000000000
--- a/SAS/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../autoconf_share/bootstrap ../autoconf_share
diff --git a/SAS/lofarconf.in b/SAS/lofarconf.in
deleted file mode 100644
index c4fa4e9297355567f546b0ed0d61e6d0ed484d94..0000000000000000000000000000000000000000
--- a/SAS/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-OTB
-OTDB
diff --git a/SubSystems/CCU_MAC/lofarconf.in b/SubSystems/CCU_MAC/lofarconf.in
deleted file mode 100644
index c8eb7e4de3e8300fbc08ed42786ac9415dbb514c..0000000000000000000000000000000000000000
--- a/SubSystems/CCU_MAC/lofarconf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-/MAC/APL/CEPCU
-/MAC/APL/CUDaemons
-/MAC/APL/CURTDBDaemons
-/MAC/Deployment
-/MAC/Navigator2
-
diff --git a/SubSystems/LCU_MAC/lofarconf.in b/SubSystems/LCU_MAC/lofarconf.in
deleted file mode 100644
index afc08e0448b3460bef577d6750450c176c8217de..0000000000000000000000000000000000000000
--- a/SubSystems/LCU_MAC/lofarconf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-/MAC/APL/StationCU
-/MAC/APL/PIC
-/MAC/APL/PAC
-/MAC/APL/CUDaemons
-/MAC/APL/CURTDBDaemons
-/MAC/Deployment
-/MAC/Navigator2
-/LCS/AMC
-/LCU/Firmware/tools
-/LCU/StationTest
-/MAC/Tools
diff --git a/SubSystems/MCU_MAC/lofarconf.in b/SubSystems/MCU_MAC/lofarconf.in
deleted file mode 100644
index 59862f0a83a031e32382a0fda2dba6688925be49..0000000000000000000000000000000000000000
--- a/SubSystems/MCU_MAC/lofarconf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-/MAC/APL/MainCU
-/MAC/APL/CUDaemons
-/MAC/APL/CURTDBDaemons
-/MAC/Deployment
-/MAC/Navigator2
-
diff --git a/SubSystems/Offline/lofarconf.in b/SubSystems/Offline/lofarconf.in
deleted file mode 100644
index c5675175bd312febe3d7a3bee806cc03758d3975..0000000000000000000000000000000000000000
--- a/SubSystems/Offline/lofarconf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-/LCS/pyparameterset
-/CEP/Calibration/BBSControl
-/CEP/pyparmdb
-/CEP/Imager/MWImager
-/CEP/DP3/DPPP
-/RTCP/LofarStMan
diff --git a/SubSystems/SAS_OTDB/lofarconf.in b/SubSystems/SAS_OTDB/lofarconf.in
deleted file mode 100644
index 308f084ea4dba82dda051ccc44db2c386b739fee..0000000000000000000000000000000000000000
--- a/SubSystems/SAS_OTDB/lofarconf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-/SAS/OTB
-/MAC/Deployment
diff --git a/SubSystems/lofarconf.in b/SubSystems/lofarconf.in
deleted file mode 100644
index 983247d39e2f790c40400ff3abb288872e9f5387..0000000000000000000000000000000000000000
--- a/SubSystems/lofarconf.in
+++ /dev/null
@@ -1,5 +0,0 @@
-CCU_MAC
-LCU_MAC
-MCU_MAC
-Offline
-SAS
diff --git a/bootstrap b/bootstrap
deleted file mode 100755
index 501aa60ce0a525fa31d37c4b787ad59df321fa31..0000000000000000000000000000000000000000
--- a/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-autoconf_share/bootstrap autoconf_share
diff --git a/lofarconf.in b/lofarconf.in
deleted file mode 100644
index 9bc7957611938e440ff8564eec8320f0b6b197bb..0000000000000000000000000000000000000000
--- a/lofarconf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-CEP
-LCS
-MAC
-SAS
-RTCP
-SubSystems