diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-05-29 18:22:44 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-05-29 18:22:44 +0200 |
| commit | 5c44a7e02f8d09c276ad0b22b80fed4826a1dfc6 (patch) | |
| tree | 4db0cea09526b5a50c862b724c4f14b371f8428a /glib | |
| parent | 0bb3ffd6456e7a7291bbadff2f547301579f05d3 (diff) | |
Mac: actually use the define that is used in the patch, link against SDK
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/makefile.mk | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/glib/makefile.mk b/glib/makefile.mk index 8827dc3d8cfb..70736ff88386 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_glib .IF "$(SYSTEM_GLIB)" == "YES" all: - @echo "An already available installation of glib should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of glib should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -50,20 +50,15 @@ TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e .IF "$(OS)"=="MACOSX" PATCH_FILES=glib-2.28.1.patch -CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)" -CONFIGURE_DIR= -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - .$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external" \ - LDFLAGS="$(CONFIGURE_LDFLAGS)" -CONFIGURE_FLAGS=--disable-fam -.IF "$(OS)" == "MACOSX" -CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" -.ENDIF -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -BUILD_DIR=$(CONFIGURE_DIR) +CONFIGURE_FLAGS=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) +CONFIGURE_FLAGS+=--disable-fam +CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX" +CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external" +CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" +CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) EXTRPATH=LOADER OUT2LIB+=gio/.libs/libgio-2.0.0.dylib @@ -72,8 +67,8 @@ OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib OUT2LIB+=gobject/.libs/libgobject-2.0.0.dylib OUT2LIB+=gthread/.libs/libgthread-2.0.0.dylib -OUT2BIN+=gobject$/glib-mkenums -OUT2BIN+=gobject$/.libs$/glib-genmarshal +OUT2BIN+=gobject/glib-mkenums +OUT2BIN+=gobject/.libs/glib-genmarshal OUT2INC+=glib/glib.h OUT2INC+=glib/glib-object.h |