diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-14 02:09:19 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-14 02:10:27 -0700 |
| commit | f44e72db13c0e9b60d2050093e1d843f77ecee3f (patch) | |
| tree | 4f1f13d2e886f4e086cc65b8934dc178b7f1604f /crawl-ref/source/makefile | |
| parent | 36bef24e69c49ff8426cc75cf9af738cdd618fd6 (diff) | |
| download | crawl-ref-f44e72db13c0e9b60d2050093e1d843f77ecee3f.tar.gz crawl-ref-f44e72db13c0e9b60d2050093e1d843f77ecee3f.zip | |
makefiles: 'clean'/'distclean' now do RM on all intermediates at once
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 81c1b9accb..a6246b1b0a 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -39,10 +39,11 @@ CFWARN := -Wall AR = ar rcu CC = $(GCC) CXX = $(GXX) -DELETE = rm -f +RM = rm -f COPY = cp export AR +export RM export CC export CXX export CFLAGS @@ -644,8 +645,7 @@ endif clean: +$(MAKE) -C $(UTIL) clean - $(DELETE) *.o - $(DELETE) *.ixx + $(RM) *.o *.ixx clean-lua: +$(MAKE) -C $(LUASRC) clean @@ -654,15 +654,7 @@ clean-sql: +$(MAKE) -C $(SQLSRC) clean distclean: clean clean-lua clean-sql clean-rltiles - $(DELETE) bones.* - $(DELETE) morgue.txt - $(DELETE) scores - $(DELETE) $(GAME) - $(DELETE) *.sav - $(DELETE) core - $(DELETE) *.0* - $(DELETE) *.lab - $(DELETE) $(DEPENDENCY_MKF) + $(RM) bones.* morgue.txt scores $(GAME) *.sav core *.0* *.lab $(DEPENDENCY_MKF) $(GAME): $(GAME_DEPENDS) $(QUIET_LINK)$(CXX) $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIB) @@ -746,11 +738,11 @@ package-source: distclean prebuildyacc pkgtidy depend removeold vlink \ pkgtarbz2 pkgzip pkgtidy: - $(DELETE) $(PKG_TIDY_LIST) + $(RM) $(PKG_TIDY_LIST) removeold: - if [ -f ../../$(SRC_PKG_TAR) ]; then $(DELETE) ../../$(SRC_PKG_TAR); fi - if [ -f ../../$(SRC_PKG_ZIP) ]; then $(DELETE) ../../$(SRC_PKG_ZIP); fi + if [ -f ../../$(SRC_PKG_TAR) ]; then $(RM) ../../$(SRC_PKG_TAR); fi + if [ -f ../../$(SRC_PKG_ZIP) ]; then $(RM) ../../$(SRC_PKG_ZIP); fi # [ds] Existing directory names could produce a bad package! vlink: |