Skip to content

Commit

Permalink
top level Makefile now just a proxy. Doing make clean inside src now …
Browse files Browse the repository at this point in the history
…does a full clean including deps, not just Redis source. Thanks to Pieter for the top level Makefile proxy trick.
  • Loading branch information
antirez committed Jul 13, 2011
1 parent 5cb4850 commit 319bb48
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 20 deletions.
22 changes: 2 additions & 20 deletions Makefile
@@ -1,25 +1,7 @@
# Top level makefile, the real shit is at src/Makefile

TARGETS=32bit noopt test
default: all

all:
.DEFAULT:
cd src && $(MAKE) $@

install: dummy
cd src && $(MAKE) $@

clean:
cd src && $(MAKE) $@
cd deps/hiredis && $(MAKE) $@
cd deps/linenoise && $(MAKE) $@
cd deps/jemalloc && $(MAKE) distclean
cd deps/lua && $(MAKE) $@
-(cd deps/jemalloc && $(MAKE) distclean)

$(TARGETS):
cd src && $(MAKE) $@

src/help.h:
@./utils/generate-command-help.rb > $@

dummy:
7 changes: 7 additions & 0 deletions src/Makefile
Expand Up @@ -198,6 +198,10 @@ redis-check-aof: $(CHECKAOFOBJ)

clean:
rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov
cd ../deps/hiredis && $(MAKE) $@
cd ../deps/linenoise && $(MAKE) $@
cd ../deps/lua && $(MAKE) $@
-(cd ../deps/jemalloc && $(MAKE) distclean)

dep:
$(CC) -MM *.c -I ../deps/hiredis -I ../deps/linenoise
Expand Down Expand Up @@ -229,6 +233,9 @@ noopt:
32bitgprof:
$(MAKE) PROF="-pg" ARCH="-arch i386"

src/help.h:
@../utils/generate-command-help.rb > help.h

install: all
mkdir -p $(INSTALL_BIN)
$(INSTALL) $(PRGNAME) $(INSTALL_BIN)
Expand Down

0 comments on commit 319bb48

Please sign in to comment.