[Libreoffice-commits] .: desktop/source xmlhelp/source
Tor Lillqvist
tml at kemper.freedesktop.org
Wed May 18 01:24:46 PDT 2011
desktop/source/deployment/inc/db.hxx | 4 ++--
desktop/source/deployment/makefile.mk | 4 +---
desktop/source/deployment/manager/makefile.mk | 4 +---
desktop/source/deployment/misc/makefile.mk | 4 +---
desktop/source/deployment/registry/configuration/makefile.mk | 4 +---
desktop/source/deployment/registry/help/makefile.mk | 4 +---
desktop/source/deployment/unopkg/makefile.mk | 4 ----
desktop/source/migration/services/makefile.mk | 4 +---
desktop/source/pkgchk/unopkg/makefile.mk | 4 +---
xmlhelp/source/cxxhelp/provider/db.hxx | 4 ++--
xmlhelp/source/cxxhelp/provider/makefile.mk | 4 +---
11 files changed, 12 insertions(+), 32 deletions(-)
New commits:
commit 3652eb755f461e2a881e1d527d8fb4530cf282bc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed May 18 11:13:45 2011 +0300
Rework how <db.h> is included
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index 3fa3d22..ce10b06 100644
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
@@ -30,8 +30,8 @@
#include <boost/noncopyable.hpp>
-#ifdef SYSTEM_DB
-#include <db.h>
+#ifdef SYSTEM_DB_HEADER
+#include SYSTEM_DB_H_HEADER
#else
#include <berkeleydb/db.h>
#endif
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index 4277e3a..a010e89 100755
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -39,9 +39,7 @@ TARGET = deploy
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
INCPRE += inc
diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
index ef44ac5..022f5e2 100755
--- a/desktop/source/deployment/manager/makefile.mk
+++ b/desktop/source/deployment/manager/makefile.mk
@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
SRS1NAME = $(TARGET)
SRC1FILES = \
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index 67d5889..2a9d385 100755
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/misc/makefile.mk
@@ -42,9 +42,7 @@ TARGET = deplmisc
# Reduction of exported symbols:
CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
SRS1NAME = $(TARGET)
SRC1FILES = \
diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk
index d1125d5..1fb637e 100755
--- a/desktop/source/deployment/registry/configuration/makefile.mk
+++ b/desktop/source/deployment/registry/configuration/makefile.mk
@@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
SRS1NAME = $(TARGET)
SRC1FILES = \
diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk
index fe4668a..81778bf 100755
--- a/desktop/source/deployment/registry/help/makefile.mk
+++ b/desktop/source/deployment/registry/help/makefile.mk
@@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
SRS1NAME = $(TARGET)
SRC1FILES = \
diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk
index b4ce8a1..64fe173 100755
--- a/desktop/source/deployment/unopkg/makefile.mk
+++ b/desktop/source/deployment/unopkg/makefile.mk
@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
-
SRS1NAME = $(TARGET)
SRC1FILES = \
unopkg.src
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 3a08b03..f74dec6 100755
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -43,9 +43,7 @@ DLLPRE =
.INCLUDE : cppumaker.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
SLOFILES= \
$(SLO)$/jvmfwk.obj \
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index e14e852..60db925 100755
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -41,9 +41,7 @@ PRJINC += ..$/..$/deployment ..$/..
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
.IF "$(LINK_SO)"!=""
APP1TARGET = so$/unopkg
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 0028038..e2ce7f1 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -28,8 +28,8 @@
#ifndef BERKELEYDBPROXY_DB_HXX_
#define BERKELEYDBPROXY_DB_HXX_
-#ifdef SYSTEM_DB
-#include <db.h>
+#ifdef SYSTEM_DB_HEADER
+#include SYSTEM_DB_H_HEADER
#else
#include <berkeleydb/db.h>
#endif
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index 398e4fe..cc8eaf9 100755
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ b/xmlhelp/source/cxxhelp/provider/makefile.mk
@@ -52,9 +52,7 @@ CFLAGSWERRCXX:=
CFLAGS += -DHAVE_EXPAT_H
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
.IF "$(SYSTEM_LIBXML)" == "YES"
CFLAGS+= $(LIBXML_CFLAGS)
More information about the Libreoffice-commits
mailing list