[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/doc solenv/gbuild
Tor Lillqvist
tml at collabora.com
Wed Oct 16 05:41:50 PDT 2013
config_host.mk.in | 1 -
configure.ac | 4 ----
solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 3 ---
solenv/gbuild/gbuild.mk | 3 ---
4 files changed, 11 deletions(-)
New commits:
commit 529ab4e735c1263f0bf5063779042898fc06e21e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 16 14:57:11 2013 +0300
Get rid of PRODUCT, unused I hope
Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5
diff --git a/config_host.mk.in b/config_host.mk.in
index 820cb6a..c282770 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -433,7 +433,6 @@ export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@
export POSTGRESQL_INC=@POSTGRESQL_INC@
export POSTGRESQL_LIB=@POSTGRESQL_LIB@
export PREFIXDIR=@PREFIXDIR@
-export PRODUCT=@PRODUCT@
export PRODUCTNAME=@PRODUCTNAME@
export PRODUCTVERSION=@PRODUCTVERSION@
export PROEXT=@PROEXT@
diff --git a/configure.ac b/configure.ac
index 04c6270..51a9716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3676,7 +3676,6 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
# versions (in case there are version specific problems with it)
MSVC_USE_DEBUG_RUNTIME="TRUE"
PROEXT=""
- PRODUCT=""
AC_MSG_RESULT([yes])
# cppunit and graphite expose STL in public headers
@@ -3708,14 +3707,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
else
ENABLE_DBGUTIL=""
MSVC_USE_DEBUG_RUNTIME=""
- # PRODUCT is old concept, still used by build.pl .
- PRODUCT="full"
PROEXT=".pro"
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_DBGUTIL)
AC_SUBST(MSVC_USE_DEBUG_RUNTIME)
-AC_SUBST(PRODUCT)
AC_SUBST(PROEXT)
dnl Set the ENABLE_DEBUG variable.
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 5ff5ecd..d0fb5d2 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -39,7 +39,6 @@ static const Path UPD;
static const String LIBXML_CFLAGS;
static const String OS;
static const Bool DEBUG;
-static const Bool PRODUCT;
// gbuild global variables derived from the configure/environment
// some of these are defined per platform
@@ -47,8 +46,6 @@ namespace gb
{
/// building with generated dependencies
static const Bool FULLDEPS;
- /// product build or non-product build with additional assertions and tests
- static const Bool PRODUCT;
/// command to run awk scripts
static const Command AWK;
/// command to compile c source files
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index cab9953..425a699 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -26,7 +26,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
# JAVA_HOME
# LIBXML_CFLAGS
# OS
-# PRODUCT
# SOLARINC
# SOLARLIB
# UPD
@@ -87,8 +86,6 @@ ifneq ($(strip $(TIMELOG)$(timelog)),)
gb_TIMELOG := 1
endif
-# This used to be PRODUCT="" (for the same meaning as ENABLE_DBGUTIL="TRUE"),
-# but the product meaning is now only confusing.
ifneq ($(ENABLE_DBGUTIL),)
gb_ENABLE_DBGUTIL := $(true)
else
More information about the Libreoffice-commits
mailing list