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 c2d53d78b138cc441a28c025b8899f6d3b80f29e (commit) from 97f2975708403ba5aff97ad8c4c9bad612046342 (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/c2d53d78b138cc441a28c025b8899f6d3b80f... commit c2d53d78b138cc441a28c025b8899f6d3b80f29e Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Nov 27 14:13:36 2011 +0100 build: Fix the gen headers build and paralel build. Now headers are generated first before any other code is compiled so 'make -j3' works correctly. diff --git a/Makefile b/Makefile index 4f303c0..142c98c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TOPDIR=. -SUBDIRS=libs tests pylib demos +SUBDIRS=include libs tests pylib demos include include.mk # @@ -9,7 +9,10 @@ include include.mk # .PHONY: build -tests: build libs +libs: include + +tests: libs +demos: libs build: @$(MAKE) --no-print-directory -C build clean diff --git a/build/Makefile b/build/Makefile index 709dd08..1b39ee3 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,6 +1,7 @@ LIB_OBJECTS=$(shell ./get_objs.sh) all: libGP.a libGP.so libGP.so.0 +.PHONY: libGP.a libGP.so libGP.so.0 clean: ifdef VERBOSE diff --git a/gen.mk b/gen.mk index 41ad5f5..0d4d937 100644 --- a/gen.mk +++ b/gen.mk @@ -27,8 +27,7 @@ CSOURCES+=$(GENSOURCES) # # Make the genrated headers actually build # -all: $(RGENHEADERS) -$(CSOURCES): $(RGENHEADERS) +all: $(GENHEADERS) # # Base common templates location @@ -45,12 +44,12 @@ ALL_GENERATED=$(basename $(ALL_TEMPLATES)) # # And clean them # -CLEAN+=$(GENSOURCES) $(RGENHEADERS) +CLEAN+=$(GENSOURCES) $(GENHEADERS) # # Generated files depend on python generators and the template # -$(GENSOURCES) $(RGENHEADERS): %: %.t $(PYTHON_FILES) +$(GENSOURCES) $(GENHEADERS): %: %.t $(PYTHON_FILES) ifdef VERBOSE ${PYTHON} ${TOPDIR}/pylib/bin/generate_file.py -t $(TEMPLATE_DIR) "$@.t" "$@" else diff --git a/include/Makefile b/include/Makefile new file mode 100644 index 0000000..03277e3 --- /dev/null +++ b/include/Makefile @@ -0,0 +1,3 @@ +TOPDIR=.. +SUBDIRS=core +include $(TOPDIR)/include.mk diff --git a/include/core/Makefile b/include/core/Makefile new file mode 100644 index 0000000..186b6dd --- /dev/null +++ b/include/core/Makefile @@ -0,0 +1,6 @@ +TOPDIR=../.. +GENHEADERS=GP_Convert_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h + GP_GetPutPixel.gen.h GP_Convert.gen.h GP_FnPerBpp.gen.h +LIBNAME=core +include $(TOPDIR)/gen.mk +include $(TOPDIR)/include.mk diff --git a/libs/core/Makefile b/libs/core/Makefile index 3f0fffd..3af4933 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -1,7 +1,5 @@ TOPDIR=../.. GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c -GENHEADERS=GP_Convert_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h - GP_GetPutPixel.gen.h GP_Convert.gen.h GP_FnPerBpp.gen.h CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core ----------------------------------------------------------------------- Summary of changes: Makefile | 7 +++++-- build/Makefile | 1 + gen.mk | 7 +++---- {demos => include}/Makefile | 2 +- include/core/Makefile | 6 ++++++ libs/core/Makefile | 2 -- 6 files changed, 16 insertions(+), 9 deletions(-) copy {demos => include}/Makefile (62%) create mode 100644 include/core/Makefile 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. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")