[Libreoffice-commits] .: desktop/source xmlhelp/source

[Tor Lillqvist]

 desktop/source/deployment/makefile.mk                        |    2 +-
 desktop/source/deployment/manager/makefile.mk                |    2 +-
 desktop/source/deployment/misc/makefile.mk                   |    2 +-
 desktop/source/deployment/registry/configuration/makefile.mk |    2 +-
 desktop/source/deployment/registry/help/makefile.mk          |    2 +-
 desktop/source/deployment/unopkg/makefile.mk                 |    2 +-
 desktop/source/migration/services/makefile.mk                |    2 +-
 desktop/source/pkgchk/unopkg/makefile.mk                     |    2 +-
 xmlhelp/source/cxxhelp/provider/makefile.mk                  |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit a67d1be8c5336e29f95f3c8b4543f5c2b9a6a82e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 17 23:21:15 2011 +0300

    No DB_INCLUDES any more, pass -I if necessary

diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index 877379a..4277e3a 100755
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -40,7 +40,7 @@ TARGET = deploy
 .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
  
 INCPRE += inc
diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
index 4dc6405..ef44ac5 100755
--- a/desktop/source/deployment/manager/makefile.mk
+++ b/desktop/source/deployment/manager/makefile.mk
@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS = TRUE
 .INCLUDE : settings.mk
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 SRS1NAME = $(TARGET)
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index 3e4bd68..67d5889 100755
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/misc/makefile.mk
@@ -43,7 +43,7 @@ TARGET = deplmisc
 CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 SRS1NAME = $(TARGET)
diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk
index 9bcbd50..d1125d5 100755
--- a/desktop/source/deployment/registry/configuration/makefile.mk
+++ b/desktop/source/deployment/registry/configuration/makefile.mk
@@ -36,7 +36,7 @@ INCPRE += ..$/..$/inc
 .INCLUDE : settings.mk
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 SRS1NAME = $(TARGET)
diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk
index d4934f7..fe4668a 100755
--- a/desktop/source/deployment/registry/help/makefile.mk
+++ b/desktop/source/deployment/registry/help/makefile.mk
@@ -36,7 +36,7 @@ INCPRE += ..$/..$/inc
 .INCLUDE : settings.mk
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 SRS1NAME = $(TARGET)
diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk
index 06b39cd..b4ce8a1 100755
--- a/desktop/source/deployment/unopkg/makefile.mk
+++ b/desktop/source/deployment/unopkg/makefile.mk
@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS = TRUE
 .INCLUDE : settings.mk
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 SRS1NAME = $(TARGET)
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 718ac03..3a08b03 100755
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -44,7 +44,7 @@ DLLPRE =
 .INCLUDE :  cppumaker.mk
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 SLOFILES= \
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 8384f1b..e14e852 100755
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -42,7 +42,7 @@ PRJINC += ..$/..$/deployment ..$/..
 .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 .IF "$(LINK_SO)"!=""
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index 38f57c6..398e4fe 100755
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ b/xmlhelp/source/cxxhelp/provider/makefile.mk
@@ -53,7 +53,7 @@ CFLAGSWERRCXX:=
 CFLAGS +=  -DHAVE_EXPAT_H
 
 .IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+CFLAGS+=-DSYSTEM_DB
 .ENDIF
 
 .IF "$(SYSTEM_LIBXML)" == "YES"