diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/inc/db.hxx | 4 | ||||
| -rwxr-xr-x | desktop/source/deployment/makefile.mk | 4 | ||||
| -rwxr-xr-x | desktop/source/deployment/manager/makefile.mk | 4 | ||||
| -rwxr-xr-x | desktop/source/deployment/misc/makefile.mk | 4 | ||||
| -rwxr-xr-x | desktop/source/deployment/registry/configuration/makefile.mk | 4 | ||||
| -rwxr-xr-x | desktop/source/deployment/registry/help/makefile.mk | 4 | ||||
| -rwxr-xr-x | desktop/source/deployment/unopkg/makefile.mk | 4 | ||||
| -rwxr-xr-x | desktop/source/migration/services/makefile.mk | 4 | ||||
| -rwxr-xr-x | desktop/source/pkgchk/unopkg/makefile.mk | 4 |
9 files changed, 9 insertions, 27 deletions
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx index 22e9e357b549..ccedfcc3dd82 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 4277e3ac59c4..a010e8982de0 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 ef44ac5e9857..022f5e27e554 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 67d5889a8ac1..2a9d38539743 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 d1125d5ad2f4..1fb637ef8e3a 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 fe4668afa879..81778bf728c0 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 b4ce8a10bfa3..64fe173f4597 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 3a08b03a62c3..f74dec646b1d 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 e14e852686ad..60db925bece5 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 |