Gfxprim June 2014

gfxprim@ucw.cz

1 participants
11 discussions

[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc1-86-g13195186
by metan 10 Jun '14

10 Jun '14

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 13195186d44e871af057bda262ddf8467ff8049c (commit) via 22c52a6b72540d2922c0ef48ce4ebf83f21c92e7 (commit) via 29377414caa32964443fdf5e6bd557906f1c763b (commit) via dbe87667ad5796a4294f74f54ad1abf5dd8c90e8 (commit) from 425038462f7fe79ed853487a0ce66ecd927d1c8f (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/13195186d44e871af057bda262ddf8467ff8… commit 13195186d44e871af057bda262ddf8467ff8049c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jun 10 19:11:32 2014 +0200 loaders/GP_IOZlib: Fix compilation without zlib.h Move include <zlib.h> after the #ifdef HAVE_ZLIB guards. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_IOZlib.c b/libs/loaders/GP_IOZlib.c index 21b7fc72..f62c831e 100644 --- a/libs/loaders/GP_IOZlib.c +++ b/libs/loaders/GP_IOZlib.c @@ -22,15 +22,16 @@ #include "../../config.h" -#ifdef HAVE_ZLIB - -#include <zlib.h> #include <errno.h> #include <stdint.h> #include <core/GP_Debug.h> #include <core/GP_Common.h> #include <loaders/GP_IOZlib.h> +#ifdef HAVE_ZLIB + +#include <zlib.h> + #define BUFS 512u struct priv { @@ -255,4 +256,5 @@ int GP_IOZlibReset(GP_IO *io, GP_IO *sub_io, size_t comp_size) errno = ENOSYS; return 1; } + #endif /* HAVE_ZLIB */ http://repo.or.cz/w/gfxprim.git/commit/22c52a6b72540d2922c0ef48ce4ebf83f21c… commit 22c52a6b72540d2922c0ef48ce4ebf83f21c92e7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 8 22:22:31 2014 +0200 gentoo: Add doc use flag for ebuild. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/gentoo/media-libs/gfxprim/Manifest b/gentoo/media-libs/gfxprim/Manifest index 091cf8b2..cac0c246 100644 --- a/gentoo/media-libs/gfxprim/Manifest +++ b/gentoo/media-libs/gfxprim/Manifest @@ -1,4 +1,4 @@ AUX configure-more-compatible-with-autoconf.patch 5335 SHA256 54f7614efee554a3ce8d90835df909a3e66272896018f65c600d0d93c038513e SHA512 6e55396524c0d9ce14f4cde643d8ff09fa04bee8437e64c3701e7e6c833abe902b9abdcf02ea883f29466c10e66836b11cc26755c91594e3a56ea60dd0e6be9b WHIRLPOOL b9f7a9cb54ca5af28dcc8bd1100857b8ddc6c178cd4572977ed6a914fa8ad6f5b8e8addbed2070250bcf9c15c3e28875c80bbe3f0b94f8c98933e275634aff65 DIST gfxprim-1.0.0_rc1.tar.bz2 326144 SHA256 0c543f45fa779a9503944723a7c9c449688e0fd66207f8adcc99cc667eed5582 SHA512 7481006d80d8ffc8302e1bc11e9b19253e37ed562ff465ac4028dcd73c6bfae073bad859204c3d7917d5eaebf38080802ef0463232eb436075addc9bd60af219 WHIRLPOOL 5cdf9008ec41752063556e98238a0cbeb1b3c8d1ef7fe899e632942b5e9d5d19955f4e097146fb385c0829137770463f1b36dd41737550de1bcfe07bdcf9f217 -EBUILD gfxprim-1.0.0_rc1.ebuild 1489 SHA256 ea09af7501316d26ef907c1f37e2329ae422202a57e470634f8a496906130c3f SHA512 d546f7f7fd0088f65993a238f0963c8ca4b5756a5fedbda57517cc49844f7e78b1675749a954e9e62dddd7e70bdb5132f4cd5f1f631b0abe8c3f321e6761576b WHIRLPOOL ac8f36b8bbf0ac71e35621c60cf7f1720d94e5574bcc40f6b20b2bb44f118e9b92571c9111f8fc57d404e95b16050261b67b193e004dbe85467b1de50940d539 -EBUILD gfxprim-9999.ebuild 1489 SHA256 ea09af7501316d26ef907c1f37e2329ae422202a57e470634f8a496906130c3f SHA512 d546f7f7fd0088f65993a238f0963c8ca4b5756a5fedbda57517cc49844f7e78b1675749a954e9e62dddd7e70bdb5132f4cd5f1f631b0abe8c3f321e6761576b WHIRLPOOL ac8f36b8bbf0ac71e35621c60cf7f1720d94e5574bcc40f6b20b2bb44f118e9b92571c9111f8fc57d404e95b16050261b67b193e004dbe85467b1de50940d539 +EBUILD gfxprim-1.0.0_rc1.ebuild 1751 SHA256 d9c39ce74614baff4a752f10511f5de300ba90f1de52f4e622ae6ce318592763 SHA512 860a50e046f5e663558aefe33f83ebf63befc5b8ad26ff7d83a8938d1d2e8d2305f2cf54a622d2de66df313dd80a49204ff703bde4c4c95e999770b3cb5ad49a WHIRLPOOL 427ed83721e48f7faa5ac721652c0c51b04ddf835c13e99a3acd5cbb92590b422b91ef7c4f5c57915543a4e82855286230da33fe90587e78b057f63eaf8a09e8 +EBUILD gfxprim-9999.ebuild 1751 SHA256 d9c39ce74614baff4a752f10511f5de300ba90f1de52f4e622ae6ce318592763 SHA512 860a50e046f5e663558aefe33f83ebf63befc5b8ad26ff7d83a8938d1d2e8d2305f2cf54a622d2de66df313dd80a49204ff703bde4c4c95e999770b3cb5ad49a WHIRLPOOL 427ed83721e48f7faa5ac721652c0c51b04ddf835c13e99a3acd5cbb92590b422b91ef7c4f5c57915543a4e82855286230da33fe90587e78b057f63eaf8a09e8 diff --git a/gentoo/media-libs/gfxprim/gfxprim-1.0.0_rc1.ebuild b/gentoo/media-libs/gfxprim/gfxprim-1.0.0_rc1.ebuild index c748fa3b..e7f27e78 100644 --- a/gentoo/media-libs/gfxprim/gfxprim-1.0.0_rc1.ebuild +++ b/gentoo/media-libs/gfxprim/gfxprim-1.0.0_rc1.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://gfxprim.ucw.cz/" LICENSE="LGPL-2.1+" SLOT="0" -IUSE="jpeg png gif tiff jpeg2k freetype X sdl aalib python" +IUSE="jpeg png gif tiff jpeg2k freetype X sdl aalib python doc" RDEPEND="jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) @@ -31,6 +31,8 @@ RDEPEND="jpeg? ( virtual/jpeg ) X? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl ) aalib? ( media-libs/aalib ) + doc? ( app-text/asciidoc dev-util/source-highlight media-gfx/graphviz + app-text/dvipng virtual/latex-base ) " DEPEND="$RDEPEND @@ -39,7 +41,7 @@ DEPEND="$RDEPEND " src_prepare() { - if [ "${PV}" != 9999 ]; then + if [ "${PV}" == "1.0.0_rc1" ]; then epatch ${FILESDIR}/configure-more-compatible-with-autoconf.patch fi } @@ -58,3 +60,13 @@ src_configure() { econf ${conf} } + +src_compile() { + default + use doc && cd doc && emake +} + +src_install() { + default + use doc && cd doc && emake DESTDIR="${D}" install +} http://repo.or.cz/w/gfxprim.git/commit/29377414caa32964443fdf5e6bd557906f1c… commit 29377414caa32964443fdf5e6bd557906f1c763b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 8 21:14:44 2014 +0200 doc: Add make install Now doc installs into 'docdir' (defaults to $(prefix)usr/doc/libgfxprim-$(version)) Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/configure b/configure index 215db43c..4208355a 100755 --- a/configure +++ b/configure @@ -364,6 +364,7 @@ if __name__ == '__main__': 'libdir' : ['', 'Where to install libraries'], 'includedir' : ['include', 'Where to install headers'], 'mandir' : ['share/man', 'Where to install man pages'], + 'docdir' : ['share/doc/', 'Where to install documentation'], # Here comes autoconf compatibility cruft, not used for anything yet 'infodir' : ['share/info', 'Where to install info pages'], 'datadir' : ['share', 'Where to place readonly arch independend datafiles'], diff --git a/doc/Makefile b/doc/Makefile index 2b56050d..9c1bcfb7 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,3 +1,6 @@ +TOPDIR=.. +include $(TOPDIR)/config.mk + SOURCES=index.html about.txt context.txt loaders.txt filters.txt basic_types.txt gfx.txt backends.txt gamma.txt grabbers.txt environment_variables.txt debug.txt core.txt input.txt @@ -80,3 +83,8 @@ CLEAN+=$(PAGES) clean: rm -f $(CLEAN) + +INSTALL_DOC=$(PAGES) *.png *.svg asciidoc.css images/*/*.png +install: $(INSTALL_DOC) + +include $(TOPDIR)/install.mk diff --git a/install.mk b/install.mk index 4b777c08..201ef01f 100644 --- a/install.mk +++ b/install.mk @@ -1,13 +1,13 @@ -ifdef DESTDIR -BIN_DIR=$(DESTDIR)/$(bindir) -else -BIN_DIR=$(bindir) -endif +include $(TOPDIR)/libver.mk ifdef DESTDIR +BIN_DIR=$(DESTDIR)/$(bindir) MAN_DIR=$(DESTDIR)/$(mandir)/man1 +DOC_DIR=$(DESTDIR)/$(docdir)/libgfxprim-$(LIB_VERSION) else MAN_DIR=$(mandir)/man1 +BIN_DIR=$(bindir) +DOC_DIR=$(docdir)/libgfxprim-$(LIB_MAJOR)-$(LIB_MINOR) endif install: @@ -32,3 +32,14 @@ else @for i in $(INSTALL_MAN); do echo "CP $$i $(MAN_DIR)"; install "$$i" "$(MAN_DIR)"; done endif endif + +ifdef INSTALL_DOC +ifdef VERBOSE + install -d "$(DOC_DIR)" + for i in $(INSTALL_DOC); do install -D -m 644 "$$i" "$(DOC_DIR)/$$i"; done +else + @install -d "$(DOC_DIR)" + @echo "MKDIR $(DOC_DIR)" + @for i in $(INSTALL_DOC); do echo "CP $$i $(DOC_DIR)/$$i"; install -D -m 644 "$$i" "$(DOC_DIR)/$$i"; done +endif +endif http://repo.or.cz/w/gfxprim.git/commit/dbe87667ad5796a4294f74f54ad1abf5dd8c… commit dbe87667ad5796a4294f74f54ad1abf5dd8c90e8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Jun 6 16:27:57 2014 +0200 build: Link gfxprim libs with third party libs Pass LDLIBS for third party libraries to linker when gfxprim-foo libraries are created. This allows us to link binaries only agains the gfxprim-foo libs (because the third party libs are loaded as dependencies of the particual gfxprim-foo library) and we don't have to recompile them when list of libraries GFXprim is linked agains changes. This commit resolves #6 Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/app.mk b/app.mk index ccfdef10..2e10fff8 100644 --- a/app.mk +++ b/app.mk @@ -3,8 +3,8 @@ CLEAN+=$(APPS) %: %.o ifdef VERBOSE - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) $(LDLIBS_GP) -Wl,--end-group -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) -lgfxprim -Wl,--end-group -o $@ else @echo "LD $@" - @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) $(LDLIBS_GP) -Wl,--end-group -o $@ + @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $^ $(LDLIBS) -lgfxprim -Wl,--end-group -o $@ endif diff --git a/build/Makefile b/build/Makefile index b6cd8cb7..3053edfa 100644 --- a/build/Makefile +++ b/build/Makefile @@ -37,10 +37,10 @@ endif $(DYNAMIC_LIB): $(LIB_OBJECTS) ifdef VERBOSE - $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ + $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -lm $(LDLIBS_core) -o $@ else @echo "LD $@" - @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ + @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -lm $(LDLIBS_core) -o $@ endif $(SYMLINKS): $(DYNAMIC_LIB) diff --git a/config.mk b/config.mk index 82b349a0..ba6c3a86 100644 --- a/config.mk +++ b/config.mk @@ -18,9 +18,3 @@ endif PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror SWIGOPTS=-w322,314 -I/usr/include/ - -# Linker flags -LDLIBS_GP=$(shell $(TOPDIR)/gfxprim-config --libs) -LDLIBS_LOADERS=$(shell $(TOPDIR)/gfxprim-config --libs-loaders) -LDLIBS_BACKENDS=$(shell $(TOPDIR)/gfxprim-config --libs-backends) -LDLIBS_GRABBERS=$(shell $(TOPDIR)/gfxprim-config --libs-grabbers) diff --git a/configure b/configure index b6e24fbf..215db43c 100755 --- a/configure +++ b/configure @@ -194,6 +194,11 @@ class libraries: else: f.write("HAVE_%s=non" % i[0].upper()) + # Write all libraries the library should link with + for module in self.get_modules(): + f.write("# %s linker flagsn" % (module)) + f.write("LDLIBS_%s=" % (module)) + f.write("%sn" % self.get_linker_flags(module)) # # Return list of linker flags needed to build particular module # (module may be core, loaders, backends, etc... @@ -202,7 +207,11 @@ class libraries: res = '' for i in self.libraries: if module in i[5] and self.results[i[0]]: - res += ' ' + i[4] + if i[4] == '': + continue; + if res != '': + res += ' ' + res += i[4] return res # # Returns list of cflags needed to build module @@ -214,6 +223,17 @@ class libraries: res += ' ' + i[3] return res + # + # Builds a list of GFXprim libraries that may need to be linked against + # third party libs + # + def get_modules(self): + modules = {} + for i in self.libraries: + for module in i[5]: + modules[module] = True + return modules.keys() + def die_screaming(msg): sys.stderr.write("n************************************n") sys.stderr.write("ERROR: ") @@ -280,8 +300,7 @@ def write_config_mk(cfg, libs): # Generate app compilation helper # def write_gfxprim_config(cfg, libs): - modules = ['loaders', 'backends', 'grabbers'] - + modules = libs.get_modules() f = open('gfxprim-config', 'w') f.write('#!/bin/shn' '#n# Generated by configure, do not edit directlyn#nn' diff --git a/demos/bogoman/Makefile b/demos/bogoman/Makefile index 83d156e0..a448feea 100644 --- a/demos/bogoman/Makefile +++ b/demos/bogoman/Makefile @@ -1,14 +1,14 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) INCLUDE= -LDLIBS+=$(LDLIBS_BACKENDS) +LDLIBS+=-lgfxprim-backends APPS=bogoman bogoman: bogoman_map.o bogoman_debug.o bogoman_loader.o bogoman_render.o -include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index ed75f7a2..0abe0214 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -1,5 +1,4 @@ TOPDIR=../.. - include $(TOPDIR)/pre.mk SOURCES=$(shell echo *.c) @@ -24,39 +23,39 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch ifeq ($(HAVE_LIBSDL),yes) APPS+=SDL_glue -SDL_glue: LDLIBS+=$(LDLIBS_BACKENDS) +SDL_glue: LDLIBS+=$(shell sdl-config --libs) -lgfxprim-backends endif -showimage: LDLIBS+=$(LDLIBS_BACKENDS) $(LDLIBS_LOADERS) -backend_example: LDLIBS+=$(LDLIBS_BACKENDS) -backend_timers_example: LDLIBS+=$(LDLIBS_BACKENDS) -virtual_backend_example: LDLIBS+=$(LDLIBS_BACKENDS) -loaders_example: LDLIBS+=$(LDLIBS_LOADERS) -loaders: LDLIBS+=$(LDLIBS_LOADERS) -tmp_file: LDLIBS+=$(LDLIBS_LOADERS) -filters_symmetry: LDLIBS+=$(LDLIBS_LOADERS) -gfx_koch: LDLIBS+=$(LDLIBS_LOADERS) -meta_data: LDLIBS+=$(LDLIBS_LOADERS) -meta_data_dump: LDLIBS+=$(LDLIBS_LOADERS) -v4l2_show: LDLIBS+=$(LDLIBS_GRABBERS) $(LDLIBS_BACKENDS) -v4l2_grab: LDLIBS+=$(LDLIBS_GRABBERS) $(LDLIBS_LOADERS) -convolution: LDLIBS+=$(LDLIBS_LOADERS) -weighted_median: LDLIBS+=$(LDLIBS_LOADERS) -shapetest: LDLIBS+=$(LDLIBS_BACKENDS) -koch: LDLIBS+=$(LDLIBS_BACKENDS) -input_example: LDLIBS+=$(LDLIBS_BACKENDS) -fileview: LDLIBS+=$(LDLIBS_BACKENDS) -linetest: LDLIBS+=$(LDLIBS_BACKENDS) -randomshapetest: LDLIBS+=$(LDLIBS_BACKENDS) -fonttest: LDLIBS+=$(LDLIBS_BACKENDS) -textaligntest: LDLIBS+=$(LDLIBS_BACKENDS) -loaders_register: LDLIBS+=$(LDLIBS_LOADERS) -gaussian_noise: LDLIBS+=$(LDLIBS_LOADERS) -blittest: LDLIBS+=$(LDLIBS_BACKENDS) $(LDLIBS_LOADERS) -sin_AA: LDLIBS+=$(LDLIBS_BACKENDS) -x11_windows: LDLIBS+=$(LDLIBS_BACKENDS) -zip_container: LDLIBS+=$(LDLIBS_LOADERS) $(LDLIBS_BACKENDS) -memory_io: LDLIBS+=$(LDLIBS_BACKENDS) $(LDLIBS_LOADERS) +showimage: LDLIBS+=-lgfxprim-backends -lgfxprim-loaders +backend_example: LDLIBS+=-lgfxprim-backends +backend_timers_example: LDLIBS+=-lgfxprim-backends +virtual_backend_example: LDLIBS+=-lgfxprim-backends -lm +loaders_example: LDLIBS+=-lgfxprim-loaders +loaders: LDLIBS+=-lgfxprim-loaders +tmp_file: LDLIBS+=-lgfxprim-loaders +filters_symmetry: LDLIBS+=-lgfxprim-loaders +gfx_koch: LDLIBS+=-lgfxprim-loaders -lm +meta_data: LDLIBS+=-lgfxprim-loaders +meta_data_dump: LDLIBS+=-lgfxprim-loaders +v4l2_show: LDLIBS+=-lgfxprim-grabbers -lgfxprim-backends +v4l2_grab: LDLIBS+=-lgfxprim-grabbers -lgfxprim-loaders +convolution: LDLIBS+=-lgfxprim-loaders +weighted_median: LDLIBS+=-lgfxprim-loaders +shapetest: LDLIBS+=-lgfxprim-backends +koch: LDLIBS+=-lgfxprim-backends -lm +input_example: LDLIBS+=-lgfxprim-backends +fileview: LDLIBS+=-lgfxprim-backends +linetest: LDLIBS+=-lgfxprim-backends -lm +randomshapetest: LDLIBS+=-lgfxprim-backends +fonttest: LDLIBS+=-lgfxprim-backends +textaligntest: LDLIBS+=-lgfxprim-backends +loaders_register: LDLIBS+=-lgfxprim-loaders +gaussian_noise: LDLIBS+=-lgfxprim-loaders +blittest: LDLIBS+=-lgfxprim-backends -lgfxprim-loaders +sin_AA: LDLIBS+=-lgfxprim-backends -lm +x11_windows: LDLIBS+=-lgfxprim-backends +zip_container: LDLIBS+=-lgfxprim-loaders -lgfxprim-backends +memory_io: LDLIBS+=-lgfxprim-backends -lgfxprim-loaders include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/demos/grinder/Makefile b/demos/grinder/Makefile index 80e31e21..6e53dc32 100644 --- a/demos/grinder/Makefile +++ b/demos/grinder/Makefile @@ -5,7 +5,7 @@ CSOURCES=$(shell echo *.c) INCLUDE=core gfx LDLIBS+=-lrt -lm -LDLIBS+=$(LDLIBS_LOADERS) +LDLIBS+=-lgfxprim-loaders APPS=grinder diff --git a/demos/particle/Makefile b/demos/particle/Makefile index 6204f936..7b553e56 100644 --- a/demos/particle/Makefile +++ b/demos/particle/Makefile @@ -4,7 +4,7 @@ CSOURCES=$(shell echo *.c) INCLUDE= LDFLAGS+=-L$(TOPDIR)/build/ -LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` +LDLIBS+=-lrt -lm -lgfxprim-backends APPS=particle_demo diff --git a/demos/spiv/Makefile b/demos/spiv/Makefile index e3a5c15c..9376ee47 100644 --- a/demos/spiv/Makefile +++ b/demos/spiv/Makefile @@ -7,7 +7,7 @@ INCLUDE= LDFLAGS+=-L$(TOPDIR)/build/ LDLIBS+=-lrt -LDLIBS+=$(LDLIBS_LOADERS) $(LDLIBS_BACKENDS) +LDLIBS+=-lgfxprim-loaders -lgfxprim-backends APPS=spiv diff --git a/demos/ttf2img/Makefile b/demos/ttf2img/Makefile index 5fa8100f..636b04b8 100644 --- a/demos/ttf2img/Makefile +++ b/demos/ttf2img/Makefile @@ -1,13 +1,12 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) INCLUDE= -LDLIBS+=-lm -LDLIBS+=$(LDLIBS_LOADERS) +LDLIBS+=-lgfxprim-loaders APPS=ttf2img -include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/lib.mk b/lib.mk index ff44945f..6afa4626 100644 --- a/lib.mk +++ b/lib.mk @@ -11,8 +11,8 @@ ifeq ($(BUILDLIB),yes) # Rules for single library, applied only when objects # are not linked to the libgfxprim.so. This generates libgfxprim_$(LIBNAME). # - include $(TOPDIR)/libver.mk +include $(TOPDIR)/config.mk LIB_NAME=libgfxprim-$(LIBNAME) BUILD_DIR=$(TOPDIR)/build/ @@ -36,11 +36,11 @@ OBJS=$(CSOURCES:.c=.o) $(BUILD_DIR)$(DYNAMIC_LIB): $(OBJS) ifdef VERBOSE rm -f $@ - $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ + $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(LDLIBS_$(LIBNAME)) $^ -o $@ else @rm -f $(@) @echo "LD $@" - @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ + @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(LDLIBS_$(LIBNAME)) $^ -o $@ endif $(BUILD_DIR)$(STATIC_LIB): $(OBJS) @@ -66,8 +66,6 @@ else # If we are not executed from the top Makefile, trigger # libGP.so rebuild. # -include $(TOPDIR)/config.mk - ifndef TOP_MAKE ALL+=rebuild_lib diff --git a/pylib/gfxprim/backends/Makefile b/pylib/gfxprim/backends/Makefile index 2353ed9c..38707caa 100644 --- a/pylib/gfxprim/backends/Makefile +++ b/pylib/gfxprim/backends/Makefile @@ -4,7 +4,7 @@ INCLUDE=core include $(TOPDIR)/pre.mk -LDLIBS+=$(LDLIBS_BACKENDS) +LDLIBS+=-lgfxprim-backends INSTALL_FILES+=_extend_backend.py diff --git a/pylib/gfxprim/grabbers/Makefile b/pylib/gfxprim/grabbers/Makefile index 2a804929..213a7e24 100644 --- a/pylib/gfxprim/grabbers/Makefile +++ b/pylib/gfxprim/grabbers/Makefile @@ -4,7 +4,7 @@ INCLUDE=core include $(TOPDIR)/pre.mk -LDLIBS+=$(LDLIBS_GRABBERS) +LDLIBS+=-lgfxprim-grabbers include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/loaders/Makefile b/pylib/gfxprim/loaders/Makefile index 5daaf56f..2f150647 100644 --- a/pylib/gfxprim/loaders/Makefile +++ b/pylib/gfxprim/loaders/Makefile @@ -4,7 +4,7 @@ INCLUDE=core include $(TOPDIR)/pre.mk -LDLIBS+=$(LDLIBS_LOADERS) +LDLIBS+=-lgfxprim-loaders include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk diff --git a/pywrap.mk b/pywrap.mk index 15b78c43..76d18b48 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -35,10 +35,10 @@ $(SWIG_C): ../common.i $(SWIG_LIB): $(SWIG_C) ifdef VERBOSE - $(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) $(PYTHON_INCLUDE) --shared $(LDLIBS) $(LDLIBS_GP) -L$(TOPDIR)/build/ -o $@ + $(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) $(PYTHON_INCLUDE) --shared $(LDLIBS) -lgfxprim -L$(TOPDIR)/build/ -o $@ else # VERBOSE @echo "LD $@" - @$(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) $(PYTHON_INCLUDE) --shared $(LDLIBS) $(LDLIBS_GP) -L$(TOPDIR)/build/ -o $@ + @$(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) $(PYTHON_INCLUDE) --shared $(LDLIBS) -lgfxprim -L$(TOPDIR)/build/ -o $@ endif # VERBOSE # Install python libraries into right places ----------------------------------------------------------------------- Summary of changes: app.mk | 4 +- build/Makefile | 4 +- config.mk | 6 -- configure | 26 +++++++- demos/bogoman/Makefile | 4 +- demos/c_simple/Makefile | 63 ++++++++++---------- demos/grinder/Makefile | 2 +- demos/particle/Makefile | 2 +- demos/spiv/Makefile | 2 +- demos/ttf2img/Makefile | 5 +- doc/Makefile | 8 +++ gentoo/media-libs/gfxprim/Manifest | 4 +- gentoo/media-libs/gfxprim/gfxprim-1.0.0_rc1.ebuild | 16 ++++- install.mk | 21 +++++-- lib.mk | 8 +-- libs/loaders/GP_IOZlib.c | 8 ++- pylib/gfxprim/backends/Makefile | 2 +- pylib/gfxprim/grabbers/Makefile | 2 +- pylib/gfxprim/loaders/Makefile | 2 +- pywrap.mk | 4 +- 20 files changed, 118 insertions(+), 75 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim June 2014