liblangtag/makefile.mk | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
New commits:
commit 4708f9527dff6a3838dab8940c55655c4f30e8b3
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Nov 6 16:31:21 2012 +0100
Remove last remenants of glib from liblangtag and try to fix build
Change-Id: Iae3aa684ce54e5025545179c35affc75eaf88dab
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 221c2c9..ab61c5a 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -39,6 +39,7 @@ PATCH_FILES+=liblangtag-0.4.0-reg2xml-encoding-problem.patch
CONFIGURE_DIR=.
BUILD_DIR=$(CONFIGURE_DIR)
+CONFIGURE_FLAGS= --disable-modules
.IF "$(OS)" == "MACOSX"
my_prefix = @.__________________________________________________$(EXTRPATH)
@@ -72,24 +73,6 @@ CONFIGURE_FLAGS+= LIBXML2_CFLAGS='$(LIBXML_CFLAGS)'
LIBXML2_LIBS='$(LIBXML_LIBS)
.ENDIF
.ENDIF
-.IF "$(SYSTEM_GLIB)"!="YES"
-# we're cheating here.. pkg-config wouldn't find anything useful, see
configure patch
-CONFIGURE_FLAGS+= LIBO_GLIB_CHEAT=YES
-CONFIGURE_FLAGS+= GLIB_CFLAGS='-I$(SOLARINCDIR)/external/glib-2.0'
-.IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
-CONFIGURE_FLAGS+= GLIB_LIBS='$(SOLARLIBDIR)/gio-2.0.lib
$(SOLARLIBDIR)/gobject-2.0.lib $(SOLARLIBDIR)/gthread-2.0.lib
$(SOLARLIBDIR)/gmodule-2.0.lib $(SOLARLIBDIR)/glib-2.0.lib'
-.ELSE
-CONFIGURE_FLAGS+= GLIB_LIBS='-L$(SOLARLIBDIR) -lgio-2.0 -lgobject-2.0
-lgthread-2.0 -lgmodule-2.0 -lglib-2.0'
-.IF "$(OS)" == "MACOSX"
-EXTRA_LINKFLAGS+=-Wl,-dylib_file,@loader_path/libglib-2.0.0.dylib:$(SOLARLIBDIR)/libglib-2.0.0.dylib
-.ENDIF
-.ENDIF
-CONFIGURE_FLAGS+= GLIB_GENMARSHAL=glib-genmarshal
-CONFIGURE_FLAGS+= GLIB_MKENUMS=glib-mkenums
-CONFIGURE_FLAGS+= GOBJECT_QUERY=gobject-query
-CONFIGURE_FLAGS+= --disable-glibtest
-.ENDIF
-
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) && \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
