You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2011/12/12 10:27:13 UTC
svn commit: r1213174 - in /incubator/ooo/trunk/main/desktop/source:
deployment/ deployment/manager/ deployment/misc/
deployment/registry/configuration/ deployment/registry/help/
deployment/unopkg/ migration/services/ pkgchk/unopkg/
Author: hdu
Date: Mon Dec 12 09:27:12 2011
New Revision: 1213174
URL: http://svn.apache.org/viewvc?rev=1213174&view=rev
Log:
#i118662# since BerkeleyDB is unused now in desktop module it should no longer link to it (author=orwitt)
Modified:
incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk
incubator/ooo/trunk/main/desktop/source/deployment/manager/makefile.mk
incubator/ooo/trunk/main/desktop/source/deployment/misc/makefile.mk
incubator/ooo/trunk/main/desktop/source/deployment/registry/configuration/makefile.mk
incubator/ooo/trunk/main/desktop/source/deployment/registry/help/makefile.mk
incubator/ooo/trunk/main/desktop/source/deployment/unopkg/makefile.mk
incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk
incubator/ooo/trunk/main/desktop/source/pkgchk/unopkg/makefile.mk
Modified: incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk Mon Dec 12 09:27:12 2011
@@ -40,10 +40,6 @@ TARGET = deploy
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
INCPRE += inc
DLLPRE =
Modified: incubator/ooo/trunk/main/desktop/source/deployment/manager/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/manager/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/manager/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/manager/makefile.mk Mon Dec 12 09:27:12 2011
@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
SRS1NAME = $(TARGET)
SRC1FILES = \
dp_manager.src
Modified: incubator/ooo/trunk/main/desktop/source/deployment/misc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/misc/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/misc/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/misc/makefile.mk Mon Dec 12 09:27:12 2011
@@ -42,10 +42,6 @@ TARGET = deplmisc
# Reduction of exported symbols:
CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
SRS1NAME = $(TARGET)
SRC1FILES = \
dp_misc.src
Modified: incubator/ooo/trunk/main/desktop/source/deployment/registry/configuration/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/registry/configuration/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/registry/configuration/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/registry/configuration/makefile.mk Mon Dec 12 09:27:12 2011
@@ -35,10 +35,6 @@ INCPRE += ..$/..$/inc
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
SRS1NAME = $(TARGET)
SRC1FILES = \
dp_configuration.src
Modified: incubator/ooo/trunk/main/desktop/source/deployment/registry/help/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/registry/help/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/registry/help/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/registry/help/makefile.mk Mon Dec 12 09:27:12 2011
@@ -35,10 +35,6 @@ INCPRE += ..$/..$/inc
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
SRS1NAME = $(TARGET)
SRC1FILES = \
dp_help.src
Modified: incubator/ooo/trunk/main/desktop/source/deployment/unopkg/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/unopkg/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/unopkg/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/unopkg/makefile.mk Mon Dec 12 09:27:12 2011
@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
SRS1NAME = $(TARGET)
SRC1FILES = \
unopkg.src
Modified: incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk Mon Dec 12 09:27:12 2011
@@ -42,10 +42,6 @@ DLLPRE =
.INCLUDE : cppumaker.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
SLOFILES= \
$(SLO)$/jvmfwk.obj \
$(SLO)$/cexports.obj \
@@ -76,7 +72,6 @@ SHL1STDLIBS= \
$(I18NISOLANGLIB) \
$(JVMFWKLIB) \
$(XMLSCRIPTLIB) \
- $(BERKELEYLIB)
SHL1DEPN=
SHL1IMPLIB=imigrationoo2
@@ -104,7 +99,6 @@ SHL2STDLIBS= \
$(I18NISOLANGLIB) \
$(JVMFWKLIB) \
$(XMLSCRIPTLIB) \
- $(BERKELEYLIB)
SHL2DEPN=
SHL2IMPLIB=imigrationoo3
Modified: incubator/ooo/trunk/main/desktop/source/pkgchk/unopkg/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/pkgchk/unopkg/makefile.mk?rev=1213174&r1=1213173&r2=1213174&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/pkgchk/unopkg/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/pkgchk/unopkg/makefile.mk Mon Dec 12 09:27:12 2011
@@ -41,10 +41,6 @@ PRJINC += ..$/..$/deployment ..$/..
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
.IF "$(LINK_SO)"!=""
APP1TARGET = so$/unopkg
APP1OBJS = $(OBJFILES)