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 0d714fd8292c2805d3cdc23d89345d41c9f23815 (commit) from 65cea9aefed176553293e6d5b18ad5eb24b9b704 (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/0d714fd8292c2805d3cdc23d89345d41c9f23...
commit 0d714fd8292c2805d3cdc23d89345d41c9f23815 Author: Cyril Hrubis metan@ucw.cz Date: Wed Dec 26 17:15:04 2012 +0100
build: Fix the parallel build.
diff --git a/Makefile b/Makefile index 7c5480f..3da6589 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,10 @@ TOPDIR=. + +include $(TOPDIR)/pre.mk + +TOP_MAKE=1 + SUBDIRS=include libs tests pylib demos build -include post.mk
libs: include build: libs @@ -30,3 +34,5 @@ endif tar: $(MAKE) clean cd .. && tar cf gfxprim-`date +%Y-%b-%d-%HH%MM`.tar gfxprim + +include $(TOPDIR)/post.mk diff --git a/app.mk b/app.mk index c5aef12..77bd5e7 100644 --- a/app.mk +++ b/app.mk @@ -7,6 +7,6 @@ CLEAN+=$(APPS) ifdef VERBOSE $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group -o $@ else - @echo "LD $@" + @echo "LD $@" @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group -o $@ endif diff --git a/build/Makefile b/build/Makefile index 59afb71..2c1aa01 100644 --- a/build/Makefile +++ b/build/Makefile @@ -12,38 +12,32 @@ clean: ifdef VERBOSE rm -rf libGP.a libGP.so libGP.so.0 .lock else - @echo "RM libGP.a libGP.so libGP.so.0 .lock" + @echo "RM libGP.a libGP.so libGP.so.0 .lock" @rm -rf libGP.a libGP.so libGP.so.0 .lock endif
libGP.a: - @. ./liblock.sh; spinlock . ifdef VERBOSE $(AR) rcs libGP.a $(LIB_OBJECTS) else - @echo "AR libGP.a" + @echo "AR libGP.a" @$(AR) rcs libGP.a $(LIB_OBJECTS) endif - @. ./liblock.sh; spinunlock .
libGP.so: - @. ./liblock.sh; spinlock . ifdef VERBOSE $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so else - @echo "LD libGP.so" + @echo "LD libGP.so" @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so endif - @. ./liblock.sh; spinunlock .
libGP.so.0: libGP.so - @. ./liblock.sh; spinlock . ifdef VERBOSE rm -f libGP.so.0 ln -s libGP.so libGP.so.0 else - @echo "LN libGP.so.0" + @echo "LN libGP.so.0" @rm -f libGP.so.0 @ln -s libGP.so libGP.so.0 endif - @. ./liblock.sh; spinunlock . diff --git a/build/liblock.sh b/build/liblock.sh deleted file mode 100644 index 2af11e4..0000000 --- a/build/liblock.sh +++ /dev/null @@ -1,25 +0,0 @@ -# -# Takes directory as parameter -# -spinlock() -{ - I=0 - #echo -n "Trying to acquire lock in '$1' ." - while ! `mkdir "$1/.lock" &> /dev/null`; do - sleep 1; - ((I=I+1)) - echo $I - if [ $I -gt 10 ]; then - echo "Failed to acquire lock '`pwd`/.lock'" - exit 1 - fi - # echo -n . - done - #echo " done" -} - -spinunlock() -{ - #echo "Removing lock in '$1'" - rmdir "$1/.lock" &> /dev/null -} diff --git a/lib.mk b/lib.mk index d9a6f0b..98a7e5a 100644 --- a/lib.mk +++ b/lib.mk @@ -29,7 +29,7 @@ ifdef VERBOSE else @rm -f $(LIBP)$(LIB).so.0 @cd $(LIBP) && ln -s $(LIB).so $(LIB).so.0 - @echo "LD $@" + @echo "LD $@" @$(CC) -fPIC --shared -Wl,-soname -Wl,$(LIB).so.0 $(OBJECTS) -o $@ endif
@@ -37,7 +37,7 @@ $(LIBP)$(LIB).a: $(OBJS) ifdef VERBOSE $(AR) rcs $@ $(OBJECTS) else - @echo "AR $@" + @echo "AR $@" @$(AR) rcs $@ $(OBJECTS) endif
@@ -45,7 +45,7 @@ else # BUILDLIB = no include $(TOPDIR)/config.mk
-ifeq ($(REBUILD_LIBGP),yes) +ifndef TOP_MAKE ALL+=rebuild_lib
rebuild_lib: diff --git a/libs/backends/Makefile b/libs/backends/Makefile index e59e2c1..39ea7d2 100644 --- a/libs/backends/Makefile +++ b/libs/backends/Makefile @@ -1,8 +1,9 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk + CSOURCES=$(shell ls *.c) LIBNAME=backends BUILDLIB=yes
-include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk diff --git a/libs/core/Makefile b/libs/core/Makefile index 65d8440..cd08e30 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -1,10 +1,11 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk + GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c GP_GammaCorrection.gen.c CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core
-include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk diff --git a/libs/filters/Makefile b/libs/filters/Makefile index cedc55a..1773151 100644 --- a/libs/filters/Makefile +++ b/libs/filters/Makefile @@ -1,4 +1,5 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk
STATS_FILTERS=GP_Histogram.gen.c
@@ -17,7 +18,6 @@ CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=filters INCLUDE=core
-include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk diff --git a/libs/gfx/Makefile b/libs/gfx/Makefile index e46a8ef..4511495 100644 --- a/libs/gfx/Makefile +++ b/libs/gfx/Makefile @@ -1,10 +1,11 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk + CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) GENSOURCES=GP_Line.gen.c GP_HLine.gen.c GP_LineAA.gen.c GP_PutPixelAA.gen.c GP_HLineAA.gen.c GP_VLineAA.gen.c GP_FillCircle.gen.c GP_VLine.gen.c LIBNAME=gfx
-include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk diff --git a/libs/grabbers/Makefile b/libs/grabbers/Makefile index 4df5769..919a0ef 100644 --- a/libs/grabbers/Makefile +++ b/libs/grabbers/Makefile @@ -1,8 +1,9 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk + CSOURCES=$(shell ls *.c) LIBNAME=grabbers BUILDLIB=yes
-include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk diff --git a/libs/input/Makefile b/libs/input/Makefile index 4896a22..5d58e4c 100644 --- a/libs/input/Makefile +++ b/libs/input/Makefile @@ -1,8 +1,9 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk + CSOURCES=$(shell ls *.c) INCLUDE=core LIBNAME=input
-include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk diff --git a/libs/loaders/Makefile b/libs/loaders/Makefile index 0adfcfb..076b940 100644 --- a/libs/loaders/Makefile +++ b/libs/loaders/Makefile @@ -1,8 +1,9 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk + CSOURCES=$(shell ls *.c) INCLUDE=core LIBNAME=loaders
-include $(TOPDIR)/pre.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk diff --git a/post.mk b/post.mk index 84ef703..881a42f 100644 --- a/post.mk +++ b/post.mk @@ -82,10 +82,10 @@ endif # $(SUBDIRS): ifdef VERBOSE - $(MAKE) -C $@ $(MAKECMDGOALS) + $(MAKE) -C $@ $(MAKECMDGOALS) TOP_MAKE=$(TOP_MAKE) else - @export CURSUBDIR="$$CURSUBDIR/$@" && echo "DIR $$CURSUBDIR" &&- $(MAKE) --no-print-directory -C $@ $(MAKECMDGOALS) + @export CURSUBDIR="$$CURSUBDIR/$@" && echo "DIR $$CURSUBDIR" &&+ $(MAKE) --no-print-directory -C $@ $(MAKECMDGOALS) TOP_MAKE=$(TOP_MAKE) endif
# @@ -95,7 +95,7 @@ $(DEPFILES): %.dep: %.c ifdef VERBOSE $(CC) -MM $(CFLAGS) $< -o $@ else - @echo "DEP -I(include $(INCLUDE)) $@" + @echo "DEP -I(include $(INCLUDE)) $@" @$(CC) -MM $(CFLAGS) $< -o $@ endif
@@ -103,7 +103,7 @@ $(OBJECTS): %.o: %.c ifdef VERBOSE $(CC) $(CFLAGS) -c $< -o $@ else - @echo "CC -I(include $(INCLUDE)) $@" + @echo "CC -I(include $(INCLUDE)) $@" @$(CC) $(CFLAGS) -c $< -o $@ endif
@@ -112,7 +112,7 @@ clean: ifdef VERBOSE rm -f $(CLEAN) else - @echo "RM $(CLEAN)" + @echo "RM $(CLEAN)" @rm -f $(CLEAN) endif endif diff --git a/pywrap.mk b/pywrap.mk index 2b527b8..f41ce63 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -29,7 +29,7 @@ $(SWIG_LIB): $(SWIG_C) ifdef VERBOSE $(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ else # VERBOSE - @echo "LD $@" + @echo "LD $@" @$(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ endif # VERBOSE
-----------------------------------------------------------------------
Summary of changes: Makefile | 8 +++++++- app.mk | 2 +- build/Makefile | 14 ++++---------- build/liblock.sh | 25 ------------------------- lib.mk | 6 +++--- libs/backends/Makefile | 3 ++- libs/core/Makefile | 3 ++- libs/filters/Makefile | 2 +- libs/gfx/Makefile | 3 ++- libs/grabbers/Makefile | 3 ++- libs/input/Makefile | 3 ++- libs/loaders/Makefile | 3 ++- post.mk | 12 ++++++------ pywrap.mk | 2 +- 14 files changed, 35 insertions(+), 54 deletions(-) delete mode 100644 build/liblock.sh
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.