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 665128da4ce856b78beece7af486c561a0a84f58 (commit) from ca86f291356ade62df38c8059f7f0eecebfe0991 (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/665128da4ce856b78beece7af486c561a0a84... commit 665128da4ce856b78beece7af486c561a0a84f58 Author: Cyril Hrubis <metan@ucw.cz> Date: Mon May 23 01:41:27 2011 +0200 build: slightly better library linker scripts. diff --git a/Makefile b/Makefile index 6b16da8..35b28d4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,18 @@ TOPDIR=. SUBDIRS=libs tests include include.mk -tests: libs +# +# Make sure tests are build after library and +# rebuild library before entering test just +# to be extra safe. +# +.PHONY: build + +tests: build libs + +build: + @$(MAKE) --no-print-directory -C build clean + @$(MAKE) --no-print-directory -C build clean: ifdef VERBOSE @@ -15,7 +26,7 @@ endif HEADER_LOC=/usr/include/ LIB_LOC=/usr/lib/ -#install: +install: # core library # install -m 775 -d $(HEADER_LOC)GP/ # install -m 664 core/*.h $(HEADER_LOC)GP/ @@ -33,5 +44,5 @@ LIB_LOC=/usr/lib/ # install -m 664 targets/sdl/*.h $(HEADER_LOC)GP/SDL/ # install -m 664 targets/sdl/*.so targets/sdl/*.so.0 targets/sdl/*.a $(LIB_LOC) -tar: clean +tar: cd .. && tar cjf gfxprim-`date +%Y-%b-%d-%HH%MM`.tar.bz2 gfxprim diff --git a/build/Makefile b/build/Makefile index a0fe717..642e852 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,16 +1,6 @@ -all: print libs +LIB_OBJECTS=$(shell ./get_objs.sh) -print: -ifndef VERBOSE - @echo "GEN (linker) libGP.a libGP.so" -endif - -libs: print libGP.a libGP.so - -# -# Do NOT remove this -# -.PHONY: libGP.a libGP.so +all: libGP.a libGP.so clean: ifdef VERBOSE @@ -20,22 +10,22 @@ else @rm -f libGP.a libGP.so endif -libGP.a: +libGP.a: $(LIB_OBJECTS) @. ./liblock.sh; spinlock . ifdef VERBOSE - ./link.sh libGP.a + $(AR) rcs libGP.a $(LIB_OBJECTS) else @echo "AR libGP.a" - @./link.sh libGP.a + @$(AR) rcs libGP.a $(LIB_OBJECTS) endif @. ./liblock.sh; spinunlock . -libGP.so: +libGP.so: $(LIB_OBJECTS) @. ./liblock.sh; spinlock . ifdef VERBOSE - ./link.sh libGP.so + $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so else @echo "LD libGP.so" - @./link.sh libGP.so + @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so endif @. ./liblock.sh; spinunlock . diff --git a/build/get_objs.sh b/build/get_objs.sh new file mode 100755 index 0000000..834fd77 --- /dev/null +++ b/build/get_objs.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +TOPDIR=.. +LIBDIRS="core gfx text loaders filters backends input" + +for i in $LIBDIRS; do + OBJECTS=`echo $TOPDIR/libs/$i/*.o`; + + if [ "$OBJECTS" != "$TOPDIR/libs/$i/*.o" ]; then + echo "$OBJECTS" + fi +done diff --git a/build/link.sh b/build/link.sh deleted file mode 100755 index f13ee9e..0000000 --- a/build/link.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -TOPDIR=.. -LIBDIRS="core gfx text loaders filters backends input" - -get_objects() -{ - for i in $LIBDIRS; do - OBJECTS=`echo $TOPDIR/libs/$i/*.o`; - - if [ "$OBJECTS" != "$TOPDIR/libs/$i/*.o" ]; then - echo "$OBJECTS" - fi - done -} - -if [ "$1" = "libGP.a" ]; then - OBJECTS=`get_objects` - - ar rcs libGP.a $OBJECTS -fi - -if [ "$1" = "libGP.so" ]; then - OBJECTS=`get_objects` - - gcc -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $OBJECTS -o libGP.so -fi diff --git a/tests/Makefile b/tests/Makefile index 676ca51..1008e61 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=loaders filters #core +SUBDIRS=loaders filters core include $(TOPDIR)/include.mk ----------------------------------------------------------------------- Summary of changes: Makefile | 17 ++++++++++++++--- build/Makefile | 26 ++++++++------------------ build/get_objs.sh | 12 ++++++++++++ build/link.sh | 27 --------------------------- tests/Makefile | 2 +- 5 files changed, 35 insertions(+), 49 deletions(-) create mode 100755 build/get_objs.sh delete mode 100755 build/link.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. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")