diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-16 14:57:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-16 15:38:29 +0300 |
| commit | 529ab4e735c1263f0bf5063779042898fc06e21e (patch) | |
| tree | 5008c5f7c52e28a71ec85d3e031ea432fe14ae1f | |
| parent | 7ee2ce24c4060e16b6aa852edfcbe5c531c89b6e (diff) | |
Get rid of PRODUCT, unused I hope
Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 3 |
4 files changed, 0 insertions, 11 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 820cb6a78ee9..c282770372f5 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 04c62706643b..51a971604cd1 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 5ff5ecde7236..d0fb5d254938 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 cab99533f1ca..425a6995710b 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 |