summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2013-12-04 04:40:02 +0000
committerSimon Howard2013-12-04 04:40:02 +0000
commit3f7cafb370365651c76bba51b7f09110b35d6252 (patch)
treeda7bf2c3d5ea18261a9929e0e54135736e354138
parent31e5261c981d89b2e83191c01e57a252cd94f2ae (diff)
downloadchocolate-doom-3f7cafb370365651c76bba51b7f09110b35d6252.tar.gz
chocolate-doom-3f7cafb370365651c76bba51b7f09110b35d6252.tar.bz2
chocolate-doom-3f7cafb370365651c76bba51b7f09110b35d6252.zip
Fix 'make clean' where some files were not being cleaned (thanks
fabian). Subversion-branch: /branches/v2-branch Subversion-revision: 2756
-rw-r--r--man/Makefile.am3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/setup/Makefile.am2
3 files changed, 7 insertions, 0 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index 204e6c95..899442f6 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -35,6 +35,9 @@ hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic
hexendocs_DATA = INSTALL.hexen CMDLINE.hexen
strifedocs_DATA = INSTALL.strife CMDLINE.strife
+CLEANFILES = $(man_MANS) $(doomdocs_DATA) $(hereticdocs_DATA) \
+ $(hexendocs_DATA) $(strifedocs_DATA)
+
chocolate-doom.6: ../src $(MANPAGE_GEN_FILES)
./docgen -g doom -m doom.template ../src ../src/doom > $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 2ba57fd5..b1a017ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -229,6 +229,8 @@ screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop
@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop
cp doom-screensaver.desktop $@
+CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA)
+
.rc.o:
$(WINDRES) $< -o $@
%.o : %.rc
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index f58c6294..27de0add 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -30,6 +30,8 @@ EXTRA_DIST= \
appdir = $(prefix)/share/applications
app_DATA = @PROGRAM_PREFIX@setup.desktop
+CLEANFILES = $(app_DATA)
+
@PROGRAM_PREFIX@setup.desktop : setup.desktop
cp setup.desktop $@