summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-02-29 18:34:42 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-02-29 18:46:38 +0100
commit7c4f2ec8a795534164ee1923093b7d5be0126c55 (patch)
tree08971f4c7375629393b6d9cdeb713006778334bf /gdk-pixbuf
parent8c9823d311fdf8092cc75873e4565325d204a658 (diff)
Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name, so that external modules can configure --prefix=/@___... etc. This removes the need for the special extshl and EXTRPATH=LOADER. Also, a new OUT2BIN_NONE can be used for external modules where the generated libraries need the default EXTRPATH=OOO, but generated executables are only used during the build and such need RPATH=NONE.
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/makefile.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 74f32012f63a..3beb162f1403 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -60,7 +60,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/libpng -I$(SOLARINCDIR)/external/jpeg" \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \
LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
- --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+ --prefix=/@.__________________________________________________$(EXTRPATH) \
--disable-nls \
--disable-modules \
--with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
@@ -72,8 +72,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
-
-EXTRPATH=LOADER
+
OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib
OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h