This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git.
The branch, master has been updated via 0de5472415c0c4e5031b1dfbd0bc3bdb995fb334 (commit) from 3062e03a9503f1b624fc80fc91b76b129646cf01 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/0de5472415c0c4e5031b1dfbd0bc3bdb995fb...
commit 0de5472415c0c4e5031b1dfbd0bc3bdb995fb334 Author: Cyril Hrubis metan@ucw.cz Date: Wed Jul 10 21:02:22 2013 +0200
build: Make distclean remove possible leftovers.
The build system, as it is, removes only files it knows about in make clean, which can break build when you pull from git and some files were moved or deleted. Then the object files and dep files for these files will stay possibly breaking the build.
This commit makes the distclean target remove all files that looks like they were generated, i.e. *.o *.dep *.gen.h and *.gen.c.
Reported-by: Milan Vancura milan@ucw.cz Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/Makefile b/Makefile index a2b327d..33cc33c 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,14 @@ tests: build pylib: build demos: build
+GENFILES=config.h config.gen.mk gfxprim-config + distclean: ifdef VERBOSE - rm config.h config.gen.mk - $(MAKE) clean + rm $(GENFILES) else - @$(MAKE) clean - @rm config.h config.gen.mk + @echo "RM $(GENFILES)" + @rm $(GENFILES) endif
HEADER_LOC=/usr/include/ diff --git a/build/Makefile b/build/Makefile index d4a8b5d..d21da7a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -15,6 +15,8 @@ all: $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS)
rebuild: all
+distclean: clean + clean: ifdef VERBOSE rm -rf $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS) diff --git a/post.mk b/post.mk index c217f97..0b9fc90 100644 --- a/post.mk +++ b/post.mk @@ -9,21 +9,25 @@ endif
all: $(SUBDIRS) clean: $(SUBDIRS) +distclean: $(SUBDIRS) rebuild: $(SUBDIRS) install: $(SUBDIRS)
help: - @echo "*** Available targets ***" + @echo "*** Available targets ***" @echo "" - @echo "help: prints this help" + @echo "help: prints this help" @echo "" - @echo "doc: builds (only) the documentation" + @echo "doc: builds (only) the documentation" @echo "" - @echo "clean: cleans current directory and all subdirectories" + @echo "clean: cleans current directory and all subdirectories" @echo "" - @echo "all: make current directory and all subdirectories" + @echo "distclean: cleans all generated files including possible" + @echo " leftovers caused by deleted files" @echo "" - @echo "rebuild: does clean and all" + @echo "all: make current directory and all subdirectories" + @echo "" + @echo "rebuild: does clean and all" @echo "" @echo "The default silent output could be turned off by defining" @echo "'VERBOSE' shell variable as 'VERBOSE=1 make'" @@ -109,6 +113,13 @@ else endif
ifdef CLEAN + +ifeq ($(MAKECMDGOALS),distclean) +CLEAN+=*.o *.dep *.gen.c *.gen.h +endif + +distclean: clean + clean: ifdef VERBOSE rm -f $(CLEAN)
-----------------------------------------------------------------------
Summary of changes: Makefile | 9 +++++---- build/Makefile | 2 ++ post.mk | 23 +++++++++++++++++------ 3 files changed, 24 insertions(+), 10 deletions(-)
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply.