[Libreoffice-commits] .: svtools/source
Thomas Klausner
tklausner at kemper.freedesktop.org
Tue Oct 19 03:16:20 PDT 2010
svtools/source/brwbox/makefile.mk | 18 ++++-----
svtools/source/contnr/makefile.mk | 20 +++++-----
svtools/source/control/makefile.mk | 54 +++++++++++++--------------
svtools/source/dialogs/makefile.mk | 32 +++++++++-------
svtools/source/edit/makefile.mk | 24 ++++++++----
svtools/source/filter.vcl/filter/makefile.mk | 31 ++++++++++-----
svtools/source/graphic/makefile.mk | 15 ++++---
7 files changed, 110 insertions(+), 84 deletions(-)
New commits:
commit d958516643d22ee21839d828678310a2030a71ff
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Tue Oct 19 12:15:47 2010 +0200
Add more files to EXCEPTIONSFILES, sort.
diff --git a/svtools/source/brwbox/makefile.mk b/svtools/source/brwbox/makefile.mk
index e195e0e..724a2b5 100644
--- a/svtools/source/brwbox/makefile.mk
+++ b/svtools/source/brwbox/makefile.mk
@@ -41,17 +41,17 @@ SRS1NAME=$(TARGET)
SRC1FILES= editbrowsebox.src
EXCEPTIONSFILES =\
- $(SLO)$/editbrowsebox2.obj \
- $(SLO)$/brwbox1.obj \
- $(SLO)$/brwbox3.obj
-
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/ebbcontrols.obj \
- $(SLO)$/editbrowsebox.obj \
+ $(SLO)$/brwbox1.obj \
$(SLO)$/brwbox2.obj \
+ $(SLO)$/brwbox3.obj \
$(SLO)$/brwhead.obj \
- $(SLO)$/datwin.obj
+ $(SLO)$/datwin.obj \
+ $(SLO)$/ebbcontrols.obj \
+ $(SLO)$/editbrowsebox.obj \
+ $(SLO)$/editbrowsebox2.obj
+
+SLOFILES= \
+ $(EXCEPTIONSFILES)
# --- Targets -------------------------------------------------------
diff --git a/svtools/source/contnr/makefile.mk b/svtools/source/contnr/makefile.mk
index 232665c..777297b 100644
--- a/svtools/source/contnr/makefile.mk
+++ b/svtools/source/contnr/makefile.mk
@@ -44,22 +44,22 @@ PROJECTPCHSOURCE=cont_pch
EXCEPTIONSFILES=\
$(SLO)$/contentenumeration.obj \
$(SLO)$/fileview.obj \
- $(SLO)$/svlbox.obj \
- $(SLO)$/svtabbx.obj \
- $(SLO)$/svimpbox.obj \
- $(SLO)$/templwin.obj
-
-SLOFILES= $(EXCEPTIONSFILES) \
+ $(SLO)$/imivctl1.obj \
+ $(SLO)$/imivctl2.obj \
+ $(SLO)$/ivctrl.obj \
$(SLO)$/svicnvw.obj \
+ $(SLO)$/svimpbox.obj \
$(SLO)$/svimpicn.obj \
- $(SLO)$/treelist.obj \
$(SLO)$/svlbitm.obj \
+ $(SLO)$/svlbox.obj \
+ $(SLO)$/svtabbx.obj \
$(SLO)$/svtreebx.obj \
- $(SLO)$/imivctl1.obj \
- $(SLO)$/imivctl2.obj \
- $(SLO)$/ivctrl.obj \
+ $(SLO)$/templwin.obj \
$(SLO)$/tooltiplbox.obj
+SLOFILES= $(EXCEPTIONSFILES) \
+ $(SLO)$/treelist.obj
+
SRS1NAME=$(TARGET)
SRC1FILES =\
fileview.src \
diff --git a/svtools/source/control/makefile.mk b/svtools/source/control/makefile.mk
index a2e6227..b855501 100755
--- a/svtools/source/control/makefile.mk
+++ b/svtools/source/control/makefile.mk
@@ -45,41 +45,41 @@ SRC1FILES=\
filectrl.src
EXCEPTIONSFILES=\
- $(SLO)$/svxbox.obj \
+ $(SLO)$/asynclink.obj \
+ $(SLO)$/calendar.obj \
+ $(SLO)$/ctrlbox.obj \
+ $(SLO)$/ctrltool.obj \
+ $(SLO)$/filectrl.obj \
$(SLO)$/filectrl2.obj \
- $(SLO)$/roadmap.obj \
- $(SLO)$/scriptedtext.obj\
+ $(SLO)$/fileurlbox.obj \
+ $(SLO)$/fixedhyper.obj \
$(SLO)$/fmtfield.obj \
+ $(SLO)$/headbar.obj \
+ $(SLO)$/hyperlabel.obj \
$(SLO)$/inettbc.obj \
- $(SLO)$/valueacc.obj \
+ $(SLO)$/prgsbar.obj \
+ $(SLO)$/roadmap.obj \
+ $(SLO)$/ruler.obj \
+ $(SLO)$/scriptedtext.obj \
+ $(SLO)$/scrwin.obj \
+ $(SLO)$/stdctrl.obj \
+ $(SLO)$/stdmenu.obj \
+ $(SLO)$/svxbox.obj \
+ $(SLO)$/tabbar.obj \
+ $(SLO)$/taskbar.obj \
+ $(SLO)$/taskbox.obj \
+ $(SLO)$/taskmisc.obj \
+ $(SLO)$/taskstat.obj \
$(SLO)$/toolbarmenu.obj \
- $(SLO)$/toolbarmenuacc.obj
+ $(SLO)$/toolbarmenuacc.obj \
+ $(SLO)$/urlcontrol.obj \
+ $(SLO)$/valueacc.obj \
+ $(SLO)$/valueset.obj
SLOFILES=\
$(EXCEPTIONSFILES) \
- $(SLO)$/asynclink.obj \
- $(SLO)$/urlcontrol.obj \
- $(SLO)$/fileurlbox.obj \
- $(SLO)$/ctrltool.obj \
- $(SLO)$/ctrlbox.obj \
- $(SLO)$/stdctrl.obj \
- $(SLO)$/stdmenu.obj \
- $(SLO)$/valueset.obj \
- $(SLO)$/tabbar.obj \
- $(SLO)$/headbar.obj \
- $(SLO)$/prgsbar.obj \
- $(SLO)$/ruler.obj \
- $(SLO)$/taskbar.obj \
- $(SLO)$/taskbox.obj \
- $(SLO)$/taskstat.obj \
- $(SLO)$/taskmisc.obj \
- $(SLO)$/calendar.obj \
- $(SLO)$/filectrl.obj \
- $(SLO)$/scrwin.obj \
$(SLO)$/collatorres.obj \
- $(SLO)$/indexentryres.obj \
- $(SLO)$/hyperlabel.obj \
- $(SLO)$/fixedhyper.obj
+ $(SLO)$/indexentryres.obj
# --- Targets ------------------------------------------------------
diff --git a/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk
index 99c4b59..ede452c 100755
--- a/svtools/source/dialogs/makefile.mk
+++ b/svtools/source/dialogs/makefile.mk
@@ -49,26 +49,32 @@ SRC1FILES= filedlg2.src \
EXCEPTIONSFILES= $(SLO)$/addresstemplate.obj \
- $(SLO)$/insdlg.obj \
+ $(SLO)$/colctrl.obj \
+ $(SLO)$/colrdlg.obj \
+ $(SLO)$/filedlg.obj \
+ $(SLO)$/filedlg2.obj \
+ $(SLO)$/insdlg.obj \
+ $(SLO)$/printdlg.obj \
+ $(SLO)$/prnsetup.obj \
+ $(SLO)$/property.obj \
$(SLO)$/roadmapwizard.obj \
- $(SLO)$/printdlg.obj \
- $(SLO)$/wizardmachine.obj
-
+ $(SLO)$/wizardmachine.obj \
+ $(SLO)$/wizdlg.obj
SLOFILES= \
- $(SLO)$/insdlg.obj \
- $(SLO)$/roadmapwizard.obj \
- $(SLO)$/wizardmachine.obj \
- $(SLO)$/addresstemplate.obj \
+ $(SLO)$/addresstemplate.obj \
+ $(SLO)$/colctrl.obj \
+ $(SLO)$/colrdlg.obj \
$(SLO)$/filedlg.obj \
$(SLO)$/filedlg2.obj \
- $(SLO)$/prnsetup.obj \
+ $(SLO)$/insdlg.obj \
+ $(SLO)$/mcvmath.obj \
$(SLO)$/printdlg.obj \
- $(SLO)$/colctrl.obj \
- $(SLO)$/colrdlg.obj \
+ $(SLO)$/prnsetup.obj \
$(SLO)$/property.obj \
- $(SLO)$/wizdlg.obj \
- $(SLO)$/mcvmath.obj
+ $(SLO)$/roadmapwizard.obj \
+ $(SLO)$/wizardmachine.obj \
+ $(SLO)$/wizdlg.obj
# --- Targets ------------------------------------------------------
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
index 58a63be..9aacde1 100644
--- a/svtools/source/edit/makefile.mk
+++ b/svtools/source/edit/makefile.mk
@@ -38,25 +38,33 @@ TARGET=edit
# --- Files --------------------------------------------------------
SLOFILES= \
+ $(SLO)$/svmedit.obj \
+ $(SLO)$/svmedit2.obj \
+ $(SLO)$/sychconv.obj \
+ $(SLO)$/syntaxhighlight.obj \
$(SLO)$/textdata.obj \
$(SLO)$/textdoc.obj \
$(SLO)$/texteng.obj \
$(SLO)$/textundo.obj \
$(SLO)$/textview.obj \
+ $(SLO)$/textwindowpeer.obj \
$(SLO)$/txtattr.obj \
$(SLO)$/xtextedt.obj \
- $(SLO)$/sychconv.obj \
- $(SLO)$/svmedit.obj \
- $(SLO)$/svmedit2.obj \
- $(SLO)$/textwindowpeer.obj \
- $(SLO)$/syntaxhighlight.obj \
$(SLO)$/editsyntaxhighlighter.obj
EXCEPTIONSFILES= \
+ $(SLO)$/editsyntaxhighlighter.obj \
+ $(SLO)$/svmedit.obj \
+ $(SLO)$/svmedit2.obj \
+ $(SLO)$/sychconv.obj \
+ $(SLO)$/syntaxhighlight.obj \
+ $(SLO)$/textdata.obj \
+ $(SLO)$/textdoc.obj \
+ $(SLO)$/texteng.obj \
+ $(SLO)$/textundo.obj \
$(SLO)$/textview.obj \
- $(SLO)$/textdoc.obj \
- $(SLO)$/texteng.obj \
- $(SLO)$/textwindowpeer.obj
+ $(SLO)$/textwindowpeer.obj \
+ $(SLO)$/xtextedt.obj
# --- Targets ------------------------------------------------------
diff --git a/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk
index 272bb9a..c1cd42b 100644
--- a/svtools/source/filter.vcl/filter/makefile.mk
+++ b/svtools/source/filter.vcl/filter/makefile.mk
@@ -46,23 +46,32 @@ SRC1FILES= strings.src \
dlgepng.src \
dlgejpg.src
-SLOFILES= $(SLO)$/filter.obj \
- $(SLO)$/filter2.obj \
- $(SLO)$/dlgexpor.obj \
+SLOFILES= \
+ $(SLO)$/FilterConfigCache.obj \
+ $(SLO)$/FilterConfigItem.obj \
+ $(SLO)$/SvFilterOptionsDialog.obj \
$(SLO)$/dlgejpg.obj \
$(SLO)$/dlgepng.obj \
+ $(SLO)$/dlgexpor.obj \
+ $(SLO)$/filter.obj \
+ $(SLO)$/filter2.obj \
$(SLO)$/sgfbram.obj \
$(SLO)$/sgvmain.obj \
- $(SLO)$/sgvtext.obj \
$(SLO)$/sgvspln.obj \
- $(SLO)$/FilterConfigItem.obj \
- $(SLO)$/FilterConfigCache.obj \
- $(SLO)$/SvFilterOptionsDialog.obj
+ $(SLO)$/sgvtext.obj
-EXCEPTIONSNOOPTFILES= $(SLO)$/filter.obj \
- $(SLO)$/FilterConfigItem.obj \
- $(SLO)$/FilterConfigCache.obj \
- $(SLO)$/SvFilterOptionsDialog.obj
+EXCEPTIONSNOOPTFILES= \
+ $(SLO)$/FilterConfigCache.obj \
+ $(SLO)$/FilterConfigItem.obj \
+ $(SLO)$/SvFilterOptionsDialog.obj \
+ $(SLO)$/dlgejpg.obj \
+ $(SLO)$/dlgepng.obj \
+ $(SLO)$/dlgexpor.obj \
+ $(SLO)$/filter.obj \
+ $(SLO)$/filter2.obj \
+ $(SLO)$/sgfbram.obj \
+ $(SLO)$/sgvmain.obj \
+ $(SLO)$/sgvtext.obj
LIB1TARGET= $(SLB)$/$(TARGET).uno.lib
LIB1OBJFILES= \
diff --git a/svtools/source/graphic/makefile.mk b/svtools/source/graphic/makefile.mk
index 37870b4..cf3a916 100644
--- a/svtools/source/graphic/makefile.mk
+++ b/svtools/source/graphic/makefile.mk
@@ -42,23 +42,26 @@ LINKFLAGS=$(LINKFLAGS) /PACKC:32768
# --- Files --------------------------------------------------------
SLOFILES= \
+ $(SLO)$/descriptor.obj \
+ $(SLO)$/graphic.obj \
+ $(SLO)$/graphicunofactory.obj \
$(SLO)$/grfattr.obj \
+ $(SLO)$/grfcache.obj \
$(SLO)$/grfmgr.obj \
$(SLO)$/grfmgr2.obj \
- $(SLO)$/grfcache.obj \
- $(SLO)$/descriptor.obj \
$(SLO)$/provider.obj \
- $(SLO)$/graphic.obj \
$(SLO)$/renderer.obj \
- $(SLO)$/graphicunofactory.obj \
$(SLO)$/transformer.obj
EXCEPTIONSFILES= \
$(SLO)$/descriptor.obj \
- $(SLO)$/provider.obj \
$(SLO)$/graphic.obj \
- $(SLO)$/renderer.obj \
$(SLO)$/graphicunofactory.obj \
+ $(SLO)$/grfcache.obj \
+ $(SLO)$/grfmgr.obj \
+ $(SLO)$/grfmgr2.obj \
+ $(SLO)$/provider.obj \
+ $(SLO)$/renderer.obj \
$(SLO)$/transformer.obj
# --- Target -------------------------------------------------------
More information about the Libreoffice-commits
mailing list