[Libreoffice-commits] .: libgsf/makefile.mk

[Christian Lohmaier]

 libgsf/makefile.mk |  100 ++++++++++++++++++++++++++---------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

New commits:
commit fd2a3ef8ab18a88f9c4a0196d2b24d3fc051d48f
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Jun 2 18:49:37 2011 +0200

    link against the SDK (Mac)

diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index 955925f..7e4613f 100755
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -68,7 +68,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  .$/configure \
                  --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
-                 LDFLAGS="-L$(SOLARLIBDIR)" \
+                 LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \
                  --without-python \
                  --without-bonobo \
                  --with-bz2 \
@@ -94,57 +94,57 @@ BUILD_DIR=$(CONFIGURE_DIR)
 
 .IF "$(OS)"=="MACOSX"
 EXTRPATH=LOADER
-OUT2LIB+=gsf$/.libs$/libgsf-1.114.dylib
+OUT2LIB+=gsf/.libs/libgsf-1.114.dylib
 .ENDIF
 
-OUT2INC+=gsf$/gsf-blob.h
-OUT2INC+=gsf$/gsf-input-impl.h
-OUT2INC+=gsf$/gsf-outfile.h
-OUT2INC+=gsf$/gsf-clip-data.h
-OUT2INC+=gsf$/gsf-input-iochannel.h
-OUT2INC+=gsf$/gsf-output-bzip.h
-OUT2INC+=gsf$/gsf-doc-meta-data.h
-OUT2INC+=gsf$/gsf-input-memory.h
-OUT2INC+=gsf$/gsf-output-csv.h
-OUT2INC+=gsf$/gsf-docprop-vector.h
-OUT2INC+=gsf$/gsf-input-proxy.h
-OUT2INC+=gsf$/gsf-output-gio.h
-OUT2INC+=gsf$/gsf-impl-utils.h
-OUT2INC+=gsf$/gsf-input-stdio.h
-OUT2INC+=gsf$/gsf-output-gzip.h
-OUT2INC+=gsf$/gsf-infile-impl.h
-OUT2INC+=gsf$/gsf-input-textline.h
-OUT2INC+=gsf$/gsf-output-iconv.h
-OUT2INC+=gsf$/gsf-infile-msole.h
-OUT2INC+=gsf$/gsf-input.h
-OUT2INC+=gsf$/gsf-output-impl.h
-OUT2INC+=gsf$/gsf-infile-msvba.h
-OUT2INC+=gsf$/gsf-libxml.h
-OUT2INC+=gsf$/gsf-output-iochannel.h
-OUT2INC+=gsf$/gsf-infile-stdio.h
-OUT2INC+=gsf$/gsf-meta-names.h
-OUT2INC+=gsf$/gsf-output-memory.h
-OUT2INC+=gsf$/gsf-infile-tar.h
-OUT2INC+=gsf$/gsf-msole-utils.h
-OUT2INC+=gsf$/gsf-output-stdio.h
-OUT2INC+=gsf$/gsf-infile-zip.h
-OUT2INC+=gsf$/gsf-open-pkg-utils.h
-OUT2INC+=gsf$/gsf-output.h
-OUT2INC+=gsf$/gsf-infile.h
-OUT2INC+=gsf$/gsf-opendoc-utils.h
-OUT2INC+=gsf$/gsf-shared-memory.h
-OUT2INC+=gsf$/gsf-input-bzip.h
-OUT2INC+=gsf$/gsf-outfile-impl.h
-OUT2INC+=gsf$/gsf-structured-blob.h
-OUT2INC+=gsf$/gsf-input-gio.h
-OUT2INC+=gsf$/gsf-outfile-msole.h
-OUT2INC+=gsf$/gsf-timestamp.h
-OUT2INC+=gsf$/gsf-input-gzip.h
-OUT2INC+=gsf$/gsf-outfile-stdio.h
-OUT2INC+=gsf$/gsf-utils.h
-OUT2INC+=gsf$/gsf-input-http.h
-OUT2INC+=gsf$/gsf-outfile-zip.h
-OUT2INC+=gsf$/gsf.h
+OUT2INC+=gsf/gsf-blob.h
+OUT2INC+=gsf/gsf-input-impl.h
+OUT2INC+=gsf/gsf-outfile.h
+OUT2INC+=gsf/gsf-clip-data.h
+OUT2INC+=gsf/gsf-input-iochannel.h
+OUT2INC+=gsf/gsf-output-bzip.h
+OUT2INC+=gsf/gsf-doc-meta-data.h
+OUT2INC+=gsf/gsf-input-memory.h
+OUT2INC+=gsf/gsf-output-csv.h
+OUT2INC+=gsf/gsf-docprop-vector.h
+OUT2INC+=gsf/gsf-input-proxy.h
+OUT2INC+=gsf/gsf-output-gio.h
+OUT2INC+=gsf/gsf-impl-utils.h
+OUT2INC+=gsf/gsf-input-stdio.h
+OUT2INC+=gsf/gsf-output-gzip.h
+OUT2INC+=gsf/gsf-infile-impl.h
+OUT2INC+=gsf/gsf-input-textline.h
+OUT2INC+=gsf/gsf-output-iconv.h
+OUT2INC+=gsf/gsf-infile-msole.h
+OUT2INC+=gsf/gsf-input.h
+OUT2INC+=gsf/gsf-output-impl.h
+OUT2INC+=gsf/gsf-infile-msvba.h
+OUT2INC+=gsf/gsf-libxml.h
+OUT2INC+=gsf/gsf-output-iochannel.h
+OUT2INC+=gsf/gsf-infile-stdio.h
+OUT2INC+=gsf/gsf-meta-names.h
+OUT2INC+=gsf/gsf-output-memory.h
+OUT2INC+=gsf/gsf-infile-tar.h
+OUT2INC+=gsf/gsf-msole-utils.h
+OUT2INC+=gsf/gsf-output-stdio.h
+OUT2INC+=gsf/gsf-infile-zip.h
+OUT2INC+=gsf/gsf-open-pkg-utils.h
+OUT2INC+=gsf/gsf-output.h
+OUT2INC+=gsf/gsf-infile.h
+OUT2INC+=gsf/gsf-opendoc-utils.h
+OUT2INC+=gsf/gsf-shared-memory.h
+OUT2INC+=gsf/gsf-input-bzip.h
+OUT2INC+=gsf/gsf-outfile-impl.h
+OUT2INC+=gsf/gsf-structured-blob.h
+OUT2INC+=gsf/gsf-input-gio.h
+OUT2INC+=gsf/gsf-outfile-msole.h
+OUT2INC+=gsf/gsf-timestamp.h
+OUT2INC+=gsf/gsf-input-gzip.h
+OUT2INC+=gsf/gsf-outfile-stdio.h
+OUT2INC+=gsf/gsf-utils.h
+OUT2INC+=gsf/gsf-input-http.h
+OUT2INC+=gsf/gsf-outfile-zip.h
+OUT2INC+=gsf/gsf.h
 
 .ENDIF