gbuild: replace all use of PRODUCT with ENABLE_DBGUTIL

Also fix the wrong check in cppunit/ExternalProject_cppunit.mk
which caused cppunit to always be built without -D_GLIBCXX_DEBUG.

Change-Id: Ia247dcd84e2c6fa0e9384fd27643537984d980b5

8 files changed, 8 insertions, 8 deletions

diff --git a/accessibility/CustomTarget_bridge.mk b/accessibility/CustomTarget_bridge.mk
index 3127462e8373..a3ed8a4274c6 100644
--- a/accessibility/CustomTarget_bridge.mk
+++ b/accessibility/CustomTarget_bridge.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge))
 $(call gb_CustomTarget_get_target,accessibility/bridge) : \
     $(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java
 
-ifeq ($(PRODUCT),)
+ifeq ($(ENABLE_DBGUTIL),TRUE)
 accessibility_DEBUG := true
 accessibility_PRODUCT := false
 else
diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
index 8a2d97c36288..b2f75e808fc0 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
 		$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
 		$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
 		$(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \
-		CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \
+		CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \
 		$(if $(debug),-g)" \
 	&& cd src \
 	&& $(MAKE) \
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index 2279607d7832..4e46d0e68164 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_WinResTarget_use_custom_headers,activex_res,\
     extensions/source/activex/idl \
 ))
 
-ifneq ($(PRODUCT),)
+ifneq ($(ENABLE_DBGUTIL),TRUE)
 $(eval $(call gb_WinResTarget_add_defs,activex_res,\
 	-DPRODUCT \
 ))
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index e5ed27656ea7..ed9decc0dfc5 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -34,7 +34,7 @@ else
 $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 	cd $(EXTERNAL_WORKDIR)/win32 \
 	&& cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \
-	$(if $(filter-out full,$(PRODUCT)),debug=yes) \
+	$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
 	&& unset MAKEFLAGS \
 	&& LIB="$(ILIB)" nmake \
 	&& touch $@
diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index 1e16361009a0..25b5482b9db6 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
 $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done:
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 ifeq ($(COM),MSC)
-ifeq ($(PRODUCT),full)
+ifneq ($(ENABLE_DBGUTIL),TRUE)
 	$(PERL) $< -e $(SRCDIR)/postprocess/signing/no_signing.txt
 			-l $(subst .done,_log.txt,$@) \
 			-f $(PFXFILE) \
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index dbcd042d4919..5160382f8eb2 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -198,7 +198,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/unx/util \
 ))
 $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
-	$(if $(filter $(ENABLE_CRASHDUMP),YES)$(if $(PRODUCT),,TRUE), \
+	$(if $(filter $(ENABLE_CRASHDUMP),YES)$(filter $(ENABLE_DBGUTIL),TRUE), \
 		-DSAL_ENABLE_CRASH_REPORT) \
 ))
 
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index b018f20ef32e..bde227fc3dfd 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
 	uuid \
 ))
 
-ifneq ($(PRODUCT),full)
+ifeq ($(ENABLE_DBGUTIL),TRUE)
 $(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
 	msvcrt \
 ))
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 6302cf462d39..2513494b66e3 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -21,7 +21,7 @@ gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
 	-define:TRACE \
 
 ifeq ($(strip $(debug)),)
-ifeq ($(strip $(PRODUCT)),)
+ifeq ($(strip $(ENABLE_DBGUTIL)),TRUE)
 gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG)
 else
 gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) -o