[Libreoffice-commits] .: automation/source basctl/source extensions/source forms/source
Thomas Klausner
tklausner at kemper.freedesktop.org
Tue Nov 2 07:08:56 PDT 2010
automation/source/communi/makefile.mk | 4 +-
automation/source/miniapp/makefile.mk | 6 +--
automation/source/server/makefile.mk | 18 ++++-------
automation/source/testtool/makefile.mk | 10 ++----
basctl/source/basicide/makefile.mk | 53 ++++++++++++++++-----------------
basctl/source/dlged/makefile.mk | 19 ++++++-----
extensions/source/abpilot/makefile.mk | 22 ++++++-------
forms/source/resource/makefile.mk | 4 +-
forms/source/richtext/makefile.mk | 18 +++++------
9 files changed, 78 insertions(+), 76 deletions(-)
New commits:
commit cd74ca246ec77eeeb875ac0bc074d7aa0acdc296
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Tue Nov 2 15:08:29 2010 +0100
Add some more files to EXCEPTIONSFILES, needed on at least NetBSD.
diff --git a/automation/source/communi/makefile.mk b/automation/source/communi/makefile.mk
index 1d01bad..b4ca9c6 100644
--- a/automation/source/communi/makefile.mk
+++ b/automation/source/communi/makefile.mk
@@ -36,7 +36,9 @@ TARGET=communi
# --- Files --------------------------------------------------------
-SLOFILES= \
+SLOFILES= $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
$(SLO)$/communi.obj
# --- Targets ------------------------------------------------------
diff --git a/automation/source/miniapp/makefile.mk b/automation/source/miniapp/makefile.mk
index 14a6d1f..10c16d8 100644
--- a/automation/source/miniapp/makefile.mk
+++ b/automation/source/miniapp/makefile.mk
@@ -37,12 +37,12 @@ TARGET=miniapp
# --- Allgemein ------------------------------------------------------------
OBJFILES = \
- $(OBJ)$/testapp.obj \
- $(OBJ)$/editwin.obj \
- $(OBJ)$/servres.obj
+ $(EXCEPTIONSFILES)
EXCEPTIONSFILES= \
+ $(OBJ)$/editwin.obj \
+ $(OBJ)$/servres.obj \
$(OBJ)$/testapp.obj
SRS1NAME=$(TARGET)
diff --git a/automation/source/server/makefile.mk b/automation/source/server/makefile.mk
index bced075..a6e1ec7 100644
--- a/automation/source/server/makefile.mk
+++ b/automation/source/server/makefile.mk
@@ -36,17 +36,12 @@ TARGET=server
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/XMLParser.obj \
- $(SLO)$/recorder.obj \
- $(SLO)$/svcommstream.obj \
+ $(EXCEPTIONSFILES) \
$(SLO)$/cmdbasestream.obj \
- $(SLO)$/scmdstrm.obj \
- $(SLO)$/statemnt.obj \
- $(SLO)$/sta_list.obj \
$(SLO)$/editwin.obj \
- $(SLO)$/server.obj \
$(SLO)$/retstrm.obj \
- $(SLO)$/profiler.obj
+ $(SLO)$/scmdstrm.obj \
+ $(SLO)$/svcommstream.obj
OBJFILES = \
@@ -54,9 +49,12 @@ OBJFILES = \
$(OBJ)$/svcommstream.obj
EXCEPTIONSFILES = \
- $(SLO)$/statemnt.obj \
+ $(SLO)$/XMLParser.obj \
+ $(SLO)$/profiler.obj \
+ $(SLO)$/recorder.obj \
$(SLO)$/server.obj \
- $(SLO)$/XMLParser.obj
+ $(SLO)$/sta_list.obj \
+ $(SLO)$/statemnt.obj
NOOPTFILES = $(SLO)$/statemnt.obj
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index db84641..ee885e1 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -37,18 +37,16 @@ TARGET=testtool
# --- Allgemein ------------------------------------------------------------
OBJFILES = \
- $(OBJ)$/cmdstrm.obj \
+ $(EXCEPTIONSFILES) \
$(OBJ)$/cretstrm.obj \
- $(OBJ)$/objtest.obj \
- $(OBJ)$/tcommuni.obj \
- $(OBJ)$/comm_bas.obj \
$(OBJ)$/httprequest.obj \
EXCEPTIONSFILES= \
- $(OBJ)$/tcommuni.obj \
$(OBJ)$/cmdstrm.obj \
- $(OBJ)$/objtest.obj
+ $(OBJ)$/comm_bas.obj \
+ $(OBJ)$/objtest.obj \
+ $(OBJ)$/tcommuni.obj
HXXFILES = $(INCCOM)$/keycodes.hxx \
$(INCCOM)$/classes.hxx \
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index b225b98..8d929ad 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -47,38 +47,39 @@ CDEFS+=-DBASICDEBUG
# --- Allgemein ----------------------------------------------------------
-EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj \
- $(SLO)$/scriptdocument.obj \
- $(SLO)$/basicbox.obj \
- $(SLO)$/basidesh.obj \
- $(SLO)$/basides1.obj \
- $(SLO)$/basides2.obj \
- $(SLO)$/basides3.obj \
+EXCEPTIONSFILES= \
+ $(SLO)$/basdoc.obj \
+ $(SLO)$/basicbox.obj \
+ $(SLO)$/basicrenderable.obj \
$(SLO)$/baside2.obj \
+ $(SLO)$/baside2b.obj \
$(SLO)$/baside3.obj \
+ $(SLO)$/basidectrlr.obj \
+ $(SLO)$/basides1.obj \
+ $(SLO)$/basides2.obj \
+ $(SLO)$/basides3.obj \
+ $(SLO)$/basidesh.obj \
$(SLO)$/basobj2.obj \
$(SLO)$/basobj3.obj \
- $(SLO)$/bastypes.obj \
- $(SLO)$/bastype2.obj \
- $(SLO)$/bastype3.obj \
+ $(SLO)$/bastype2.obj \
+ $(SLO)$/bastype3.obj \
+ $(SLO)$/bastypes.obj \
+ $(SLO)$/brkdlg.obj \
+ $(SLO)$/doceventnotifier.obj \
+ $(SLO)$/docsignature.obj \
+ $(SLO)$/documentenumeration.obj \
$(SLO)$/iderdll.obj \
- $(SLO)$/macrodlg.obj \
- $(SLO)$/moduldlg.obj \
- $(SLO)$/moduldl2.obj \
- $(SLO)$/unomodel.obj \
- $(SLO)$/register.obj \
- $(SLO)$/basdoc.obj \
+ $(SLO)$/localizationmgr.obj \
+ $(SLO)$/macrodlg.obj \
+ $(SLO)$/moduldl2.obj \
+ $(SLO)$/moduldlg.obj \
+ $(SLO)$/objdlg.obj \
+ $(SLO)$/register.obj \
+ $(SLO)$/scriptdocument.obj \
$(SLO)$/tbxctl.obj \
- $(SLO)$/basidectrlr.obj \
- $(SLO)$/localizationmgr.obj \
- $(SLO)$/doceventnotifier.obj \
- $(SLO)$/docsignature.obj \
- $(SLO)$/documentenumeration.obj
-
-SLOFILES = $(EXCEPTIONSFILES) \
- $(SLO)$/baside2b.obj \
- $(SLO)$/brkdlg.obj \
- $(SLO)$/objdlg.obj \
+ $(SLO)$/unomodel.obj
+
+SLOFILES = $(EXCEPTIONSFILES)
SRS1NAME=$(TARGET)
SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src tbxctl.src basicprint.src
diff --git a/basctl/source/dlged/makefile.mk b/basctl/source/dlged/makefile.mk
index 1b765ad..68a21a2 100644
--- a/basctl/source/dlged/makefile.mk
+++ b/basctl/source/dlged/makefile.mk
@@ -39,19 +39,20 @@ VISIBILITY_HIDDEN=TRUE
# --- Files --------------------------------------------------------
-EXCEPTIONSFILES=$(SLO)$/dlged.obj \
- $(SLO)$/dlgedobj.obj \
+EXCEPTIONSFILES= \
+ $(SLO)$/dlged.obj \
+ $(SLO)$/dlgedclip.obj \
$(SLO)$/dlgedfac.obj \
+ $(SLO)$/dlgedfunc.obj \
$(SLO)$/dlgedlist.obj \
- $(SLO)$/dlgedclip.obj \
+ $(SLO)$/dlgedmod.obj \
+ $(SLO)$/dlgedobj.obj \
+ $(SLO)$/dlgedpage.obj \
+ $(SLO)$/dlgedview.obj \
+ $(SLO)$/managelang.obj \
$(SLO)$/propbrw.obj
-SLOFILES= $(EXCEPTIONSFILES) \
- $(SLO)$/dlgedfunc.obj \
- $(SLO)$/dlgedmod.obj \
- $(SLO)$/dlgedpage.obj \
- $(SLO)$/dlgedview.obj \
- $(SLO)$/managelang.obj
+SLOFILES= $(EXCEPTIONSFILES)
SRS1NAME=$(TARGET)
SRC1FILES= dlgresid.src \
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index 19477e1..95c4208 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -44,21 +44,21 @@ CDEFS+=-DCOMPMOD_RESPREFIX=abp
# --- Files --------------------------------------------------------
EXCEPTIONSFILES= \
- $(SLO)$/fieldmappingimpl.obj \
- $(SLO)$/datasourcehandling.obj \
+ $(SLO)$/abpfinalpage.obj \
+ $(SLO)$/abpservices.obj \
+ $(SLO)$/abspage.obj \
+ $(SLO)$/abspilot.obj \
$(SLO)$/admininvokationimpl.obj \
- $(SLO)$/unodialogabp.obj \
- $(SLO)$/moduleabp.obj \
- $(SLO)$/abpservices.obj \
+ $(SLO)$/admininvokationpage.obj \
+ $(SLO)$/datasourcehandling.obj \
+ $(SLO)$/fieldmappingimpl.obj \
+ $(SLO)$/fieldmappingpage.obj \
+ $(SLO)$/moduleabp.obj \
+ $(SLO)$/tableselectionpage.obj \
$(SLO)$/typeselectionpage.obj \
+ $(SLO)$/unodialogabp.obj \
SLOFILES= \
- $(SLO)$/fieldmappingpage.obj \
- $(SLO)$/abpfinalpage.obj \
- $(SLO)$/tableselectionpage.obj \
- $(SLO)$/admininvokationpage.obj \
- $(SLO)$/abspage.obj \
- $(SLO)$/abspilot.obj \
$(EXCEPTIONSFILES)
diff --git a/forms/source/resource/makefile.mk b/forms/source/resource/makefile.mk
index cde68a9..39ffdca 100644
--- a/forms/source/resource/makefile.mk
+++ b/forms/source/resource/makefile.mk
@@ -42,7 +42,9 @@ SRC1FILES= \
strings.src \
xforms.src
-SLOFILES= $(SLO)$/frm_resource.obj \
+EXCEPTIONSFILES= $(SLO)$/frm_resource.obj
+
+SLOFILES= $(EXCEPTIONSFILES)
# --- Targets ----------------------------------
diff --git a/forms/source/richtext/makefile.mk b/forms/source/richtext/makefile.mk
index 5c62a1a..b7d08ef 100644
--- a/forms/source/richtext/makefile.mk
+++ b/forms/source/richtext/makefile.mk
@@ -38,21 +38,21 @@ TARGET=richtext
# --- Files -------------------------------------
EXCEPTIONSFILES=\
- $(SLO)$/richtextunowrapper.obj \
- $(SLO)$/richtextmodel.obj \
- $(SLO)$/richtextcontrol.obj \
- $(SLO)$/featuredispatcher.obj \
- $(SLO)$/clipboarddispatcher.obj \
$(SLO)$/attributedispatcher.obj \
+ $(SLO)$/clipboarddispatcher.obj \
+ $(SLO)$/featuredispatcher.obj \
$(SLO)$/parametrizedattributedispatcher.obj \
- $(SLO)$/specialdispatchers.obj \
+ $(SLO)$/richtextcontrol.obj \
$(SLO)$/richtextengine.obj \
- $(SLO)$/richtextimplcontrol.obj
-
-SLOFILES= $(EXCEPTIONSFILES) \
+ $(SLO)$/richtextimplcontrol.obj \
+ $(SLO)$/richtextmodel.obj \
+ $(SLO)$/richtextunowrapper.obj \
$(SLO)$/richtextvclcontrol.obj \
$(SLO)$/richtextviewport.obj \
$(SLO)$/rtattributehandler.obj \
+ $(SLO)$/specialdispatchers.obj
+
+SLOFILES= $(EXCEPTIONSFILES)
# --- Targets ----------------------------------
More information about the Libreoffice-commits
mailing list