summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-15 16:22:07 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-15 16:22:07 +0000
commit67f3c8fc5dcd32eb5223b4d7c3515ee9520d203b (patch)
tree000da79f2e020a78eeb0967c8067ff3e301645e5
parent467e03fa41edd12ba21345a21b67b139593b22c7 (diff)
INTEGRATION: CWS cd01 (1.48.156); FILE MERGED
2004/11/02 13:19:20 as 1.48.156.1: #i35118# hold some config items alive till config dies
-rw-r--r--svtools/source/config/makefile.mk70
1 files changed, 63 insertions, 7 deletions
diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk
index ab7d796ac1f1..dcaab51aa2c6 100644
--- a/svtools/source/config/makefile.mk
+++ b/svtools/source/config/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.48 $
+# $Revision: 1.49 $
#
-# last change: $Author: obo $ $Date: 2004-07-06 12:12:16 $
+# last change: $Author: obo $ $Date: 2004-11-15 17:22:07 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -64,6 +64,7 @@ PRJ=..$/..
PRJNAME=svtools
TARGET=config
TARGET1=heavyconfig
+LIBTARGET=NO
# --- Settings -----------------------------------------------------
@@ -103,7 +104,21 @@ SLOFILES = \
$(SLO)$/extendedsecurityoptions.obj \
$(SLO)$/sourceviewconfig.obj \
$(SLO)$/compatibility.obj \
- $(SLO)$/eventcfg.obj
+ $(SLO)$/eventcfg.obj \
+ $(SLO)$/accessibilityoptions.obj \
+ $(SLO)$/fontsubstconfig.obj \
+ $(SLO)$/misccfg.obj \
+ $(SLO)$/apearcfg.obj \
+ $(SLO)$/fltrcfg.obj \
+ $(SLO)$/languageoptions.obj \
+ $(SLO)$/ctloptions.obj \
+ $(SLO)$/cjkoptions.obj \
+ $(SLO)$/colorcfg.obj \
+ $(SLO)$/undoopt.obj \
+ $(SLO)$/useroptions.obj \
+ $(SLO)$/syslocaleoptions.obj \
+ $(SLO)$/itemholder1.obj \
+ $(SLO)$/itemholder2.obj
EXCEPTIONSFILES = \
$(SLO)$/accelcfg.obj \
@@ -111,13 +126,53 @@ EXCEPTIONSFILES = \
$(SLO)$/xmlaccelcfg.obj \
$(SLO)$/moduleoptions.obj \
$(SLO)$/pathoptions.obj \
- $(SLO)$/eventcfg.obj
+ $(SLO)$/eventcfg.obj \
+ $(SLO)$/itemholder1.obj \
+ $(SLO)$/itemholder2.obj
+
# --- heavyconfig.lib Files --------------------------------------------------------
-DEPOBJFILES=$(LIB1OBJFILES)
-LIB1TARGET= $(SLB)$/$(TARGET1).lib
+LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1OBJFILES= \
+ $(SLO)$/accelcfg.obj \
+ $(SLO)$/xmlaccelcfg.obj \
+ $(SLO)$/moduleoptions.obj \
+ $(SLO)$/pathoptions.obj \
+ $(SLO)$/saveopt.obj \
+ $(SLO)$/helpopt.obj \
+ $(SLO)$/javaoptions.obj \
+ $(SLO)$/securityoptions.obj \
+ $(SLO)$/localisationoptions.obj \
+ $(SLO)$/workingsetoptions.obj \
+ $(SLO)$/viewoptions.obj \
+ $(SLO)$/internaloptions.obj \
+ $(SLO)$/startoptions.obj \
+ $(SLO)$/historyoptions.obj \
+ $(SLO)$/inetoptions.obj \
+ $(SLO)$/menuoptions.obj \
+ $(SLO)$/dynamicmenuoptions.obj \
+ $(SLO)$/options3d.obj \
+ $(SLO)$/fontoptions.obj \
+ $(SLO)$/addxmltostorageoptions.obj \
+ $(SLO)$/miscopt.obj \
+ $(SLO)$/defaultoptions.obj \
+ $(SLO)$/searchopt.obj \
+ $(SLO)$/printwarningoptions.obj \
+ $(SLO)$/printoptions.obj \
+ $(SLO)$/cacheoptions.obj \
+ $(SLO)$/regoptions.obj \
+ $(SLO)$/cmdoptions.obj \
+ $(SLO)$/extendedsecurityoptions.obj \
+ $(SLO)$/sourceviewconfig.obj \
+ $(SLO)$/compatibility.obj \
+ $(SLO)$/eventcfg.obj \
+ $(SLO)$/itemholder1.obj
+
+# --- heavyconfig.lib Files --------------------------------------------------------
+LIB2TARGET= $(SLB)$/$(TARGET1).lib
+
+LIB2OBJFILES= \
$(SLO)$/accessibilityoptions.obj \
$(SLO)$/fontsubstconfig.obj \
$(SLO)$/misccfg.obj \
@@ -129,7 +184,8 @@ LIB1OBJFILES= \
$(SLO)$/colorcfg.obj \
$(SLO)$/undoopt.obj \
$(SLO)$/useroptions.obj \
- $(SLO)$/syslocaleoptions.obj
+ $(SLO)$/syslocaleoptions.obj \
+ $(SLO)$/itemholder2.obj
# --- Targets ------------------------------------------------------