From 7282f2e5fe7cf1649a562f3af6a287e2d9261be9 Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Sun, 19 Feb 2017 12:22:57 -0800 Subject: [PATCH] Makefile: Make sure all built files are removed in `make clean`. --- graphics/text/Makefile | 10 ++++++---- graphics/titlepic/Makefile | 3 ++- lumps/dmxgus/Makefile | 2 +- lumps/genmidi/Makefile | 2 +- lumps/playpal/Makefile | 3 +-- lumps/textures/Makefile | 4 +++- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/graphics/text/Makefile b/graphics/text/Makefile index 28662a93..627f9b04 100644 --- a/graphics/text/Makefile +++ b/graphics/text/Makefile @@ -171,8 +171,10 @@ wivctms.gif: cp $@ ../ clean: - rm -f $(TEXTGEN_GRAPHICS) helpbg.png help.gif \ - helptext.png helptext2.png graphics.stamp *.pyc \ - credtext.png credtext2.png credit.gif \ - dmwilv*.gif wikilrs.gif wivctms.gif wikilrs_horiz.png + rm -f $(TEXTGEN_GRAPHICS) helpbg.png help.gif helptext.png \ + helptext2.png graphics.stamp *.pyc credtext.png \ + credtext2.png credit.gif dmwilv*.gif wikilrs.gif \ + wivctms.gif wikilrs_horiz.png ../credit.gif ../help.gif \ + ../wikilrs.gif ../wivctms.gif + for graphic in $(TEXTGEN_GRAPHICS); do rm -f ../$$graphic; done rm -fr __pycache__ diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile index 036df75c..bb03f6e4 100644 --- a/graphics/titlepic/Makefile +++ b/graphics/titlepic/Makefile @@ -19,6 +19,7 @@ fdmtitle.gif: ../captainw/fdmtitle.gif cp $@ ../ clean: - rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif + rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif \ + ../fd1title.gif ../fd2title.gif ../fdmtitle.gif .PHONY: clean diff --git a/lumps/dmxgus/Makefile b/lumps/dmxgus/Makefile index 8bb28c85..69807499 100644 --- a/lumps/dmxgus/Makefile +++ b/lumps/dmxgus/Makefile @@ -3,5 +3,5 @@ ultramid.ini : gen-ultramid config.py stats.py cp $@ ../dmxgus.lmp clean: - rm -f ultramid.ini *.pyc + rm -f ultramid.ini ../dmxgus.lmp *.pyc rm -fr __pycache__ diff --git a/lumps/genmidi/Makefile b/lumps/genmidi/Makefile index 7ce173ac..0954f1aa 100644 --- a/lumps/genmidi/Makefile +++ b/lumps/genmidi/Makefile @@ -3,5 +3,5 @@ genmidi.lmp: config.py instruments/* cp $@ ../ clean: - rm -f genmidi.lmp *.pyc + rm -f genmidi.lmp ../genmidi.lmp *.pyc rm -fr __pycache__ diff --git a/lumps/playpal/Makefile b/lumps/playpal/Makefile index e1ec075b..999f057a 100644 --- a/lumps/playpal/Makefile +++ b/lumps/playpal/Makefile @@ -3,7 +3,6 @@ playpal.lmp: playpal-base.lmp playpal.py cp playpal.lmp ../ clean: - rm -f playpal.lmp + rm -f playpal.lmp ../playpal.lmp .PHONY: clean - diff --git a/lumps/textures/Makefile b/lumps/textures/Makefile index e6d18712..b4ccd4d4 100644 --- a/lumps/textures/Makefile +++ b/lumps/textures/Makefile @@ -42,4 +42,6 @@ clean: phase1/texture2.lmp \ phase1/pnames.lmp phase2/pnames.lmp freedm/pnames.lmp \ phase1/pnames.txt phase2/pnames.txt freedm/pnames.txt - + rm -f ../fd1txtr1.lmp ../fd1txtr2.lmp ../fd1pname.lmp \ + ../fd2txtr1.lmp ../fd2pname.lmp \ + ../fdmtxtr1.lmp ../fdmpname.lmp