Merge pull request #1483 from MartinNowak/fix15224

fix Issue 15224 - making 'clean' results in garbage commands
dlang · Mar 9, 2016 · 236c43b · 236c43b
2 parents a8e5db2 + 4e8c349
commit 236c43b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/test/common.mak b/test/common.mak
@@ -11,7 +11,8 @@ TIMELIMIT:=
 LDL:=$(subst -L,,$(LINKDL)) # -ldl
 
 SRC:=src
-ROOT:=./generated/$(OS)/$(BUILD)/$(MODEL)
+GENERATED:=./generated
+ROOT:=$(GENERATED)/$(OS)/$(BUILD)/$(MODEL)
 
 ifneq (default,$(MODEL))
 	MODEL_FLAG:=-m$(MODEL)

diff --git a/test/coverage/Makefile b/test/coverage/Makefile
@@ -39,4 +39,4 @@ $(ROOT)/%: $(SRC)/%.d
 	$(QUIET)$(DMD) $(DFLAGS) -of$(ROOT)/$* $^
 
 clean:
-	rm -rf $(ROOT) *.lst
+	rm -rf $(GENERATED) *.lst
diff --git a/test/exceptions/Makefile b/test/exceptions/Makefile
@@ -35,4 +35,4 @@ $(ROOT)/%: $(SRC)/%.d
 	$(QUIET)$(DMD) $(DFLAGS) -of$@ $<
 
 clean:
-	rm -rf $(ROOT)
+	rm -rf $(GENERATED)
diff --git a/test/profile/Makefile b/test/profile/Makefile
@@ -41,4 +41,4 @@ $(ROOT)/%: $(SRC)/%.d
 	$(QUIET)$(DMD) $(DFLAGS) -of$(ROOT)/$* $<
 
 clean:
-	rm -rf $(ROOT) *.log *.def
+	rm -rf $(GENERATED) *.log *.def
diff --git a/test/shared/Makefile b/test/shared/Makefile
@@ -72,4 +72,4 @@ $(ROOT)/%.so: $(SRC)/%.d $(DRUNTIMESO)
 	$(QUIET)$(DMD) -fPIC -shared $(DFLAGS) -of$@ $< $(LINKDL)
 
 clean:
-	rm -rf $(ROOT)
+	rm -rf $(GENERATED)