From 52f530bf066db12cd75afd753158bf7603e42554 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Mon, 7 Nov 2016 01:00:56 -0600 Subject: [PATCH] Remove mv commands, use -o to select output location --- TESTING/EIG/Makefile | 16 ++++++++-------- TESTING/LIN/Makefile | 50 ++++++++++---------------------------------------- 2 files changed, 18 insertions(+), 48 deletions(-) diff --git a/TESTING/EIG/Makefile b/TESTING/EIG/Makefile index 20f5478..d819e49 100644 --- a/TESTING/EIG/Makefile +++ b/TESTING/EIG/Makefile @@ -127,24 +127,24 @@ double: ../xeigtstd complex16: ../xeigtstz ../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB) - $(LOADER) $(LOADOPTS) -o xeigtsts \ + $(LOADER) $(LOADOPTS) -o $@ \ $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \ - ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtsts $@ + ../../$(LAPACKLIB) $(BLASLIB) ../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB) - $(LOADER) $(LOADOPTS) -o xeigtstc \ + $(LOADER) $(LOADOPTS) -o $@ \ $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \ - ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstc $@ + ../../$(LAPACKLIB) $(BLASLIB) ../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB) - $(LOADER) $(LOADOPTS) -o xeigtstd \ + $(LOADER) $(LOADOPTS) -o $@ \ $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \ - ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstd $@ + ../../$(LAPACKLIB) $(BLASLIB) ../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB) - $(LOADER) $(LOADOPTS) -o xeigtstz \ + $(LOADER) $(LOADOPTS) -o $@ \ $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \ - ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstz $@ + ../../$(LAPACKLIB) $(BLASLIB) $(AEIGTST): $(FRC) $(SCIGTST): $(FRC) diff --git a/TESTING/LIN/Makefile b/TESTING/LIN/Makefile index af60759..32bbaba 100644 --- a/TESTING/LIN/Makefile +++ b/TESTING/LIN/Makefile @@ -252,76 +252,46 @@ proto-double: ../xlintstds ../xlintstrfd proto-complex: ../xlintstrfc proto-complex16: ../xlintstzc ../xlintstrfz -xlintsts: $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB) +../xlintsts: $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(ALINTST) $(SCLNTST) $(SLINTST) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -xlintstc: $(ALINTST) $(CLINTST) $(SCLNTST) ../../$(LAPACKLIB) +../xlintstc: $(ALINTST) $(CLINTST) $(SCLNTST) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(ALINTST) $(SCLNTST) $(CLINTST) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -xlintstd: $(ALINTST) $(DLINTST) $(DZLNTST) ../../$(LAPACKLIB) +../xlintstd: $(ALINTST) $(DLINTST) $(DZLNTST) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $^ \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -xlintstz: $(ALINTST) $(ZLINTST) $(DZLNTST) ../../$(LAPACKLIB) +../xlintstz: $(ALINTST) $(ZLINTST) $(DZLNTST) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(ALINTST) $(DZLNTST) $(ZLINTST) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -xlintstds: $(DSLINTST) ../../$(LAPACKLIB) +../xlintstds: $(DSLINTST) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(DSLINTST) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -xlintstzc: $(ZCLINTST) ../../$(LAPACKLIB) +../xlintstzc: $(ZCLINTST) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(ZCLINTST) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -xlintstrfs: $(SLINTSTRFP) ../../$(LAPACKLIB) +../xlintstrfs: $(SLINTSTRFP) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(SLINTSTRFP) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -xlintstrfd: $(DLINTSTRFP) ../../$(LAPACKLIB) +../xlintstrfd: $(DLINTSTRFP) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(DLINTSTRFP) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -xlintstrfc: $(CLINTSTRFP) ../../$(LAPACKLIB) +../xlintstrfc: $(CLINTSTRFP) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(CLINTSTRFP) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -xlintstrfz: $(ZLINTSTRFP) ../../$(LAPACKLIB) +../xlintstrfz: $(ZLINTSTRFP) ../../$(LAPACKLIB) $(LOADER) $(LOADOPTS) -o $@ $(ZLINTSTRFP) \ ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -../xlintsts: xlintsts - mv xlintsts $@ - -../xlintstc: xlintstc - mv xlintstc $@ - -../xlintstz: xlintstz - mv xlintstz $@ - -../xlintstd: xlintstd - mv xlintstd $@ - -../xlintstds: xlintstds - mv xlintstds $@ - -../xlintstzc: xlintstzc - mv xlintstzc $@ - -../xlintstrfs: xlintstrfs - mv xlintstrfs $@ - -../xlintstrfc: xlintstrfc - mv xlintstrfc $@ - -../xlintstrfd: xlintstrfd - mv xlintstrfd $@ - -../xlintstrfz: xlintstrfz - mv xlintstrfz $@ - $(ALINTST): $(FRC) $(SCLNTST): $(FRC) $(DZLNTST): $(FRC) -- 2.7.4