Kaydet (Commit) 4819e1bd authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Rework how <db.h> is included

üst 4b7c263f
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#ifdef SYSTEM_DB #ifdef SYSTEM_DB_HEADER
#include <db.h> #include SYSTEM_DB_H_HEADER
#else #else
#include <berkeleydb/db.h> #include <berkeleydb/db.h>
#endif #endif
......
...@@ -39,9 +39,7 @@ TARGET = deploy ...@@ -39,9 +39,7 @@ TARGET = deploy
.INCLUDE : settings.mk .INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
INCPRE += inc INCPRE += inc
......
...@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS = TRUE ...@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
SRS1NAME = $(TARGET) SRS1NAME = $(TARGET)
SRC1FILES = \ SRC1FILES = \
......
...@@ -42,9 +42,7 @@ TARGET = deplmisc ...@@ -42,9 +42,7 @@ TARGET = deplmisc
# Reduction of exported symbols: # Reduction of exported symbols:
CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
SRS1NAME = $(TARGET) SRS1NAME = $(TARGET)
SRC1FILES = \ SRC1FILES = \
......
...@@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc ...@@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
SRS1NAME = $(TARGET) SRS1NAME = $(TARGET)
SRC1FILES = \ SRC1FILES = \
......
...@@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc ...@@ -35,9 +35,7 @@ INCPRE += ..$/..$/inc
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
SRS1NAME = $(TARGET) SRS1NAME = $(TARGET)
SRC1FILES = \ SRC1FILES = \
......
...@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE ...@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(SYSTEM_DB)" == "YES"
CFLAGS+=-DSYSTEM_DB
.ENDIF
SRS1NAME = $(TARGET) SRS1NAME = $(TARGET)
SRC1FILES = \ SRC1FILES = \
unopkg.src unopkg.src
......
...@@ -43,9 +43,7 @@ DLLPRE = ...@@ -43,9 +43,7 @@ DLLPRE =
.INCLUDE : cppumaker.mk .INCLUDE : cppumaker.mk
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
SLOFILES= \ SLOFILES= \
$(SLO)$/jvmfwk.obj \ $(SLO)$/jvmfwk.obj \
......
...@@ -41,9 +41,7 @@ PRJINC += ..$/..$/deployment ..$/.. ...@@ -41,9 +41,7 @@ PRJINC += ..$/..$/deployment ..$/..
.INCLUDE : settings.mk .INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
.IF "$(LINK_SO)"!="" .IF "$(LINK_SO)"!=""
APP1TARGET = so$/unopkg APP1TARGET = so$/unopkg
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#ifndef BERKELEYDBPROXY_DB_HXX_ #ifndef BERKELEYDBPROXY_DB_HXX_
#define BERKELEYDBPROXY_DB_HXX_ #define BERKELEYDBPROXY_DB_HXX_
#ifdef SYSTEM_DB #ifdef SYSTEM_DB_HEADER
#include <db.h> #include SYSTEM_DB_H_HEADER
#else #else
#include <berkeleydb/db.h> #include <berkeleydb/db.h>
#endif #endif
......
...@@ -52,9 +52,7 @@ CFLAGSWERRCXX:= ...@@ -52,9 +52,7 @@ CFLAGSWERRCXX:=
CFLAGS += -DHAVE_EXPAT_H CFLAGS += -DHAVE_EXPAT_H
.IF "$(SYSTEM_DB)" == "YES" CFLAGS+= $(SYSTEM_DB_CFLAGS)
CFLAGS+=-DSYSTEM_DB
.ENDIF
.IF "$(SYSTEM_LIBXML)" == "YES" .IF "$(SYSTEM_LIBXML)" == "YES"
CFLAGS+= $(LIBXML_CFLAGS) CFLAGS+= $(LIBXML_CFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment