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/util | |
| 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/util')
| -rw-r--r-- | crawl-ref/source/util/Makefile | 7 | ||||
| -rw-r--r-- | crawl-ref/source/util/lua/src/Makefile | 4 | ||||
| -rw-r--r-- | crawl-ref/source/util/sqlite/Makefile | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/crawl-ref/source/util/Makefile b/crawl-ref/source/util/Makefile index 2e61683b21..d138a640ce 100644 --- a/crawl-ref/source/util/Makefile +++ b/crawl-ref/source/util/Makefile @@ -1,5 +1,6 @@ YACC := bison -y -LEX := flex +LEX := flex +RM ?= rm -f ifneq ($(findstring $(MAKEFLAGS),s),s) ifndef V @@ -12,9 +13,7 @@ endif all: levcomp.tab.cc levcomp.lex.cc clean: - rm -f levcomp.tab.cc levcomp.tab.h - rm -f levcomp.lex.cc - rm -f *.o + $(RM) levcomp.tab.cc levcomp.tab.h levcomp.lex.cc *.o %.tab.cc: %.tab.c @mv $< $@ diff --git a/crawl-ref/source/util/lua/src/Makefile b/crawl-ref/source/util/lua/src/Makefile index c67263f4f9..7e9cd10f2f 100644 --- a/crawl-ref/source/util/lua/src/Makefile +++ b/crawl-ref/source/util/lua/src/Makefile @@ -20,9 +20,9 @@ endif CC ?= gcc CFLAGS ?= -O2 -Wall -AR = ar rcu +AR ?= ar rcu RANLIB = ranlib -RM = rm -f +RM ?= rm -f LIBS = -lm $(MYLIBS) MYCFLAGS= diff --git a/crawl-ref/source/util/sqlite/Makefile b/crawl-ref/source/util/sqlite/Makefile index b4f71dcfc9..6eb8c70a3a 100644 --- a/crawl-ref/source/util/sqlite/Makefile +++ b/crawl-ref/source/util/sqlite/Makefile @@ -9,10 +9,10 @@ endif endif LIBSQL = libsqlite3.a -AR = ar rcu +AR ?= ar rcu CC ?= gcc RANLIB = ranlib -RM_F = rm -f +RM ?= rm -f # Omit SQLite features we don't need. CFLAGS ?= -O2 @@ -38,8 +38,7 @@ CFLAGS +=-DSQLITE_OMIT_AUTHORIZATION \ all: $(LIBSQL) clean: - $(RM_F) *.o - $(RM_F) *.a + $(RM) *.o *.a $(LIBSQL): sqlite3.o $(QUIET_AR)$(AR) $@ $^ |