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 1a72b271726b22e8eb7424a49e8d85084455eaa5 (commit) from 4c3c5c53d86f3703ae383dd8ca9d500836018e91 (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/1a72b271726b22e8eb7424a49e8d85084455e... commit 1a72b271726b22e8eb7424a49e8d85084455eaa5 Author: Cyril Hrubis <metan@ucw.cz> Date: Wed Aug 15 20:22:23 2012 +0200 build: Reorder object files and LDLIBS. This fixes linking failure on Ubuntu. diff --git a/app.mk b/app.mk index 556f9fd..c5aef12 100644 --- a/app.mk +++ b/app.mk @@ -5,8 +5,8 @@ CLEAN+=$(APPS) %: %.o ifdef VERBOSE - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group -o $@ else @echo "LD $@" - @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ + @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group -o $@ endif diff --git a/configure b/configure index 9721a42..0919ff2 100755 --- a/configure +++ b/configure @@ -120,14 +120,14 @@ class libraries: f.write("n") # - # Writes LDFLAGS and CFLAGS into passed file + # Writes LDLIBS and CFLAGS into passed file # def write_config_mk(self, f): for i in self.libraries: f.write("# %s - %sn" % (i[0], i[1])) if self.results[i[0]]: f.write("HAVE_%s=yesn" % i[0].upper()) - f.write("CFLAGS+=%snLDFLAGS+=%sn" % (i[3], i[4])) + f.write("CFLAGS+=%snLDLIBS+=%sn" % (i[3], i[4])) else: f.write("HAVE_%s=non" % i[0].upper()) @@ -228,7 +228,7 @@ if __name__ == '__main__': # Dictionary for default configuration parameters # cfg = {'CC' : ['gcc', 'Path/name of the C compiler'], - 'CFLAGS' : ['-W -Wall -Wextra -fPIC -O2 -ggdb -D_FORTIFY_SOURCE=2', 'C compiler flags'], + 'CFLAGS' : ['-pthread -W -Wall -Wextra -fPIC -O2 -ggdb -D_FORTIFY_SOURCE=2', 'C compiler flags'], 'PYTHON_BIN' : ['python', 'Path/name of python interpreter'], 'SWIG' : ['swig', 'Simplified Wrapper and Interface Generator'], 'include_path': ['/usr/include', 'Path to the system headers']} diff --git a/demos/grinder/Makefile b/demos/grinder/Makefile index 2ea815c..4df5ea8 100644 --- a/demos/grinder/Makefile +++ b/demos/grinder/Makefile @@ -4,7 +4,7 @@ CSOURCES=$(shell echo *.c) INCLUDE=core gfx LDFLAGS+=-L$(TOPDIR)/build/ -LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` +LDLIBS+=$(shell $(TOPDIR)/gfxprim-config --libs --libs-backends) -lrt APPS=grinder ----------------------------------------------------------------------- Summary of changes: app.mk | 4 ++-- configure | 6 +++--- demos/grinder/Makefile | 2 +- 3 files changed, 6 insertions(+), 6 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. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")