From 04d0a2ab9a080316abbea586e05360451af3ad26 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Wed, 7 Nov 2007 15:44:44 +1100 Subject: [PATCH] Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS. r2239 | ffr | 2007-11-07 15:44:44 +1100 (Wed, 07 Nov 2007) | 2 lines --- site_ansto/instrument/hipd/config/Makefile | 4 +--- .../instrument/hipd/config/nexus/Makefile | 17 +---------------- site_ansto/instrument/hrpd/config/Makefile | 4 +--- .../instrument/hrpd/config/nexus/Makefile | 17 +---------------- .../instrument/reflectometer/config/Makefile | 2 -- .../reflectometer/config/nexus/Makefile | 17 +---------------- site_ansto/instrument/sans/config/Makefile | 2 -- .../instrument/sans/config/nexus/Makefile | 17 +---------------- 8 files changed, 6 insertions(+), 74 deletions(-) diff --git a/site_ansto/instrument/hipd/config/Makefile b/site_ansto/instrument/hipd/config/Makefile index e4b249df..ec4f351c 100644 --- a/site_ansto/instrument/hipd/config/Makefile +++ b/site_ansto/instrument/hipd/config/Makefile @@ -1,6 +1,4 @@ -all: - make -C nexus +all: clean: - make -C nexus clean diff --git a/site_ansto/instrument/hipd/config/nexus/Makefile b/site_ansto/instrument/hipd/config/nexus/Makefile index f4962064..7af3113c 100644 --- a/site_ansto/instrument/hipd/config/nexus/Makefile +++ b/site_ansto/instrument/hipd/config/nexus/Makefile @@ -1,18 +1,3 @@ -BMON_COMMON=nexus_in_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic -HMM_COMMON=nexus_in_common_1.dic nexus_in_hmm_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic - -all: nexus_bmonscan.dic nexus_hmscan.dic - rm -f $(BMON_COMMON) $(HMM_COMMON) - -%.dic: - cp ../../../config/nexus/$@ . - -nexus_bmonscan.dic: $(BMON_COMMON) nexus_in_motors.dic - cat $^ > $@ - -nexus_hmscan.dic: $(HMM_COMMON) nexus_in_motors.dic - cat $^ > $@ +all: clean: - rm nexus_bmonscan.dic nexus_hmscan.dic - diff --git a/site_ansto/instrument/hrpd/config/Makefile b/site_ansto/instrument/hrpd/config/Makefile index e4b249df..ec4f351c 100644 --- a/site_ansto/instrument/hrpd/config/Makefile +++ b/site_ansto/instrument/hrpd/config/Makefile @@ -1,6 +1,4 @@ -all: - make -C nexus +all: clean: - make -C nexus clean diff --git a/site_ansto/instrument/hrpd/config/nexus/Makefile b/site_ansto/instrument/hrpd/config/nexus/Makefile index f4962064..7af3113c 100644 --- a/site_ansto/instrument/hrpd/config/nexus/Makefile +++ b/site_ansto/instrument/hrpd/config/nexus/Makefile @@ -1,18 +1,3 @@ -BMON_COMMON=nexus_in_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic -HMM_COMMON=nexus_in_common_1.dic nexus_in_hmm_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic - -all: nexus_bmonscan.dic nexus_hmscan.dic - rm -f $(BMON_COMMON) $(HMM_COMMON) - -%.dic: - cp ../../../config/nexus/$@ . - -nexus_bmonscan.dic: $(BMON_COMMON) nexus_in_motors.dic - cat $^ > $@ - -nexus_hmscan.dic: $(HMM_COMMON) nexus_in_motors.dic - cat $^ > $@ +all: clean: - rm nexus_bmonscan.dic nexus_hmscan.dic - diff --git a/site_ansto/instrument/reflectometer/config/Makefile b/site_ansto/instrument/reflectometer/config/Makefile index e4b249df..b711f394 100644 --- a/site_ansto/instrument/reflectometer/config/Makefile +++ b/site_ansto/instrument/reflectometer/config/Makefile @@ -1,6 +1,4 @@ all: - make -C nexus clean: - make -C nexus clean diff --git a/site_ansto/instrument/reflectometer/config/nexus/Makefile b/site_ansto/instrument/reflectometer/config/nexus/Makefile index f4962064..7af3113c 100644 --- a/site_ansto/instrument/reflectometer/config/nexus/Makefile +++ b/site_ansto/instrument/reflectometer/config/nexus/Makefile @@ -1,18 +1,3 @@ -BMON_COMMON=nexus_in_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic -HMM_COMMON=nexus_in_common_1.dic nexus_in_hmm_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic - -all: nexus_bmonscan.dic nexus_hmscan.dic - rm -f $(BMON_COMMON) $(HMM_COMMON) - -%.dic: - cp ../../../config/nexus/$@ . - -nexus_bmonscan.dic: $(BMON_COMMON) nexus_in_motors.dic - cat $^ > $@ - -nexus_hmscan.dic: $(HMM_COMMON) nexus_in_motors.dic - cat $^ > $@ +all: clean: - rm nexus_bmonscan.dic nexus_hmscan.dic - diff --git a/site_ansto/instrument/sans/config/Makefile b/site_ansto/instrument/sans/config/Makefile index e4b249df..b711f394 100644 --- a/site_ansto/instrument/sans/config/Makefile +++ b/site_ansto/instrument/sans/config/Makefile @@ -1,6 +1,4 @@ all: - make -C nexus clean: - make -C nexus clean diff --git a/site_ansto/instrument/sans/config/nexus/Makefile b/site_ansto/instrument/sans/config/nexus/Makefile index f4962064..7af3113c 100644 --- a/site_ansto/instrument/sans/config/nexus/Makefile +++ b/site_ansto/instrument/sans/config/nexus/Makefile @@ -1,18 +1,3 @@ -BMON_COMMON=nexus_in_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic -HMM_COMMON=nexus_in_common_1.dic nexus_in_hmm_common_1.dic nexus_in_bmon_common_1.dic nexus_in_scan_common_1.dic - -all: nexus_bmonscan.dic nexus_hmscan.dic - rm -f $(BMON_COMMON) $(HMM_COMMON) - -%.dic: - cp ../../../config/nexus/$@ . - -nexus_bmonscan.dic: $(BMON_COMMON) nexus_in_motors.dic - cat $^ > $@ - -nexus_hmscan.dic: $(HMM_COMMON) nexus_in_motors.dic - cat $^ > $@ +all: clean: - rm nexus_bmonscan.dic nexus_hmscan.dic -