[Libreoffice-commits] .: vcl/source vcl/unx
Thomas Klausner
tklausner at kemper.freedesktop.org
Mon Oct 18 08:59:35 PDT 2010
vcl/source/control/makefile.mk | 17 +++++++++-
vcl/source/gdi/makefile.mk | 68 ++++++++++++++++++++---------------------
vcl/unx/gtk/app/makefile.mk | 5 +--
vcl/unx/source/app/makefile.mk | 27 ++++++++--------
vcl/unx/source/gdi/makefile.mk | 18 +++++++---
5 files changed, 79 insertions(+), 56 deletions(-)
New commits:
commit 6529e97db136ec6828a15408b2c0f00d3ffce164
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Mon Oct 18 17:58:43 2010 +0200
Sort EXCEPTIONFILES and make sure all are in SLOFILES.
Noted by Caolán McNamara <caolanm at redhat.com>.
diff --git a/vcl/source/control/makefile.mk b/vcl/source/control/makefile.mk
index 509d5b8..f9e994e 100644
--- a/vcl/source/control/makefile.mk
+++ b/vcl/source/control/makefile.mk
@@ -44,15 +44,30 @@ CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
# --- Files --------------------------------------------------------
SLOFILES= $(SLO)$/button.obj \
+ $(SLO)$/combobox.obj \
$(SLO)$/ctrl.obj \
$(SLO)$/edit.obj \
+ $(SLO)$/field.obj \
+ $(SLO)$/field2.obj \
+ $(SLO)$/fixbrd.obj \
+ $(SLO)$/fixed.obj \
+ $(SLO)$/group.obj \
$(SLO)$/ilstbox.obj \
+ $(SLO)$/imgctrl.obj \
+ $(SLO)$/longcurr.obj \
+ $(SLO)$/lstbox.obj \
+ $(SLO)$/menubtn.obj \
+ $(SLO)$/morebtn.obj \
+ $(SLO)$/scrbar.obj \
+ $(SLO)$/slider.obj \
+ $(SLO)$/spinbtn.obj \
+ $(SLO)$/spinfld.obj \
$(SLO)$/tabctrl.obj
EXCEPTIONSFILES= \
$(SLO)$/button.obj \
- $(SLO)$/ctrl.obj \
$(SLO)$/combobox.obj \
+ $(SLO)$/ctrl.obj \
$(SLO)$/edit.obj \
$(SLO)$/field.obj \
$(SLO)$/field2.obj \
diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index 5eda0fc..451d446 100644
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -48,6 +48,31 @@ CDEFS+=-DENABLE_GRAPHITE
# --- Files --------------------------------------------------------
EXCEPTIONSFILES= $(SLO)$/salmisc.obj \
+ $(SLO)$/animate.obj \
+ $(SLO)$/base14.obj \
+ $(SLO)$/bitmap.obj \
+ $(SLO)$/bitmap2.obj \
+ $(SLO)$/bitmapex.obj \
+ $(SLO)$/bmpconv.obj \
+ $(SLO)$/configsettings.obj \
+ $(SLO)$/cvtgrf.obj \
+ $(SLO)$/cvtsvm.obj \
+ $(SLO)$/gdimtf.obj \
+ $(SLO)$/gfxlink.obj \
+ $(SLO)$/graph.obj \
+ $(SLO)$/graphictools.obj \
+ $(SLO)$/image.obj \
+ $(SLO)$/imagerepository.obj \
+ $(SLO)$/impanmvw.obj \
+ $(SLO)$/impgraph.obj \
+ $(SLO)$/impimage.obj \
+ $(SLO)$/impimagetree.obj \
+ $(SLO)$/impvect.obj \
+ $(SLO)$/jobset.obj \
+ $(SLO)$/lineinfo.obj \
+ $(SLO)$/metaact.obj \
+ $(SLO)$/metric.obj \
+ $(SLO)$/oldprintadaptor.obj \
$(SLO)$/outdev.obj \
$(SLO)$/outdev2.obj \
$(SLO)$/outdev3.obj \
@@ -55,47 +80,22 @@ EXCEPTIONSFILES= $(SLO)$/salmisc.obj \
$(SLO)$/outdev5.obj \
$(SLO)$/outdev6.obj \
$(SLO)$/outdevnative.obj \
- $(SLO)$/gfxlink.obj \
- $(SLO)$/print.obj \
- $(SLO)$/print2.obj \
- $(SLO)$/print3.obj \
- $(SLO)$/oldprintadaptor.obj \
- $(SLO)$/configsettings.obj \
- $(SLO)$/sallayout.obj \
- $(SLO)$/image.obj \
- $(SLO)$/impimage.obj \
- $(SLO)$/impgraph.obj \
- $(SLO)$/metric.obj \
+ $(SLO)$/outmap.obj \
+ $(SLO)$/pdfextoutdevdata.obj \
+ $(SLO)$/pdffontcache.obj\
$(SLO)$/pdfwriter.obj \
$(SLO)$/pdfwriter_impl.obj \
- $(SLO)$/pdffontcache.obj\
- $(SLO)$/bmpconv.obj \
- $(SLO)$/pdfextoutdevdata.obj \
- $(SLO)$/jobset.obj \
- $(SLO)$/impanmvw.obj \
- $(SLO)$/impimagetree.obj \
- $(SLO)$/impvect.obj \
$(SLO)$/pngread.obj \
$(SLO)$/pngwrite.obj \
- $(SLO)$/virdev.obj \
- $(SLO)$/wall.obj \
- $(SLO)$/gdimtf.obj \
- $(SLO)$/graph.obj \
- $(SLO)$/graphictools.obj \
- $(SLO)$/imagerepository.obj \
+ $(SLO)$/print.obj \
+ $(SLO)$/print2.obj \
+ $(SLO)$/print3.obj \
$(SLO)$/salgdilayout.obj \
+ $(SLO)$/sallayout.obj \
$(SLO)$/salnativewidgets-none.obj \
$(SLO)$/textlayout.obj \
- $(SLO)$/metaact.obj \
- $(SLO)$/outmap.obj \
- $(SLO)$/animate.obj \
- $(SLO)$/base14.obj \
- $(SLO)$/bitmap.obj \
- $(SLO)$/bitmap2.obj \
- $(SLO)$/cvtgrf.obj \
- $(SLO)$/cvtsvm.obj \
- $(SLO)$/bitmapex.obj \
- $(SLO)$/lineinfo.obj
+ $(SLO)$/virdev.obj \
+ $(SLO)$/wall.obj
SLOFILES= $(EXCEPTIONSFILES) \
$(SLO)$/bitmap3.obj \
diff --git a/vcl/unx/gtk/app/makefile.mk b/vcl/unx/gtk/app/makefile.mk
index c5c071a..5c480e8 100644
--- a/vcl/unx/gtk/app/makefile.mk
+++ b/vcl/unx/gtk/app/makefile.mk
@@ -55,10 +55,11 @@ PKGCONFIG_MODULES=gtk+-2.0
SLOFILES=\
$(SLO)$/gtkdata.obj \
- $(SLO)$/gtkinst.obj
+ $(SLO)$/gtkinst.obj \
+ $(SLO)$/gtksys.obj
EXCEPTIONSFILES=\
- $(SLO)$/gtkdata.obj\
+ $(SLO)$/gtkdata.obj \
$(SLO)$/gtkinst.obj \
$(SLO)$/gtksys.obj
diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk
index 21dab6b..1e70418 100644
--- a/vcl/unx/source/app/makefile.mk
+++ b/vcl/unx/source/app/makefile.mk
@@ -49,30 +49,31 @@ SLOFILES=\
$(SLO)$/i18n_cb.obj \
$(SLO)$/i18n_ic.obj \
$(SLO)$/i18n_im.obj \
- $(SLO)$/i18n_xkb.obj \
- $(SLO)$/i18n_wrp.obj \
- $(SLO)$/i18n_status.obj \
$(SLO)$/i18n_keysym.obj \
+ $(SLO)$/i18n_status.obj \
+ $(SLO)$/i18n_wrp.obj \
+ $(SLO)$/i18n_xkb.obj \
+ $(SLO)$/keysymnames.obj \
+ $(SLO)$/randrwrapper.obj \
$(SLO)$/saldata.obj \
- $(SLO)$/saltimer.obj \
$(SLO)$/saldisp.obj \
- $(SLO)$/randrwrapper.obj \
$(SLO)$/salinst.obj \
$(SLO)$/salsys.obj \
+ $(SLO)$/saltimer.obj \
+ $(SLO)$/sm.obj \
$(SLO)$/soicon.obj \
- $(SLO)$/keysymnames.obj \
$(SLO)$/wmadaptor.obj
EXCEPTIONSFILES=\
- $(SLO)$/wmadaptor.obj \
+ $(SLO)$/i18n_cb.obj \
+ $(SLO)$/i18n_ic.obj \
+ $(SLO)$/i18n_status.obj \
$(SLO)$/saldata.obj \
- $(SLO)$/salinst.obj \
$(SLO)$/saldisp.obj \
- $(SLO)$/i18n_status.obj \
- $(SLO)$/i18n_cb.obj \
- $(SLO)$/i18n_ic.obj \
- $(SLO)$/salsys.obj \
- $(SLO)$/sm.obj
+ $(SLO)$/salinst.obj \
+ $(SLO)$/salsys.obj \
+ $(SLO)$/sm.obj \
+ $(SLO)$/wmadaptor.obj
.IF "$(ENABLE_RANDR)" != ""
diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk
index b2aee56..65d775b 100644
--- a/vcl/unx/source/gdi/makefile.mk
+++ b/vcl/unx/source/gdi/makefile.mk
@@ -47,27 +47,33 @@ dummy:
.ELSE # "$(GUIBASE)"!="unx"
SLOFILES= \
+ $(SLO)$/dtint.obj \
+ $(SLO)$/gcach_xpeer.obj \
+ $(SLO)$/pspgraphics.obj \
$(SLO)$/salbmp.obj \
- $(SLO)$/salgdi.obj \
$(SLO)$/salcvt.obj \
+ $(SLO)$/salgdi.obj \
+ $(SLO)$/salgdi2.obj \
+ $(SLO)$/salgdi3.obj \
+ $(SLO)$/salvd.obj \
+ $(SLO)$/xfont.obj \
$(SLO)$/xlfd_attr.obj \
$(SLO)$/xlfd_extd.obj \
$(SLO)$/xlfd_smpl.obj \
- $(SLO)$/salgdi3.obj \
$(SLO)$/xrender_peer.obj
EXCEPTIONSFILES=\
- $(SLO)$/xlfd_extd.obj \
$(SLO)$/dtint.obj \
$(SLO)$/gcach_xpeer.obj \
$(SLO)$/pspgraphics.obj \
- $(SLO)$/salgdi.obj \
$(SLO)$/salbmp.obj \
+ $(SLO)$/salcvt.obj \
+ $(SLO)$/salgdi.obj \
$(SLO)$/salgdi2.obj \
$(SLO)$/salgdi3.obj \
- $(SLO)$/salcvt.obj \
$(SLO)$/salvd.obj \
- $(SLO)$/xfont.obj
+ $(SLO)$/xfont.obj \
+ $(SLO)$/xlfd_extd.obj
.IF "$(USE_XPRINT)" == "TRUE"
CFLAGS+=-D_USE_PRINT_EXTENSION_=1
More information about the Libreoffice-commits
mailing list