summaryrefslogtreecommitdiff
path: root/config_host.mk.in
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-11-09 17:53:13 +0100
committerLuboš Luňák <l.lunak@suse.cz>2012-11-09 17:53:13 +0100
commit136d8962d7a29b833a24b0461958b47fc4d23d18 (patch)
tree0ce61ddf1f7f653e794cbeb8431975da71ab3007 /config_host.mk.in
parent7704c7a3e6f064e1d7cef7bbf510ece1435c3bd7 (diff)
remove make-specific code from config_host.mk
Apparently some people still try to source it from shell (scripts). Change-Id: If26a5c5eb83739d3ccce043afd095000d355a543
Diffstat (limited to 'config_host.mk.in')
-rw-r--r--config_host.mk.in20
1 files changed, 5 insertions, 15 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index e98fc79d5967..f4d31c3490fb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -61,9 +61,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@
export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
export CDR_TARBALL=@CDR_TARBALL@
-ifneq ($(strip @CFLAGS@),)
-export CFLAGS=@CFLAGS@
-endif
+@x_CFLAGS@ export CFLAGS=@CFLAGS@
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
@@ -98,9 +96,7 @@ export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@
export CXX=@CXX@
export CXX_FOR_BUILD=@CXX_FOR_BUILD@
export CXX_X64_BINARY=@CXX_X64_BINARY@
-ifneq ($(strip @CXXFLAGS@),)
-export CXXFLAGS=@CXXFLAGS@
-endif
+@x_CXXFLAGS@ export CXXFLAGS=@CXXFLAGS@
export DATADIR=@DATADIR@
export DBGHELP_DLL=@DBGHELP_DLL@
export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
@@ -324,9 +320,7 @@ export L10N_MODULE=@L10N_MODULE@
export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
export LCMS2_TARBALL=@LCMS2_TARBALL@
-ifneq ($(strip @LDFLAGS@),)
-export LDFLAGS=@LDFLAGS@
-endif
+@x_LDFLAGS@ export LDFLAGS=@LDFLAGS@
export LFS_CFLAGS=@LFS_CFLAGS@
export LIBBASE_JAR=@LIBBASE_JAR@
export LIBDIR=@LIBDIR@
@@ -462,12 +456,8 @@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
export NSS_TARBALL=@NSS_TARBALL@
export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
-ifneq ($(strip @OBJCFLAGS@),)
-export OBJCFLAGS=@OBJCFLAGS@
-endif
-ifneq ($(strip @OBJCXXFLAGS@),)
-export OBJCXXFLAGS=@OBJCXXFLAGS@
-endif
+@x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
+@x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
export OBJDUMP=@OBJDUMP@
export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@
export OOODMAKEMODE=YES