diff options
author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
commit | aa8f1fb3945f0a856d185446115c4819c96884fd (patch) | |
tree | f8bc9575392aa49cae9df35ad7cbab3b80c99331 /redland/rasqal | |
parent | d7c414d2a203b5c1d5e78f861f3adaf26a03a45f (diff) | |
parent | 25f1c59ee39de2443b9513f04d4ba39a62ae8e58 (diff) |
merge commit
Diffstat (limited to 'redland/rasqal')
-rw-r--r-- | redland/rasqal/makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 8753580ff20e..c7ae0ed07df4 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -81,7 +81,7 @@ rasqal_LIBS+=-lstdc++_s CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -115,14 +115,13 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" -CPPFLAGS+:=$(EXTRA_CFLAGS) +CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB -.EXPORT: ZLIB3RDLIB .EXPORT: XSLTLIB CONFIGURE_DIR= |