From e8ec27dd3c68c6d83d1a0698d587b09efc9955ed Mon Sep 17 00:00:00 2001 From: Eugeniy Mikhailov Date: Sat, 14 Jan 2012 21:06:33 -0500 Subject: Makefiles tune up --- xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par | 5 +++-- xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'xmds2/Nlevels_with_doppler_with_z_4wm') diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par index 88bf48d..ad7b0b6 100644 --- a/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par +++ b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par @@ -23,8 +23,7 @@ default: $(CALC_XSIL_FILES) $(CALC_XSIL_FILES): %/data.xsil : % %.params echo processing $$(dirname $(@)) dir - @cd $$(dirname $(@)) ;\ - make -f ../Makefile.pp SCRIPTS_DIR=../ PARAMS_FILE=../$<.params + $(MAKE) -C $$(dirname $(@)) -f ../Makefile.pp SCRIPTS_DIR=../ PARAMS_FILE=../$<.params $(PP_DIR): % : %.params echo need to make dir @@ -68,5 +67,7 @@ $(pdf_targets): %.pdf : %.eps epspdf __tt.eps $@ rm -f __tt.eps #ps2eps -B $< | epspdf $< $@ + + .PRECIOUS: %.run %.xsil %.m .PHONY: all clean diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp index 0778230..2225312 100644 --- a/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp +++ b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp @@ -30,7 +30,7 @@ include $(PARAMS_FILE) all: $(XSIL_FILES) Nlevels_with_doppler_with_z_4wm.xsil $(M_FILES) plot png -Nlevels_with_doppler_with_z_4wm.xsil: ../Nlevels_with_doppler_with_z_4wm.run +Nlevels_with_doppler_with_z_4wm.xsil: ../Nlevels_with_doppler_with_z_4wm.run $(PARAMS_FILE) $< $(PARAMS) | grep "Time elapsed for simulation is:" > exact_analysis_execution_time.txt %.m: %.xsil -- cgit v1.2.3