[Libreoffice-commits] .: sw/source
Thomas Klausner
tklausner at kemper.freedesktop.org
Fri Nov 5 15:34:28 PDT 2010
sw/source/core/SwNumberTree/makefile.mk | 4 -
sw/source/core/attr/makefile.mk | 13 +++--
sw/source/core/bastyp/makefile.mk | 14 ++---
sw/source/core/crsr/makefile.mk | 13 +----
sw/source/core/doc/makefile.mk | 44 ++++++++---------
sw/source/core/docnode/makefile.mk | 27 +++-------
sw/source/core/draw/makefile.mk | 16 ++----
sw/source/core/edit/makefile.mk | 18 +++----
sw/source/core/fields/makefile.mk | 12 +---
sw/source/core/frmedt/makefile.mk | 16 +++---
sw/source/core/layout/makefile.mk | 30 +++--------
sw/source/core/objectpositioning/makefile.mk | 11 ++--
sw/source/core/para/makefile.mk | 3 +
sw/source/core/sw3io/makefile.mk | 7 +-
sw/source/core/swg/makefile.mk | 17 ++----
sw/source/core/text/makefile.mk | 45 +++++------------
sw/source/core/tox/makefile.mk | 7 +-
sw/source/core/txtnode/makefile.mk | 31 ++++--------
sw/source/core/undo/makefile.mk | 15 +----
sw/source/filter/ascii/makefile.mk | 7 +-
sw/source/filter/basflt/makefile.mk | 9 +--
sw/source/filter/html/makefile.mk | 16 ++----
sw/source/filter/rtf/makefile.mk | 8 +--
sw/source/filter/writer/makefile.mk | 4 +
sw/source/filter/ww1/makefile.mk | 11 +---
sw/source/filter/ww8/makefile.mk | 68 +++++++--------------------
sw/source/filter/xml/makefile.mk | 52 ++++++--------------
sw/source/ui/app/makefile.mk | 16 +-----
sw/source/ui/cctrl/makefile.mk | 6 +-
sw/source/ui/chrdlg/makefile.mk | 13 +++--
sw/source/ui/config/makefile.mk | 16 +++---
sw/source/ui/dbui/makefile.mk | 30 +++--------
sw/source/ui/dialog/makefile.mk | 24 ++++-----
sw/source/ui/dochdl/makefile.mk | 6 +-
sw/source/ui/envelp/makefile.mk | 23 ++++-----
sw/source/ui/fldui/makefile.mk | 18 ++-----
sw/source/ui/fmtui/makefile.mk | 3 +
sw/source/ui/frmdlg/makefile.mk | 11 +---
sw/source/ui/globdoc/makefile.mk | 3 +
sw/source/ui/index/makefile.mk | 9 +--
sw/source/ui/lingu/makefile.mk | 8 +--
sw/source/ui/misc/makefile.mk | 23 +++------
sw/source/ui/ribbar/makefile.mk | 20 +++----
sw/source/ui/shells/makefile.mk | 21 +-------
sw/source/ui/table/makefile.mk | 12 ++--
sw/source/ui/uiview/makefile.mk | 31 +++---------
sw/source/ui/utlui/makefile.mk | 26 +++++-----
sw/source/ui/web/makefile.mk | 17 +++---
sw/source/ui/wrtsh/makefile.mk | 9 +--
49 files changed, 356 insertions(+), 507 deletions(-)
New commits:
commit 38110f8b01d9c31cf7a6ab87ccd347722b1cfbc9
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Fri Nov 5 23:33:56 2010 +0100
Add lots of files to EXCEPTIONSFILES, needed at least on NetBSD.
diff --git a/sw/source/core/SwNumberTree/makefile.mk b/sw/source/core/SwNumberTree/makefile.mk
index d67a3f3..a7cfff9 100644
--- a/sw/source/core/SwNumberTree/makefile.mk
+++ b/sw/source/core/SwNumberTree/makefile.mk
@@ -38,10 +38,10 @@ TARGET=SwNumberTree
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/SwNumberTree.obj \
- $(SLO)$/SwNodeNum.obj
+ $(EXCEPTIONSFILES)
EXCEPTIONSFILES = \
+ $(SLO)$/SwNodeNum.obj \
$(SLO)$/SwNumberTree.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/attr/makefile.mk b/sw/source/core/attr/makefile.mk
index a3827d4..baf327d 100644
--- a/sw/source/core/attr/makefile.mk
+++ b/sw/source/core/attr/makefile.mk
@@ -40,15 +40,18 @@ AUTOSEG=true
# --- Files --------------------------------------------------------
-SLOFILES = \
- $(SLO)$/calbck.obj \
+EXCEPTIONSFILES = \
$(SLO)$/cellatr.obj \
- $(SLO)$/fmtfollowtextflow.obj \
- $(SLO)$/fmtwrapinfluenceonobjpos.obj \
- $(SLO)$/format.obj \
+ $(SLO)$/format.obj \
$(SLO)$/hints.obj \
$(SLO)$/swatrset.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/calbck.obj \
+ $(SLO)$/fmtfollowtextflow.obj \
+ $(SLO)$/fmtwrapinfluenceonobjpos.obj
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/core/bastyp/makefile.mk b/sw/source/core/bastyp/makefile.mk
index 8333dab..513e34b 100644
--- a/sw/source/core/bastyp/makefile.mk
+++ b/sw/source/core/bastyp/makefile.mk
@@ -56,21 +56,21 @@ CXXFILES = \
SwSmartTagMgr.cxx
SLOFILES = \
+ $(EXCEPTIONSFILES) \
$(SLO)$/bparr.obj \
- $(SLO)$/breakit.obj \
- $(SLO)$/calc.obj \
$(SLO)$/checkit.obj \
$(SLO)$/index.obj \
- $(SLO)$/init.obj \
$(SLO)$/ring.obj \
$(SLO)$/swcache.obj \
$(SLO)$/swrect.obj \
- $(SLO)$/swregion.obj \
- $(SLO)$/swtypes.obj \
- $(SLO)$/tabcol.obj \
- $(SLO)$/SwSmartTagMgr.obj
+ $(SLO)$/swregion.obj
EXCEPTIONSFILES = \
+ $(SLO)$/SwSmartTagMgr.obj \
+ $(SLO)$/breakit.obj \
+ $(SLO)$/calc.obj \
+ $(SLO)$/init.obj \
+ $(SLO)$/swtypes.obj \
$(SLO)$/tabcol.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/crsr/makefile.mk b/sw/source/core/crsr/makefile.mk
index a257190..c5c59b8 100644
--- a/sw/source/core/crsr/makefile.mk
+++ b/sw/source/core/crsr/makefile.mk
@@ -45,16 +45,11 @@ CDEFS+=-Dmydebug
# --- Files --------------------------------------------------------
EXCEPTIONSFILES= \
- $(SLO)$/crbm.obj \
- $(SLO)$/crsrsh.obj \
- $(SLO)$/bookmrk.obj \
- $(SLO)$/viscrs.obj
-
-SLOFILES = \
$(SLO)$/BlockCursor.obj \
$(SLO)$/bookmrk.obj \
$(SLO)$/callnk.obj \
$(SLO)$/crbm.obj \
+ $(SLO)$/crossrefbookmark.obj \
$(SLO)$/crsrsh.obj \
$(SLO)$/crstrvl.obj \
$(SLO)$/crstrvl1.obj \
@@ -70,8 +65,10 @@ SLOFILES = \
$(SLO)$/trvlreg.obj \
$(SLO)$/trvltbl.obj \
$(SLO)$/unocrsr.obj \
- $(SLO)$/viscrs.obj \
- $(SLO)$/crossrefbookmark.obj
+ $(SLO)$/viscrs.obj
+
+SLOFILES = \
+ $(EXCEPTIONSFILES)
.IF "$(mydebug)" != ""
SLOFILES += \
diff --git a/sw/source/core/doc/makefile.mk b/sw/source/core/doc/makefile.mk
index 5a65b2d..3399c69 100644
--- a/sw/source/core/doc/makefile.mk
+++ b/sw/source/core/doc/makefile.mk
@@ -42,49 +42,49 @@ EXCEPTIONSFILES = \
$(SLO)$/acmplwrd.obj \
$(SLO)$/dbgoutsw.obj \
$(SLO)$/doc.obj \
+ $(SLO)$/docbasic.obj \
$(SLO)$/docbm.obj \
+ $(SLO)$/docchart.obj \
$(SLO)$/doccomp.obj \
+ $(SLO)$/doccorr.obj \
+ $(SLO)$/docdde.obj \
+ $(SLO)$/docdesc.obj \
$(SLO)$/docdraw.obj \
$(SLO)$/docedt.obj \
+ $(SLO)$/docfld.obj \
+ $(SLO)$/docfly.obj \
$(SLO)$/docfmt.obj \
+ $(SLO)$/docftn.obj \
$(SLO)$/docglbl.obj \
$(SLO)$/docglos.obj \
$(SLO)$/doclay.obj \
- $(SLO)$/docxforms.obj \
$(SLO)$/docnew.obj \
$(SLO)$/docnum.obj \
- $(SLO)$/docsort.obj \
- $(SLO)$/doctxm.obj \
- $(SLO)$/number.obj \
- $(SLO)$/swstylemanager.obj \
- $(SLO)$/tblcpy.obj \
- $(SLO)$/tblrwcl.obj \
- $(SLO)$/list.obj
-
-SLOFILES = $(EXCEPTIONSFILES) \
- $(SLO)$/docbasic.obj \
- $(SLO)$/docchart.obj \
- $(SLO)$/doccorr.obj \
- $(SLO)$/docdde.obj \
- $(SLO)$/docdesc.obj \
- $(SLO)$/docfld.obj \
- $(SLO)$/docfly.obj \
- $(SLO)$/docftn.obj \
$(SLO)$/docredln.obj \
$(SLO)$/docruby.obj \
- $(SLO)$/docstat.obj \
+ $(SLO)$/docsort.obj \
+ $(SLO)$/doctxm.obj \
+ $(SLO)$/docxforms.obj \
$(SLO)$/extinput.obj \
$(SLO)$/fmtcol.obj \
$(SLO)$/ftnidx.obj \
$(SLO)$/gctable.obj \
+ $(SLO)$/htmltbl.obj \
$(SLO)$/lineinfo.obj \
+ $(SLO)$/list.obj \
$(SLO)$/notxtfrm.obj \
+ $(SLO)$/number.obj \
$(SLO)$/poolfmt.obj \
- $(SLO)$/sortopt.obj \
$(SLO)$/swserv.obj \
+ $(SLO)$/swstylemanager.obj \
$(SLO)$/tblafmt.obj \
- $(SLO)$/visiturl.obj \
- $(SLO)$/htmltbl.obj
+ $(SLO)$/tblcpy.obj \
+ $(SLO)$/tblrwcl.obj \
+ $(SLO)$/visiturl.obj
+
+SLOFILES = $(EXCEPTIONSFILES) \
+ $(SLO)$/docstat.obj \
+ $(SLO)$/sortopt.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/docnode/makefile.mk b/sw/source/core/docnode/makefile.mk
index d3e5df6..e188c8d 100644
--- a/sw/source/core/docnode/makefile.mk
+++ b/sw/source/core/docnode/makefile.mk
@@ -42,17 +42,7 @@ EXCEPTIONSFILES= \
$(SLO)$/cancellablejob.obj \
$(SLO)$/finalthreadmanager.obj \
$(SLO)$/ndcopy.obj \
- $(SLO)$/ndtbl.obj \
- $(SLO)$/node.obj \
- $(SLO)$/observablethread.obj \
- $(SLO)$/retrieveinputstream.obj \
- $(SLO)$/retrievedinputstreamdata.obj \
- $(SLO)$/swbaslnk.obj \
- $(SLO)$/threadmanager.obj
-
-SLOFILES = \
$(SLO)$/ndindex.obj \
- $(SLO)$/ndcopy.obj \
$(SLO)$/ndnotxt.obj \
$(SLO)$/ndnum.obj \
$(SLO)$/ndsect.obj \
@@ -61,19 +51,20 @@ SLOFILES = \
$(SLO)$/node.obj \
$(SLO)$/node2lay.obj \
$(SLO)$/nodes.obj \
- $(SLO)$/section.obj \
- $(SLO)$/swbaslnk.obj \
- $(SLO)$/retrievedinputstreamdata.obj \
$(SLO)$/observablethread.obj \
- $(SLO)$/cancellablejob.obj \
+ $(SLO)$/retrievedinputstreamdata.obj \
$(SLO)$/retrieveinputstream.obj \
$(SLO)$/retrieveinputstreamconsumer.obj \
- $(SLO)$/threadlistener.obj \
- $(SLO)$/threadmanager.obj \
+ $(SLO)$/section.obj \
+ $(SLO)$/swbaslnk.obj \
$(SLO)$/swthreadmanager.obj \
- $(SLO)$/swthreadjoiner.obj \
+ $(SLO)$/threadlistener.obj \
+ $(SLO)$/threadmanager.obj
+
+SLOFILES = \
+ $(EXCEPTIONSFILES) \
$(SLO)$/pausethreadstarting.obj \
- $(SLO)$/finalthreadmanager.obj
+ $(SLO)$/swthreadjoiner.obj
# --- Targets -------------------------------------------------------
diff --git a/sw/source/core/draw/makefile.mk b/sw/source/core/draw/makefile.mk
index a57b1b5..71d0cbd 100644
--- a/sw/source/core/draw/makefile.mk
+++ b/sw/source/core/draw/makefile.mk
@@ -42,17 +42,15 @@ AUTOSEG=true
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/dview.obj \
- $(SLO)$/dcontact.obj \
- $(SLO)$/dflyobj.obj \
- $(SLO)$/drawdoc.obj \
- $(SLO)$/dobjfac.obj \
- $(SLO)$/dpage.obj
+ $(EXCEPTIONSFILES)
EXCEPTIONSFILES= \
- $(SLO)$/dview.obj \
- $(SLO)$/dcontact.obj \
- $(SLO)$/drawdoc.obj
+ $(SLO)$/dcontact.obj \
+ $(SLO)$/dflyobj.obj \
+ $(SLO)$/dobjfac.obj \
+ $(SLO)$/dpage.obj \
+ $(SLO)$/drawdoc.obj \
+ $(SLO)$/dview.obj \
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/edit/makefile.mk b/sw/source/core/edit/makefile.mk
index a7820b4..355d667 100644
--- a/sw/source/core/edit/makefile.mk
+++ b/sw/source/core/edit/makefile.mk
@@ -41,29 +41,29 @@ AUTOSEG=true
# --- Files --------------------------------------------------------
EXCEPTIONSFILES=\
- $(SLO)$/eddel.obj \
- $(SLO)$/edlingu.obj \
- $(SLO)$/edfldexp.obj \
- $(SLO)$/edtab.obj
-
-SLOFILES = \
- $(EXCEPTIONSFILES)\
$(SLO)$/acorrect.obj \
$(SLO)$/autofmt.obj \
$(SLO)$/edatmisc.obj \
$(SLO)$/edattr.obj \
+ $(SLO)$/eddel.obj \
$(SLO)$/edfcol.obj \
$(SLO)$/edfld.obj \
+ $(SLO)$/edfldexp.obj \
$(SLO)$/edfmt.obj \
$(SLO)$/edglbldc.obj \
$(SLO)$/edglss.obj \
$(SLO)$/editsh.obj \
+ $(SLO)$/edlingu.obj \
$(SLO)$/ednumber.obj \
$(SLO)$/edredln.obj \
+ $(SLO)$/edsect.obj \
+ $(SLO)$/edtab.obj \
$(SLO)$/edtox.obj \
$(SLO)$/edundo.obj \
- $(SLO)$/edws.obj \
- $(SLO)$/edsect.obj
+ $(SLO)$/edws.obj
+
+SLOFILES = \
+ $(EXCEPTIONSFILES)
# --- Targets -------------------------------------------------------
diff --git a/sw/source/core/fields/makefile.mk b/sw/source/core/fields/makefile.mk
index 280fff6..358b3f7 100644
--- a/sw/source/core/fields/makefile.mk
+++ b/sw/source/core/fields/makefile.mk
@@ -63,7 +63,10 @@ CXXFILES = \
SLOFILES = \
- $(SLO)$/textapi.obj \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/scrptfld.obj
+
+EXCEPTIONSFILES = \
$(SLO)$/authfld.obj \
$(SLO)$/cellfml.obj \
$(SLO)$/chpfld.obj \
@@ -76,18 +79,13 @@ SLOFILES = \
$(SLO)$/flddat.obj \
$(SLO)$/flddropdown.obj \
$(SLO)$/fldlst.obj \
- $(SLO)$/scrptfld.obj \
$(SLO)$/macrofld.obj \
$(SLO)$/postithelper.obj \
$(SLO)$/reffld.obj \
$(SLO)$/tblcalc.obj \
+ $(SLO)$/textapi.obj \
$(SLO)$/usrfld.obj
-EXCEPTIONSFILES = \
- $(SLO)$/flddropdown.obj \
- $(SLO)$/postithelper.obj \
- $(SLO)$/docufld.obj
-
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/core/frmedt/makefile.mk b/sw/source/core/frmedt/makefile.mk
index 8b277f8..57baf67 100644
--- a/sw/source/core/frmedt/makefile.mk
+++ b/sw/source/core/frmedt/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -57,18 +57,18 @@ CXXFILES = \
-SLOFILES = $(EXCEPTIONSFILES) \
+SLOFILES = $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES=\
+ $(SLO)$/fecopy.obj \
$(SLO)$/fedesc.obj \
+ $(SLO)$/fefly1.obj \
$(SLO)$/feflyole.obj \
$(SLO)$/feshview.obj \
$(SLO)$/fetab.obj \
+ $(SLO)$/fews.obj \
$(SLO)$/tblsel.obj
-
-EXCEPTIONSFILES=\
- $(SLO)$/fecopy.obj \
- $(SLO)$/fefly1.obj \
- $(SLO)$/fews.obj
-
+
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/layout/makefile.mk b/sw/source/core/layout/makefile.mk
index 7019203..408fea4 100644
--- a/sw/source/core/layout/makefile.mk
+++ b/sw/source/core/layout/makefile.mk
@@ -48,23 +48,8 @@ CDEFS+=-DDEBUG
EXCEPTIONSFILES = \
$(SLO)$/anchoreddrawobject.obj \
- $(SLO)$/flycnt.obj \
- $(SLO)$/laycache.obj \
- $(SLO)$/layouter.obj \
- $(SLO)$/movedfwdfrmsbyobjpos.obj \
- $(SLO)$/newfrm.obj \
- $(SLO)$/objectformatter.obj \
- $(SLO)$/objstmpconsiderwrapinfl.obj \
- $(SLO)$/paintfrm.obj \
- $(SLO)$/softpagebreak.obj \
- $(SLO)$/sortedobjsimpl.obj \
- $(SLO)$/pagechg.obj
-
-
-SLOFILES = \
- $(SLO)$/atrfrm.obj \
$(SLO)$/anchoredobject.obj \
- $(SLO)$/anchoreddrawobject.obj \
+ $(SLO)$/atrfrm.obj \
$(SLO)$/calcmove.obj \
$(SLO)$/colfrm.obj \
$(SLO)$/findfrm.obj \
@@ -83,24 +68,27 @@ SLOFILES = \
$(SLO)$/movedfwdfrmsbyobjpos.obj \
$(SLO)$/newfrm.obj \
$(SLO)$/objectformatter.obj \
- $(SLO)$/objectformattertxtfrm.obj \
- $(SLO)$/objectformatterlayfrm.obj \
$(SLO)$/objstmpconsiderwrapinfl.obj \
$(SLO)$/pagechg.obj \
$(SLO)$/pagedesc.obj \
$(SLO)$/paintfrm.obj \
$(SLO)$/sectfrm.obj \
$(SLO)$/softpagebreak.obj \
- $(SLO)$/sortedobjs.obj \
$(SLO)$/sortedobjsimpl.obj \
$(SLO)$/ssfrm.obj \
- $(SLO)$/swselectionlist.obj \
$(SLO)$/tabfrm.obj \
$(SLO)$/trvlfrm.obj \
- $(SLO)$/unusedf.obj \
$(SLO)$/virtoutp.obj \
$(SLO)$/wsfrm.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/objectformattertxtfrm.obj \
+ $(SLO)$/objectformatterlayfrm.obj \
+ $(SLO)$/sortedobjs.obj \
+ $(SLO)$/swselectionlist.obj \
+ $(SLO)$/unusedf.obj
+
.IF "$(dbgutil)"!=""
SLOFILES += \
$(SLO)$/dbg_lay.obj
diff --git a/sw/source/core/objectpositioning/makefile.mk b/sw/source/core/objectpositioning/makefile.mk
index 4192414..59d5e02 100644
--- a/sw/source/core/objectpositioning/makefile.mk
+++ b/sw/source/core/objectpositioning/makefile.mk
@@ -47,11 +47,14 @@ CDEFS+=-DDEBUG
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/anchoredobjectposition.obj \
+ $(EXCEPTIONSFILES) \
$(SLO)$/ascharanchoredobjectposition.obj \
- $(SLO)$/tolayoutanchoredobjectposition.obj \
- $(SLO)$/tocntntanchoredobjectposition.obj \
- $(SLO)$/environmentofanchoredobject.obj
+ $(SLO)$/environmentofanchoredobject.obj \
+ $(SLO)$/tolayoutanchoredobjectposition.obj
+
+EXCEPTIONSFILES = \
+ $(SLO)$/anchoredobjectposition.obj \
+ $(SLO)$/tocntntanchoredobjectposition.obj
# --- Targets -------------------------------------------------------
diff --git a/sw/source/core/para/makefile.mk b/sw/source/core/para/makefile.mk
index 7005bf0..aee6194 100644
--- a/sw/source/core/para/makefile.mk
+++ b/sw/source/core/para/makefile.mk
@@ -46,6 +46,9 @@ CXXFILES = \
SLOFILES = \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
$(SLO)$/paratr.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/sw3io/makefile.mk b/sw/source/core/sw3io/makefile.mk
index 01a50f5..352953e 100644
--- a/sw/source/core/sw3io/makefile.mk
+++ b/sw/source/core/sw3io/makefile.mk
@@ -38,9 +38,12 @@ TARGET=sw3io
# --- Files --------------------------------------------------------
+EXCEPTIONSFILES = \
+ $(SLO)$/sw3convert.obj \
+ $(SLO)$/swacorr.obj
+
SLOFILES = \
- $(SLO)$/swacorr.obj \
- $(SLO)$/sw3convert.obj
+ $(EXCEPTIONSFILES)
# --- Targets -------------------------------------------------------
diff --git a/sw/source/core/swg/makefile.mk b/sw/source/core/swg/makefile.mk
index c7aa25e..4c838b4 100644
--- a/sw/source/core/swg/makefile.mk
+++ b/sw/source/core/swg/makefile.mk
@@ -40,21 +40,16 @@ TARGET=swg
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/swblocks.obj \
- $(SLO)$/SwXMLBlockImport.obj \
- $(SLO)$/SwXMLSectionList.obj \
- $(SLO)$/SwXMLBlockExport.obj \
- $(SLO)$/SwXMLBlockListContext.obj \
- $(SLO)$/SwXMLTextBlocks.obj \
- $(SLO)$/SwXMLTextBlocks1.obj
+ $(EXCEPTIONSFILES)
EXCEPTIONSFILES = \
- $(SLO)$/SwXMLBlockImport.obj \
- $(SLO)$/SwXMLSectionList.obj \
$(SLO)$/SwXMLBlockExport.obj \
+ $(SLO)$/SwXMLBlockImport.obj \
$(SLO)$/SwXMLBlockListContext.obj \
- $(SLO)$/SwXMLTextBlocks.obj \
- $(SLO)$/SwXMLTextBlocks1.obj
+ $(SLO)$/SwXMLSectionList.obj \
+ $(SLO)$/SwXMLTextBlocks.obj \
+ $(SLO)$/SwXMLTextBlocks1.obj \
+ $(SLO)$/swblocks.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk
index 0076a17..51e3ffb 100644
--- a/sw/source/core/text/makefile.mk
+++ b/sw/source/core/text/makefile.mk
@@ -47,8 +47,20 @@ CFLAGS+=-DENABLE_GRAPHITE
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/atrstck.obj \
- $(SLO)$/EnhancedPDFExportHelper.obj \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/txtcache.obj \
+ $(SLO)$/txtinit.obj
+
+.IF "$(dbgutil)"!=""
+SLOFILES += \
+ $(SLO)$/txtio.obj
+.ENDIF
+
+EXCEPTIONSFILES = \
+ $(SLO)$/EnhancedPDFExportHelper.obj \
+ $(SLO)$/SwGrammarMarkUp.obj \
+ $(SLO)$/atrstck.obj \
+ $(SLO)$/blink.obj \
$(SLO)$/frmcrsr.obj \
$(SLO)$/frmform.obj \
$(SLO)$/frminf.obj \
@@ -61,6 +73,7 @@ SLOFILES = \
$(SLO)$/itrform2.obj \
$(SLO)$/itrpaint.obj \
$(SLO)$/itrtxt.obj \
+ $(SLO)$/noteurl.obj \
$(SLO)$/porexp.obj \
$(SLO)$/porfld.obj \
$(SLO)$/porfly.obj \
@@ -73,45 +86,17 @@ SLOFILES = \
$(SLO)$/portox.obj \
$(SLO)$/portxt.obj \
$(SLO)$/redlnitr.obj \
- $(SLO)$/txtcache.obj \
$(SLO)$/txtdrop.obj \
$(SLO)$/txtfld.obj \
$(SLO)$/txtfly.obj \
$(SLO)$/txtfrm.obj \
$(SLO)$/txtftn.obj \
$(SLO)$/txthyph.obj \
- $(SLO)$/txtinit.obj \
$(SLO)$/txtpaint.obj \
$(SLO)$/txttab.obj \
$(SLO)$/widorp.obj \
- $(SLO)$/blink.obj \
- $(SLO)$/noteurl.obj \
- $(SLO)$/SwGrammarMarkUp.obj \
$(SLO)$/wrong.obj
-.IF "$(dbgutil)"!=""
-SLOFILES += \
- $(SLO)$/txtio.obj
-.ENDIF
-
-EXCEPTIONSFILES = \
- $(SLO)$/EnhancedPDFExportHelper.obj \
- $(SLO)$/inftxt.obj \
- $(SLO)$/itradj.obj \
- $(SLO)$/itrcrsr.obj \
- $(SLO)$/porlay.obj \
- $(SLO)$/pormulti.obj \
- $(SLO)$/SwGrammarMarkUp.obj \
- $(SLO)$/txtfly.obj \
- $(SLO)$/wrong.obj
-
-
-.IF "$(CPUNAME)" == "SPARC"
-.IF "$(OS)" == "NETBSD"
-NOOPTFILES = \
- $(SLO)$/txtftn.obj
-.ENDIF
-.ENDIF
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/tox/makefile.mk b/sw/source/core/tox/makefile.mk
index 60de374..3bbc986 100644
--- a/sw/source/core/tox/makefile.mk
+++ b/sw/source/core/tox/makefile.mk
@@ -43,13 +43,12 @@ CDEFS+=-Dmydebug
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/tox.obj \
- $(SLO)$/toxhlp.obj \
- $(SLO)$/txmsrt.obj
+ $(EXCEPTIONSFILES)
EXCEPTIONSFILES= \
+ $(SLO)$/tox.obj \
$(SLO)$/toxhlp.obj \
- $(SLO)$/tox.obj
+ $(SLO)$/txmsrt.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/txtnode/makefile.mk b/sw/source/core/txtnode/makefile.mk
index f03f96c..066abd7 100644
--- a/sw/source/core/txtnode/makefile.mk
+++ b/sw/source/core/txtnode/makefile.mk
@@ -43,39 +43,30 @@ CDEFS+=-Dmydebug
# --- Files --------------------------------------------------------
SLOFILES = \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/atrref.obj \
+ $(SLO)$/chrfmt.obj \
+ $(SLO)$/modeltoviewhelper.obj \
+ $(SLO)$/ndhints.obj \
+ $(SLO)$/txatbase.obj
+
+EXCEPTIONSFILES = \
+ $(SLO)$/SwGrammarContact.obj \
$(SLO)$/atrfld.obj \
$(SLO)$/atrflyin.obj \
$(SLO)$/atrftn.obj \
- $(SLO)$/atrref.obj \
$(SLO)$/atrtox.obj \
- $(SLO)$/chrfmt.obj \
$(SLO)$/fmtatr2.obj \
- $(SLO)$/fntcap.obj \
$(SLO)$/fntcache.obj \
- $(SLO)$/swfntcch.obj \
- $(SLO)$/SwGrammarContact.obj \
- $(SLO)$/modeltoviewhelper.obj \
- $(SLO)$/ndhints.obj \
+ $(SLO)$/fntcap.obj \
$(SLO)$/ndtxt.obj \
+ $(SLO)$/swfntcch.obj \
$(SLO)$/swfont.obj \
$(SLO)$/thints.obj \
- $(SLO)$/txatbase.obj \
$(SLO)$/txatritr.obj \
$(SLO)$/txtatr2.obj \
- $(SLO)$/txtedt.obj
-
-
-EXCEPTIONSFILES = \
- $(SLO)$/fmtatr2.obj \
- $(SLO)$/atrtox.obj \
- $(SLO)$/atrflyin.obj \
- $(SLO)$/docnew.obj \
- $(SLO)$/fntcache.obj \
- $(SLO)$/ndtxt.obj \
- $(SLO)$/thints.obj \
$(SLO)$/txtedt.obj
-
.IF "$(dbutil)" != ""
OFILES+=$(SLO)$/dbchratr.$(QBJX)
.ENDIF
diff --git a/sw/source/core/undo/makefile.mk b/sw/source/core/undo/makefile.mk
index c381761..d48ec2d 100644
--- a/sw/source/core/undo/makefile.mk
+++ b/sw/source/core/undo/makefile.mk
@@ -46,17 +46,9 @@ SRC1FILES = \
EXCEPTIONSFILES = \
$(SLO)$/SwRewriter.obj \
- $(SLO)$/unattr.obj \
- $(SLO)$/undobj.obj \
- $(SLO)$/undraw.obj \
- $(SLO)$/unovwr.obj \
- $(SLO)$/untbl.obj
-
-SLOFILES = \
- $(SLO)$/SwRewriter.obj \
$(SLO)$/SwUndoField.obj \
- $(SLO)$/SwUndoPageDesc.obj \
$(SLO)$/SwUndoFmt.obj \
+ $(SLO)$/SwUndoPageDesc.obj \
$(SLO)$/SwUndoTOXChange.obj \
$(SLO)$/docundo.obj \
$(SLO)$/rolbck.obj \
@@ -65,7 +57,7 @@ SLOFILES = \
$(SLO)$/undel.obj \
$(SLO)$/undobj.obj \
$(SLO)$/undobj1.obj \
- $(SLO)$/undoflystrattr.obj \
+ $(SLO)$/undoflystrattr.obj \
$(SLO)$/undraw.obj \
$(SLO)$/unfmco.obj \
$(SLO)$/unins.obj \
@@ -80,6 +72,9 @@ SLOFILES = \
$(SLO)$/untbl.obj \
$(SLO)$/untblk.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES)
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/filter/ascii/makefile.mk b/sw/source/filter/ascii/makefile.mk
index e2bd2be..4bc8bfa 100644
--- a/sw/source/filter/ascii/makefile.mk
+++ b/sw/source/filter/ascii/makefile.mk
@@ -43,13 +43,14 @@ CXXFILES = \
parasc.cxx \
wrtasc.cxx
-
-
-SLOFILES = \
+EXCEPTIONSFILES = \
$(SLO)$/ascatr.obj \
$(SLO)$/parasc.obj \
$(SLO)$/wrtasc.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES)
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/filter/basflt/makefile.mk b/sw/source/filter/basflt/makefile.mk
index 7713d12..e526227 100644
--- a/sw/source/filter/basflt/makefile.mk
+++ b/sw/source/filter/basflt/makefile.mk
@@ -43,14 +43,13 @@ CDEFS+=-Dmydebug
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/docfact.obj \
- $(SLO)$/fltini.obj \
- $(SLO)$/shellio.obj \
- $(SLO)$/iodetect.obj
+ $(EXCEPTIONSFILES) \
EXCEPTIONSFILES = \
+ $(SLO)$/docfact.obj \
$(SLO)$/fltini.obj \
- $(SLO)$/iodetect.obj
+ $(SLO)$/iodetect.obj \
+ $(SLO)$/shellio.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/filter/html/makefile.mk b/sw/source/filter/html/makefile.mk
index b99cc67..f64a6d5 100644
--- a/sw/source/filter/html/makefile.mk
+++ b/sw/source/filter/html/makefile.mk
@@ -44,8 +44,13 @@ CDEFS=$(CDEFS) -Dmydebug
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/css1atr.obj \
+ $(EXCEPTIONSFILES) \
$(SLO)$/css1kywd.obj \
+ $(SLO)$/htmlflyt.obj
+
+EXCEPTIONSFILES = \
+ $(SLO)$/SwAppletImpl.obj \
+ $(SLO)$/css1atr.obj \
$(SLO)$/htmlatr.obj \
$(SLO)$/htmlbas.obj \
$(SLO)$/htmlcss1.obj \
@@ -54,7 +59,6 @@ SLOFILES = \
$(SLO)$/htmlfld.obj \
$(SLO)$/htmlfldw.obj \
$(SLO)$/htmlfly.obj \
- $(SLO)$/htmlflyt.obj \
$(SLO)$/htmlform.obj \
$(SLO)$/htmlforw.obj \
$(SLO)$/htmlftn.obj \
@@ -67,14 +71,6 @@ SLOFILES = \
$(SLO)$/parcss1.obj \
$(SLO)$/svxcss1.obj \
$(SLO)$/swhtml.obj \
- $(SLO)$/wrthtml.obj \
- $(SLO)$/SwAppletImpl.obj \
-
-EXCEPTIONSFILES = \
- $(SLO)$/htmlfld.obj \
- $(SLO)$/htmlplug.obj \
- $(SLO)$/htmlsect.obj \
- $(SLO)$/swhtml.obj \
$(SLO)$/wrthtml.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/filter/rtf/makefile.mk b/sw/source/filter/rtf/makefile.mk
index e7310f2..5b073fa 100644
--- a/sw/source/filter/rtf/makefile.mk
+++ b/sw/source/filter/rtf/makefile.mk
@@ -44,17 +44,15 @@ CDEFS=$(CDEFS) -Dmydebug
# --- Files --------------------------------------------------------
EXCEPTIONSFILES= \
+ $(SLO)$/rtffld.obj \
$(SLO)$/rtffly.obj \
$(SLO)$/rtfnum.obj \
+ $(SLO)$/rtftbl.obj \
$(SLO)$/swparrtf.obj
SLOFILES = \
- $(SLO)$/rtffld.obj \
- $(SLO)$/rtffly.obj \
- $(SLO)$/rtfnum.obj \
- $(SLO)$/rtftbl.obj \
- $(SLO)$/swparrtf.obj
+ $(EXCEPTIONSFILES)
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/filter/writer/makefile.mk b/sw/source/filter/writer/makefile.mk
index d08caa9..1c11b84 100644
--- a/sw/source/filter/writer/makefile.mk
+++ b/sw/source/filter/writer/makefile.mk
@@ -44,10 +44,14 @@ CXXFILES = \
wrtswtbl.cxx
SLOFILES = \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
$(SLO)$/writer.obj \
$(SLO)$/wrt_fn.obj \
$(SLO)$/wrtswtbl.obj
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/filter/ww1/makefile.mk b/sw/source/filter/ww1/makefile.mk
index 4f751cb..58930bd 100644
--- a/sw/source/filter/ww1/makefile.mk
+++ b/sw/source/filter/ww1/makefile.mk
@@ -43,15 +43,14 @@ CDEFS=$(CDEFS) -Dmydebug
# --- Files --------------------------------------------------------
EXCEPTIONSFILES= \
+ $(SLO)$/fltshell.obj \
$(SLO)$/w1filter.obj \
- $(SLO)$/fltshell.obj
+ $(SLO)$/w1par.obj \
+ $(SLO)$/w1sprm.obj
SLOFILES = \
- $(SLO)$/w1par.obj \
- $(SLO)$/w1class.obj \
- $(SLO)$/w1filter.obj \
- $(SLO)$/w1sprm.obj \
- $(SLO)$/fltshell.obj \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/w1class.obj
# --- Targets -------------------------------------------------------
diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk
index ca9116c..9c9455b 100644
--- a/sw/source/filter/ww8/makefile.mk
+++ b/sw/source/filter/ww8/makefile.mk
@@ -44,52 +44,31 @@ CDEFS=$(CDEFS) -Dmydebug
# --- Files --------------------------------------------------------
EXCEPTIONSFILES = \
- $(SLO)$/wrtww8gr.obj \
- $(SLO)$/ww8par2.obj \
- $(SLO)$/ww8par3.obj \
- $(SLO)$/ww8par5.obj \
- $(SLO)$/tracer.obj \
- $(SLO)$/fields.obj \
- $(SLO)$/styles.obj \
- $(SLO)$/ww8graf.obj \
- $(SLO)$/ww8graf2.obj \
- $(SLO)$/wrtw8esh.obj \
- $(SLO)$/wrtw8nds.obj \
- $(SLO)$/wrtw8num.obj \
- $(SLO)$/wrtw8sty.obj \
- $(SLO)$/wrtww8.obj \
- $(SLO)$/docxattributeoutput.obj \
- $(SLO)$/docxexportfilter.obj \
- $(SLO)$/docxexport.obj \
- $(SLO)$/ww8atr.obj \
- $(SLO)$/ww8par.obj \
- $(SLO)$/ww8par6.obj \
- $(SLO)$/writerhelper.obj \
- $(SLO)$/writerwordglue.obj \
- $(SLO)$/ww8scan.obj \
- $(SLO)$/WW8TableInfo.obj \
$(SLO)$/WW8FFData.obj \
- $(SLO)$/WW8Sttbf.obj \
- $(SLO)$/ww8toolbar.obj \
$(SLO)$/WW8FibData.obj \
+ $(SLO)$/WW8Sttbf.obj \
+ $(SLO)$/WW8TableInfo.obj \
+ $(SLO)$/docxattributeoutput.obj \
+ $(SLO)$/docxexport.obj \
+ $(SLO)$/docxexportfilter.obj \
+ $(SLO)$/fields.obj \
+ $(SLO)$/rtfattributeoutput.obj \
+ $(SLO)$/rtfexport.obj \
$(SLO)$/rtfexportfilter.obj \
$(SLO)$/rtfimportfilter.obj \
- $(SLO)$/rtfattributeoutput.obj \
$(SLO)$/rtfsdrexport.obj \
- $(SLO)$/rtfexport.obj
-
-
-SLOFILES = \
+ $(SLO)$/styles.obj \
+ $(SLO)$/tracer.obj \
+ $(SLO)$/writerhelper.obj \
+ $(SLO)$/writerwordglue.obj \
$(SLO)$/wrtw8esh.obj \
$(SLO)$/wrtw8nds.obj \
$(SLO)$/wrtw8num.obj \
$(SLO)$/wrtw8sty.obj \
$(SLO)$/wrtww8.obj \
$(SLO)$/wrtww8gr.obj \
- $(SLO)$/docxattributeoutput.obj \
- $(SLO)$/docxexportfilter.obj \
- $(SLO)$/docxexport.obj \
$(SLO)$/ww8atr.obj \
+ $(SLO)$/ww8glsy.obj \
$(SLO)$/ww8graf.obj \
$(SLO)$/ww8graf2.obj \
$(SLO)$/ww8par.obj \
@@ -98,23 +77,12 @@ SLOFILES = \
$(SLO)$/ww8par4.obj \
$(SLO)$/ww8par5.obj \
$(SLO)$/ww8par6.obj \
- $(SLO)$/ww8glsy.obj \
- $(SLO)$/tracer.obj \
- $(SLO)$/fields.obj \
- $(SLO)$/styles.obj \
$(SLO)$/ww8scan.obj \
- $(SLO)$/writerhelper.obj \
- $(SLO)$/writerwordglue.obj \
- $(SLO)$/WW8TableInfo.obj \
- $(SLO)$/WW8FFData.obj \
- $(SLO)$/WW8Sttbf.obj \
- $(SLO)$/ww8toolbar.obj \
- $(SLO)$/WW8FibData.obj \
- $(SLO)$/rtfexportfilter.obj \
- $(SLO)$/rtfimportfilter.obj \
- $(SLO)$/rtfattributeoutput.obj \
- $(SLO)$/rtfsdrexport.obj \
- $(SLO)$/rtfexport.obj
+ $(SLO)$/ww8toolbar.obj
+
+
+SLOFILES = \
+ $(EXCEPTIONSFILES)
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/filter/xml/makefile.mk b/sw/source/filter/xml/makefile.mk
index c1191fe..10a653f 100644
--- a/sw/source/filter/xml/makefile.mk
+++ b/sw/source/filter/xml/makefile.mk
@@ -43,51 +43,33 @@ CDEFS=$(CDEFS) -Dmydebug
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/swxml.obj \
- $(SLO)$/xmlimp.obj \
- $(SLO)$/wrtxml.obj \
- $(SLO)$/xmlexp.obj \
- $(SLO)$/xmltext.obj \
- $(SLO)$/xmltexte.obj \
- $(SLO)$/xmltexti.obj \
- $(SLO)$/xmltbli.obj \
- $(SLO)$/xmltble.obj \
- $(SLO)$/xmlfmt.obj \
- $(SLO)$/xmlfmte.obj \
- $(SLO)$/xmlmeta.obj \
- $(SLO)$/xmlscript.obj \
- $(SLO)$/xmlitemm.obj \
- $(SLO)$/xmlitemi.obj \
- $(SLO)$/xmliteme.obj \
- $(SLO)$/xmlithlp.obj \
- $(SLO)$/xmlbrsh.obj \
- $(SLO)$/xmlfonte.obj \
- $(SLO)$/XMLRedlineImportHelper.obj \
- $(SLO)$/xmlitem.obj \
- $(SLO)$/xmlitmpr.obj \
+ $(EXCEPTIONSFILES) \
$(SLO)$/xmlimpit.obj \
- $(SLO)$/xmlexpit.obj
+ $(SLO)$/xmlitemm.obj \
+ $(SLO)$/xmlitmpr.obj
EXCEPTIONSFILES= \
+ $(SLO)$/XMLRedlineImportHelper.obj \
$(SLO)$/swxml.obj \
- $(SLO)$/xmlimp.obj \
$(SLO)$/wrtxml.obj \
+ $(SLO)$/xmlbrsh.obj \
$(SLO)$/xmlexp.obj \
- $(SLO)$/xmltext.obj \
- $(SLO)$/xmltexti.obj \
- $(SLO)$/xmltexte.obj \
- $(SLO)$/xmltbli.obj \
- $(SLO)$/xmltble.obj \
+ $(SLO)$/xmlexpit.obj \
$(SLO)$/xmlfmt.obj \
$(SLO)$/xmlfmte.obj \
- $(SLO)$/xmlmeta.obj \
- $(SLO)$/xmlscript.obj \
- $(SLO)$/xmlitemi.obj \
+ $(SLO)$/xmlfonte.obj \
+ $(SLO)$/xmlimp.obj \
+ $(SLO)$/xmlitem.obj \
$(SLO)$/xmliteme.obj \
+ $(SLO)$/xmlitemi.obj \
$(SLO)$/xmlithlp.obj \
- $(SLO)$/xmlbrsh.obj \
- $(SLO)$/xmlfonte.obj \
- $(SLO)$/XMLRedlineImportHelper.obj
+ $(SLO)$/xmlmeta.obj \
+ $(SLO)$/xmlscript.obj \
+ $(SLO)$/xmltble.obj \
+ $(SLO)$/xmltbli.obj \
+ $(SLO)$/xmltext.obj \
+ $(SLO)$/xmltexte.obj \
+ $(SLO)$/xmltexti.obj
# --- Targets -------------------------------------------------------
diff --git a/sw/source/ui/app/makefile.mk b/sw/source/ui/app/makefile.mk
index 88f9ff9..6048ad2 100644
--- a/sw/source/ui/app/makefile.mk
+++ b/sw/source/ui/app/makefile.mk
@@ -50,6 +50,9 @@ SRC1FILES =\
SLOFILES = \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
$(SLO)$/appenv.obj \
$(SLO)$/apphdl.obj \
$(SLO)$/applab.obj \
@@ -61,19 +64,10 @@ SLOFILES = \
$(SLO)$/docst.obj \
$(SLO)$/docstyle.obj \
$(SLO)$/mainwn.obj \
- $(SLO)$/swmodule.obj \
+ $(SLO)$/swdll.obj \
$(SLO)$/swmodul1.obj \
- $(SLO)$/swdll.obj \
- $(SLO)$/swwait.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/docsh.obj \
- $(SLO)$/docst.obj \
- $(SLO)$/docshini.obj \
$(SLO)$/swmodule.obj \
- $(SLO)$/swmodul1.obj \
- $(SLO)$/apphdl.obj \
- $(SLO)$/docsh2.obj
+ $(SLO)$/swwait.obj
LIB1TARGET= $(SLB)$/app.lib
diff --git a/sw/source/ui/cctrl/makefile.mk b/sw/source/ui/cctrl/makefile.mk
index 33ba83f..9a72754 100644
--- a/sw/source/ui/cctrl/makefile.mk
+++ b/sw/source/ui/cctrl/makefile.mk
@@ -46,13 +46,13 @@ CXXFILES = \
swlbox.cxx
SLOFILES = \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
$(SLO)$/actctrl.obj \
$(SLO)$/popbox.obj \
$(SLO)$/swlbox.obj
-EXCEPTIONSFILES = \
- $(SLO)$/popbox.obj
-
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/ui/chrdlg/makefile.mk b/sw/source/ui/chrdlg/makefile.mk
index 42aad1a..8d8c362 100644
--- a/sw/source/ui/chrdlg/makefile.mk
+++ b/sw/source/ui/chrdlg/makefile.mk
@@ -48,15 +48,18 @@ SRC1FILES = \
paradlg.src \
numpara.src
-SLOFILES = \
+EXCEPTIONSFILES = \
$(SLO)$/break.obj \
+ $(SLO)$/ccoll.obj \
$(SLO)$/chardlg.obj \
$(SLO)$/drpcps.obj \
- $(SLO)$/ccoll.obj \
- $(SLO)$/swuiccoll.obj \
+ $(SLO)$/numpara.obj \
$(SLO)$/pardlg.obj \
- $(SLO)$/tblnumfm.obj \
- $(SLO)$/numpara.obj
+ $(SLO)$/swuiccoll.obj \
+ $(SLO)$/tblnumfm.obj
+
+SLOFILES = \
+ $(EXCEPTIONSFILES)
LIB1TARGET = $(SLB)$/$(TARGET).lib
diff --git a/sw/source/ui/config/makefile.mk b/sw/source/ui/config/makefile.mk
index 4b8ed01..d624e46 100644
--- a/sw/source/ui/config/makefile.mk
+++ b/sw/source/ui/config/makefile.mk
@@ -49,24 +49,24 @@ SRC1FILES = \
redlopt.src
EXCEPTIONSFILES = \
- $(SLO)$/mailconfigpage.obj \
- $(SLO)$/optcomp.obj \
- $(SLO)$/optload.obj
-
-SLOFILES = \
- $(EXCEPTIONSFILES) \
$(SLO)$/barcfg.obj \
- $(SLO)$/caption.obj \
$(SLO)$/cfgitems.obj \
- $(SLO)$/dbconfig.obj \
$(SLO)$/fontcfg.obj \
+ $(SLO)$/mailconfigpage.obj \
$(SLO)$/modcfg.obj \
+ $(SLO)$/optcomp.obj \
+ $(SLO)$/optload.obj \
$(SLO)$/optpage.obj \
$(SLO)$/prtopt.obj \
$(SLO)$/uinums.obj \
$(SLO)$/usrpref.obj \
$(SLO)$/viewopt.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/caption.obj \
+ $(SLO)$/dbconfig.obj
+
LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1OBJFILES = \
diff --git a/sw/source/ui/dbui/makefile.mk b/sw/source/ui/dbui/makefile.mk
index c2477b0..f125f07 100644
--- a/sw/source/ui/dbui/makefile.mk
+++ b/sw/source/ui/dbui/makefile.mk
@@ -69,38 +69,24 @@ EXCEPTIONSFILES= \
$(SLO)$/dbmgr.obj \
$(SLO)$/dbtablepreviewdialog.obj \
$(SLO)$/dbtree.obj \
+ $(SLO)$/dbui.obj \
$(SLO)$/maildispatcher.obj \
$(SLO)$/mailmergechildwindow.obj \
$(SLO)$/mailmergehelper.obj \
- $(SLO)$/mmaddressblockpage.obj \
- $(SLO)$/mmconfigitem.obj \
- $(SLO)$/mmlayoutpage.obj \
- $(SLO)$/mmgreetingspage.obj \
- $(SLO)$/mmoutputpage.obj
-
-SLOFILES = \
- $(SLO)$/addresslistdialog.obj \
- $(SLO)$/createaddresslistdialog.obj \
- $(SLO)$/customizeaddresslistdialog.obj \
- $(SLO)$/dbinsdlg.obj \
- $(SLO)$/dbmgr.obj \
- $(SLO)$/dbtree.obj \
- $(SLO)$/dbtablepreviewdialog.obj \
- $(SLO)$/maildispatcher.obj \
- $(SLO)$/mailmergehelper.obj \
$(SLO)$/mailmergewizard.obj \
- $(SLO)$/mailmergechildwindow.obj \
+ $(SLO)$/mmaddressblockpage.obj \
$(SLO)$/mmconfigitem.obj \
$(SLO)$/mmdocselectpage.obj \
+ $(SLO)$/mmgreetingspage.obj \
$(SLO)$/mmlayoutpage.obj \
+ $(SLO)$/mmmergepage.obj \
$(SLO)$/mmoutputpage.obj \
$(SLO)$/mmoutputtypepage.obj \
- $(SLO)$/mmaddressblockpage.obj \
- $(SLO)$/mmgreetingspage.obj \
- $(SLO)$/mmmergepage.obj \
$(SLO)$/mmpreparemergepage.obj \
- $(SLO)$/dbui.obj \
- $(SLO)$/selectdbtabledialog.obj \
+ $(SLO)$/selectdbtabledialog.obj
+
+SLOFILES = \
+ $(EXCEPTIONSFILES) \
$(SLO)$/swdbtoolsclient.obj
diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
index 758ea00..033703f 100644
--- a/sw/source/ui/dialog/makefile.mk
+++ b/sw/source/ui/dialog/makefile.mk
@@ -50,23 +50,23 @@ SRC1FILES = \
wordcountdialog.src
EXCEPTIONSFILES = \
- $(SLO)$/SwSpellDialogChildWindow.obj
-
-SLOFILES = \
+ $(SLO)$/SwSpellDialogChildWindow.obj \
$(SLO)$/abstract.obj \
$(SLO)$/addrdlg.obj \
$(SLO)$/ascfldlg.obj \
$(SLO)$/docstdlg.obj \
$(SLO)$/macassgn.obj \
- $(SLO)$/SwSpellDialogChildWindow.obj \
- $(SLO)$/regionsw.obj \
- $(SLO)$/uiregionsw.obj \
- $(SLO)$/swabstdlg.obj \
- $(SLO)$/swuiexp.obj \
- $(SLO)$/swwrtshitem.obj \
- $(SLO)$/swdialmgr.obj \
- $(SLO)$/wordcountdialog.obj \
- $(SLO)$/swdlgfact.obj
+ $(SLO)$/regionsw.obj \
+ $(SLO)$/swabstdlg.obj \
+ $(SLO)$/swdialmgr.obj \
+ $(SLO)$/swdlgfact.obj \
+ $(SLO)$/swuiexp.obj \
+ $(SLO)$/uiregionsw.obj \
+ $(SLO)$/wordcountdialog.obj
+
+SLOFILES = \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/swwrtshitem.obj
LIB1TARGET = $(SLB)$/$(TARGET).lib
diff --git a/sw/source/ui/dochdl/makefile.mk b/sw/source/ui/dochdl/makefile.mk
index 4840005..5728eaa 100644
--- a/sw/source/ui/dochdl/makefile.mk
+++ b/sw/source/ui/dochdl/makefile.mk
@@ -44,11 +44,11 @@ SRC1FILES = \
selglos.src
SLOFILES = \
- $(SLO)$/gloshdl.obj \
- $(SLO)$/selglos.obj \
- $(SLO)$/swdtflvr.obj
+ $(EXCEPTIONSFILES)
EXCEPTIONSFILES = \
+ $(SLO)$/gloshdl.obj \
+ $(SLO)$/selglos.obj \
$(SLO)$/swdtflvr.obj
# $(SLO)$/dataex.obj \
diff --git a/sw/source/ui/envelp/makefile.mk b/sw/source/ui/envelp/makefile.mk
index 3010601..cb38ffd 100644
--- a/sw/source/ui/envelp/makefile.mk
+++ b/sw/source/ui/envelp/makefile.mk
@@ -50,23 +50,22 @@ SRC1FILES =\
mailmrge.src
SLOFILES = \
- $(SLO)$/envfmt.obj \
- $(SLO)$/envimg.obj \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/labimg.obj
+
+EXCEPTIONSFILES= \
+ $(SLO)$/envfmt.obj \
+ $(SLO)$/envimg.obj \
$(SLO)$/envlop1.obj \
- $(SLO)$/envprt.obj \
- $(SLO)$/labelcfg.obj \
- $(SLO)$/label1.obj \
+ $(SLO)$/envprt.obj \
+ $(SLO)$/label1.obj \
+ $(SLO)$/labelcfg.obj \
$(SLO)$/labelexp.obj \
- $(SLO)$/labfmt.obj \
- $(SLO)$/labprt.obj \
- $(SLO)$/labimg.obj \
+ $(SLO)$/labfmt.obj \
+ $(SLO)$/labprt.obj \
$(SLO)$/mailmrge.obj \
$(SLO)$/syncbtn.obj
-EXCEPTIONSFILES= \
- $(SLO)$/labelexp.obj \
- $(SLO)$/mailmrge.obj
-
LIB1TARGET = $(SLB)$/$(TARGET).lib
LIB1OBJFILES = \
diff --git a/sw/source/ui/fldui/makefile.mk b/sw/source/ui/fldui/makefile.mk
index ee9dbff..212c3da 100644
--- a/sw/source/ui/fldui/makefile.mk
+++ b/sw/source/ui/fldui/makefile.mk
@@ -54,8 +54,12 @@ SRC1FILES = \
inpdlg.src
SLOFILES = \
- $(SLO)$/changedb.obj \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
$(SLO)$/DropDownFieldDialog.obj \
+ $(SLO)$/FldRefTreeListBox.obj \
+ $(SLO)$/changedb.obj \
$(SLO)$/flddb.obj \
$(SLO)$/flddinf.obj \
$(SLO)$/flddok.obj \
@@ -66,17 +70,9 @@ SLOFILES = \
$(SLO)$/fldref.obj \
$(SLO)$/fldtdlg.obj \
$(SLO)$/fldvar.obj \
- $(SLO)$/javaedit.obj \
- $(SLO)$/inpdlg.obj \
$(SLO)$/fldwrap.obj \
- $(SLO)$/xfldui.obj \
- $(SLO)$/FldRefTreeListBox.obj
-
-
-EXCEPTIONSFILES = \
- $(SLO)$/fldtdlg.obj \
- $(SLO)$/fldedt.obj \
- $(SLO)$/flddinf.obj \
+ $(SLO)$/inpdlg.obj \
+ $(SLO)$/javaedit.obj \
$(SLO)$/xfldui.obj
LIB1TARGET = $(SLB)$/$(TARGET).lib
diff --git a/sw/source/ui/fmtui/makefile.mk b/sw/source/ui/fmtui/makefile.mk
index 37ad48d..9474cfa 100644
--- a/sw/source/ui/fmtui/makefile.mk
+++ b/sw/source/ui/fmtui/makefile.mk
@@ -43,6 +43,9 @@ SRC1FILES = \
tmpdlg.src
SLOFILES = \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
$(SLO)$/tmpdlg.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/ui/frmdlg/makefile.mk b/sw/source/ui/frmdlg/makefile.mk
index a7addb0..3caff55 100644
--- a/sw/source/ui/frmdlg/makefile.mk
+++ b/sw/source/ui/frmdlg/makefile.mk
@@ -48,9 +48,12 @@ SRC1FILES = \
wrap.src
SLOFILES = \
- $(SLO)$/colmgr.obj \
- $(SLO)$/column.obj \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/colmgr.obj
+
+EXCEPTIONSFILES = \
$(SLO)$/colex.obj \
+ $(SLO)$/column.obj \
$(SLO)$/cption.obj \
$(SLO)$/frmdlg.obj \
$(SLO)$/frmmgr.obj \
@@ -59,10 +62,6 @@ SLOFILES = \
$(SLO)$/uiborder.obj \
$(SLO)$/wrap.obj
-EXCEPTIONSFILES = \
- $(SLO)$/frmpage.obj \
- $(SLO)$/cption.obj
-
LIB1TARGET = $(SLB)$/$(TARGET).lib
LIB1OBJFILES = \
diff --git a/sw/source/ui/globdoc/makefile.mk b/sw/source/ui/globdoc/makefile.mk
index d75eb7a..f3563b8 100644
--- a/sw/source/ui/globdoc/makefile.mk
+++ b/sw/source/ui/globdoc/makefile.mk
@@ -43,6 +43,9 @@ SRC1FILES = \
globdoc.src
SLOFILES = \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
$(SLO)$/globdoc.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/ui/index/makefile.mk b/sw/source/ui/index/makefile.mk
index 647b579..a42f981 100644
--- a/sw/source/ui/index/makefile.mk
+++ b/sw/source/ui/index/makefile.mk
@@ -46,16 +46,15 @@ SRC1FILES = \
EXCEPTIONSFILES = \
$(SLO)$/cnttab.obj \
- $(SLO)$/cntex.obj
-
-SLOFILES = \
- $(SLO)$/cnttab.obj \
$(SLO)$/cntex.obj \
$(SLO)$/idxmrk.obj \
- $(SLO)$/swuiidxmrk.obj \
$(SLO)$/multmrk.obj \
+ $(SLO)$/swuiidxmrk.obj \
$(SLO)$/toxmgr.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES)
+
LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1OBJFILES = \
diff --git a/sw/source/ui/lingu/makefile.mk b/sw/source/ui/lingu/makefile.mk
index 617910a..0abd0c3 100644
--- a/sw/source/ui/lingu/makefile.mk
+++ b/sw/source/ui/lingu/makefile.mk
@@ -38,13 +38,13 @@ TARGET=lingu
# --- Files --------------------------------------------------------
EXCEPTIONSFILES= \
+ $(SLO)$/hhcwrp.obj \
+ $(SLO)$/hyp.obj \
$(SLO)$/olmenu.obj \
+ $(SLO)$/sdrhhcwrap.obj
SLOFILES = \
- $(SLO)$/hyp.obj \
- $(SLO)$/olmenu.obj \
- $(SLO)$/sdrhhcwrap.obj \
- $(SLO)$/hhcwrp.obj
+ $(EXCEPTIONSFILES)
SRS1NAME=$(TARGET)
SRC1FILES = \
diff --git a/sw/source/ui/misc/makefile.mk b/sw/source/ui/misc/makefile.mk
index d2ed28a..4448c9a 100644
--- a/sw/source/ui/misc/makefile.mk
+++ b/sw/source/ui/misc/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -56,15 +56,6 @@ SRC1FILES=\
titlepage.src
EXCEPTIONSFILES = \
- $(SLO)$/glossary.obj \
- $(SLO)$/glosdoc.obj \
- $(SLO)$/glshell.obj \
- $(SLO)$/numberingtypelistbox.obj \
- $(SLO)$/outline.obj \
- $(SLO)$/redlndlg.obj
-
-
-SLOFILES = \
$(SLO)$/bookmark.obj \
$(SLO)$/docfnote.obj \
$(SLO)$/glosbib.obj \
@@ -74,15 +65,19 @@ SLOFILES = \
$(SLO)$/insfnote.obj \
$(SLO)$/insrule.obj \
$(SLO)$/linenum.obj \
- $(SLO)$/titlepage.obj \
$(SLO)$/num.obj \
$(SLO)$/numberingtypelistbox.obj \
$(SLO)$/outline.obj \
$(SLO)$/pgfnote.obj \
$(SLO)$/pggrid.obj \
$(SLO)$/redlndlg.obj \
- $(SLO)$/swmodalredlineacceptdlg.obj \
- $(SLO)$/srtdlg.obj
+ $(SLO)$/srtdlg.obj \
+ $(SLO)$/swmodalredlineacceptdlg.obj \
+ $(SLO)$/titlepage.obj
+
+
+SLOFILES = \
+ $(EXCEPTIONSFILES)
LIB1TARGET = $(SLB)$/$(TARGET).lib
@@ -91,7 +86,7 @@ LIB1OBJFILES = \
$(SLO)$/glshell.obj \
$(SLO)$/numberingtypelistbox.obj \
$(SLO)$/redlndlg.obj
-
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
index 2405d4b..13e3600 100644
--- a/sw/source/ui/ribbar/makefile.mk
+++ b/sw/source/ui/ribbar/makefile.mk
@@ -46,23 +46,21 @@ SRC1FILES = \
workctrl.src
EXCEPTIONSFILES = \
- $(SLO)$/tblctrl.obj \
- $(SLO)$/tbxanchr.obj \
- $(SLO)$/workctrl.obj
-
-SLOFILES = \
- $(SLO)$/inputwin.obj \
- $(SLO)$/tbxanchr.obj \
- $(SLO)$/conrect.obj \
- $(SLO)$/conform.obj \
- $(SLO)$/conpoly.obj \
$(SLO)$/conarc.obj \
$(SLO)$/concustomshape.obj \
- $(SLO)$/dselect.obj \
+ $(SLO)$/conform.obj \
+ $(SLO)$/conpoly.obj \
+ $(SLO)$/conrect.obj \
$(SLO)$/drawbase.obj \
+ $(SLO)$/dselect.obj \
+ $(SLO)$/inputwin.obj \
$(SLO)$/tblctrl.obj \
+ $(SLO)$/tbxanchr.obj \
$(SLO)$/workctrl.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES)
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/ui/shells/makefile.mk b/sw/source/ui/shells/makefile.mk
index dce62a2..36eb9b6 100644
--- a/sw/source/ui/shells/makefile.mk
+++ b/sw/source/ui/shells/makefile.mk
@@ -43,7 +43,9 @@ SRC1FILES = \
shells.src
SLOFILES = \
- $(SLO)$/langhelper.obj \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
$(SLO)$/annotsh.obj \
$(SLO)$/basesh.obj \
$(SLO)$/beziersh.obj \
@@ -56,8 +58,9 @@ SLOFILES = \
$(SLO)$/frmsh.obj \
$(SLO)$/grfsh.obj \
$(SLO)$/grfshex.obj \
- $(SLO)$/mediash.obj \
+ $(SLO)$/langhelper.obj \
$(SLO)$/listsh.obj \
+ $(SLO)$/mediash.obj \
$(SLO)$/olesh.obj \
$(SLO)$/slotadd.obj \
$(SLO)$/tabsh.obj \
@@ -72,20 +75,6 @@ SLOFILES = \
$(SLO)$/txtcrsr.obj \
$(SLO)$/txtnum.obj
-EXCEPTIONSFILES = \
- $(SLO)$/basesh.obj \
- $(SLO)$/annotsh.obj \
- $(SLO)$/drwtxtsh.obj \
- $(SLO)$/textsh.obj \
- $(SLO)$/textsh2.obj \
- $(SLO)$/grfshex.obj \
- $(SLO)$/drawsh.obj \
- $(SLO)$/drwtxtsh.obj \
- $(SLO)$/frmsh.obj \
- $(SLO)$/drwtxtex.obj \
- $(SLO)$/slotadd.obj \
- $(SLO)$/textsh1.obj
-
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/ui/table/makefile.mk b/sw/source/ui/table/makefile.mk
index 8b2ba85..7897bf9 100644
--- a/sw/source/ui/table/makefile.mk
+++ b/sw/source/ui/table/makefile.mk
@@ -38,9 +38,6 @@ LIBTARGET=no
# --- Files --------------------------------------------------------
-EXCEPTIONSFILES= \
- $(SLO)$/chartins.obj\
-
SRS1NAME=$(TARGET)
SRC1FILES = \
colwd.src \
@@ -54,19 +51,22 @@ SRC1FILES = \
tabledlg.src \
tautofmt.src
-SLOFILES = \
+EXCEPTIONSFILES= \
+ $(SLO)$/chartins.obj \
$(SLO)$/colwd.obj \
$(SLO)$/convert.obj \
- $(SLO)$/chartins.obj \
$(SLO)$/instable.obj \
$(SLO)$/mergetbl.obj \
$(SLO)$/rowht.obj \
$(SLO)$/splittbl.obj \
+ $(SLO)$/swtablerep.obj \
$(SLO)$/tabledlg.obj \
$(SLO)$/tablemgr.obj \
- $(SLO)$/swtablerep.obj \
$(SLO)$/tautofmt.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES)
+
LIB1TARGET = $(SLB)$/$(TARGET).lib
LIB1OBJFILES = \
diff --git a/sw/source/ui/uiview/makefile.mk b/sw/source/ui/uiview/makefile.mk
index 337ee85..70a4efa 100644
--- a/sw/source/ui/uiview/makefile.mk
+++ b/sw/source/ui/uiview/makefile.mk
@@ -45,6 +45,8 @@ SRC1FILES = \
EXCEPTIONSFILES= \
$(SLO)$/formatclipboard.obj \
+ $(SLO)$/pview.obj \
+ $(SLO)$/scroll.obj \
$(SLO)$/srcview.obj \
$(SLO)$/swcli.obj \
$(SLO)$/uivwimp.obj \
@@ -52,37 +54,22 @@ EXCEPTIONSFILES= \
$(SLO)$/view0.obj \
$(SLO)$/view1.obj \
$(SLO)$/view2.obj \
- $(SLO)$/viewdraw.obj \
- $(SLO)$/viewport.obj \
- $(SLO)$/viewprt.obj \
- $(SLO)$/viewsrch.obj \
- $(SLO)$/viewling.obj \
- $(SLO)$/viewmdi.obj \
-
-SLOFILES = \
- $(SLO)$/view0.obj \
- $(SLO)$/view.obj \
- $(SLO)$/view1.obj \
- $(SLO)$/view2.obj \
$(SLO)$/viewcoll.obj \
- $(SLO)$/viewdlg2.obj \
$(SLO)$/viewdlg.obj \
+ $(SLO)$/viewdlg2.obj \
$(SLO)$/viewdraw.obj \
$(SLO)$/viewling.obj \
$(SLO)$/viewmdi.obj \
- $(SLO)$/pview.obj \
$(SLO)$/viewport.obj \
- $(SLO)$/viewstat.obj \
- $(SLO)$/viewtab.obj \
$(SLO)$/viewprt.obj \
$(SLO)$/viewsrch.obj \
- $(SLO)$/scroll.obj \
- $(SLO)$/swcli.obj \
- $(SLO)$/srcview.obj \
- $(SLO)$/uivwimp.obj \
- $(SLO)$/formatclipboard.obj
+ $(SLO)$/viewstat.obj \
+ $(SLO)$/viewtab.obj
+
+SLOFILES = \
+ $(EXCEPTIONSFILES)
-# --- Tagets -------------------------------------------------------
+# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/ui/utlui/makefile.mk b/sw/source/ui/utlui/makefile.mk
index cded61e..75d8376 100644
--- a/sw/source/ui/utlui/makefile.mk
+++ b/sw/source/ui/utlui/makefile.mk
@@ -50,28 +50,28 @@ SRC1FILES = \
utlui.src
EXCEPTIONSFILES= \
+ $(SLO)$/attrdesc.obj \
$(SLO)$/bookctrl.obj \
- $(SLO)$/glbltree.obj \
- $(SLO)$/navipi.obj \
- $(SLO)$/unotools.obj \
- $(SLO)$/content.obj \
- $(SLO)$/swrenamexnameddlg.obj
-
-SLOFILES = $(EXCEPTIONSFILES) \
$(SLO)$/condedit.obj \
+ $(SLO)$/content.obj \
+ $(SLO)$/glbltree.obj \
$(SLO)$/gloslst.obj \
$(SLO)$/initui.obj \
- $(SLO)$/navicfg.obj \
+ $(SLO)$/navipi.obj \
$(SLO)$/numfmtlb.obj \
$(SLO)$/prcntfld.obj \
+ $(SLO)$/shdwcrsr.obj \
+ $(SLO)$/swrenamexnameddlg.obj \
$(SLO)$/textcontrolcombo.obj \
$(SLO)$/tmplctrl.obj \
$(SLO)$/uitool.obj \
- $(SLO)$/uiitems.obj \
- $(SLO)$/attrdesc.obj \
- $(SLO)$/shdwcrsr.obj \
- $(SLO)$/zoomctrl.obj \
- $(SLO)$/viewlayoutctrl.obj
+ $(SLO)$/unotools.obj \
+ $(SLO)$/viewlayoutctrl.obj \
+ $(SLO)$/zoomctrl.obj
+
+SLOFILES = $(EXCEPTIONSFILES) \
+ $(SLO)$/navicfg.obj \
+ $(SLO)$/uiitems.obj
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/ui/web/makefile.mk b/sw/source/ui/web/makefile.mk
index 2b1eb75..3dca395 100644
--- a/sw/source/ui/web/makefile.mk
+++ b/sw/source/ui/web/makefile.mk
@@ -42,17 +42,20 @@ SRS1NAME=$(TARGET)
SRC1FILES = \
web.src
-SLOFILES = \
- $(SLO)$/wformsh.obj \
- $(SLO)$/wgrfsh.obj \
- $(SLO)$/wlistsh.obj \
- $(SLO)$/wolesh.obj \
- $(SLO)$/wtabsh.obj \
+EXCEPTIONSFILES = \
+ $(SLO)$/wdocsh.obj \
+ $(SLO)$/wformsh.obj \
$(SLO)$/wfrmsh.obj \
+ $(SLO)$/wgrfsh.obj \
+ $(SLO)$/wlistsh.obj \
+ $(SLO)$/wolesh.obj \
+ $(SLO)$/wtabsh.obj \
$(SLO)$/wtextsh.obj \
- $(SLO)$/wdocsh.obj \
$(SLO)$/wview.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES)
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sw/source/ui/wrtsh/makefile.mk b/sw/source/ui/wrtsh/makefile.mk
index baeb3ac..d650e7b 100644
--- a/sw/source/ui/wrtsh/makefile.mk
+++ b/sw/source/ui/wrtsh/makefile.mk
@@ -43,19 +43,18 @@ SRC1FILES = \
wrtsh.src
SLOFILES = \
+ $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+ $(SLO)$/delete.obj \
$(SLO)$/move.obj \
$(SLO)$/select.obj \
$(SLO)$/wrtsh1.obj \
$(SLO)$/wrtsh2.obj \
$(SLO)$/wrtsh3.obj \
$(SLO)$/wrtsh4.obj \
- $(SLO)$/delete.obj \
$(SLO)$/wrtundo.obj
-EXCEPTIONSFILES = \
- $(SLO)$/wrtsh1.obj \
- $(SLO)$/wrtsh2.obj
-
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
More information about the Libreoffice-commits
mailing list