[Libreoffice-commits] .: vcl/source vcl/unx
Thomas Klausner
tklausner at kemper.freedesktop.org
Mon Oct 18 08:23:21 PDT 2010
vcl/source/control/makefile.mk | 21 +++++++++----------
vcl/source/gdi/makefile.mk | 44 ++++++++++++++++++++---------------------
vcl/unx/gtk/app/makefile.mk | 6 ++---
vcl/unx/source/app/makefile.mk | 4 +--
vcl/unx/source/gdi/makefile.mk | 16 +++++++-------
5 files changed, 45 insertions(+), 46 deletions(-)
New commits:
commit 830e71ba7d6dd419c7d5d0805489cd47ff13f2fa
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Mon Oct 18 17:20:44 2010 +0200
Mark many more files as EXCEPTIONFILES.
Needed at least on NetBSD with system boost.
diff --git a/vcl/source/control/makefile.mk b/vcl/source/control/makefile.mk
index a255333..509d5b8 100644
--- a/vcl/source/control/makefile.mk
+++ b/vcl/source/control/makefile.mk
@@ -45,6 +45,13 @@ CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
SLOFILES= $(SLO)$/button.obj \
$(SLO)$/ctrl.obj \
+ $(SLO)$/edit.obj \
+ $(SLO)$/ilstbox.obj \
+ $(SLO)$/tabctrl.obj
+
+EXCEPTIONSFILES= \
+ $(SLO)$/button.obj \
+ $(SLO)$/ctrl.obj \
$(SLO)$/combobox.obj \
$(SLO)$/edit.obj \
$(SLO)$/field.obj \
@@ -52,24 +59,16 @@ SLOFILES= $(SLO)$/button.obj \
$(SLO)$/fixbrd.obj \
$(SLO)$/fixed.obj \
$(SLO)$/group.obj \
- $(SLO)$/ilstbox.obj \
+ $(SLO)$/ilstbox.obj \
$(SLO)$/imgctrl.obj \
$(SLO)$/longcurr.obj \
$(SLO)$/lstbox.obj \
- $(SLO)$/morebtn.obj \
$(SLO)$/menubtn.obj \
+ $(SLO)$/morebtn.obj \
$(SLO)$/scrbar.obj \
$(SLO)$/slider.obj \
- $(SLO)$/spinfld.obj \
$(SLO)$/spinbtn.obj \
- $(SLO)$/tabctrl.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/button.obj \
- $(SLO)$/ctrl.obj \
- $(SLO)$/edit.obj \
- $(SLO)$/field2.obj \
- $(SLO)$/ilstbox.obj \
+ $(SLO)$/spinfld.obj \
$(SLO)$/tabctrl.obj
# --- Targets ------------------------------------------------------
diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index 77df209..5eda0fc 100644
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -49,7 +49,11 @@ CDEFS+=-DENABLE_GRAPHITE
EXCEPTIONSFILES= $(SLO)$/salmisc.obj \
$(SLO)$/outdev.obj \
+ $(SLO)$/outdev2.obj \
$(SLO)$/outdev3.obj \
+ $(SLO)$/outdev4.obj \
+ $(SLO)$/outdev5.obj \
+ $(SLO)$/outdev6.obj \
$(SLO)$/outdevnative.obj \
$(SLO)$/gfxlink.obj \
$(SLO)$/print.obj \
@@ -62,58 +66,54 @@ EXCEPTIONSFILES= $(SLO)$/salmisc.obj \
$(SLO)$/impimage.obj \
$(SLO)$/impgraph.obj \
$(SLO)$/metric.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)$/salgdilayout.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
SLOFILES= $(EXCEPTIONSFILES) \
- $(SLO)$/animate.obj \
- $(SLO)$/impanmvw.obj \
- $(SLO)$/bitmap.obj \
- $(SLO)$/bitmap2.obj \
$(SLO)$/bitmap3.obj \
$(SLO)$/bitmap4.obj \
$(SLO)$/alpha.obj \
- $(SLO)$/bitmapex.obj \
$(SLO)$/bmpacc.obj \
$(SLO)$/bmpacc2.obj \
$(SLO)$/bmpacc3.obj \
$(SLO)$/bmpfast.obj \
- $(SLO)$/cvtsvm.obj \
- $(SLO)$/cvtgrf.obj \
$(SLO)$/font.obj \
$(SLO)$/gradient.obj \
$(SLO)$/hatch.obj \
- $(SLO)$/graph.obj \
$(SLO)$/impbmp.obj \
- $(SLO)$/imagerepository.obj \
- $(SLO)$/impvect.obj \
$(SLO)$/mapmod.obj \
- $(SLO)$/metaact.obj \
$(SLO)$/octree.obj \
- $(SLO)$/outmap.obj \
- $(SLO)$/outdev2.obj \
- $(SLO)$/outdev4.obj \
- $(SLO)$/outdev5.obj \
- $(SLO)$/outdev6.obj \
$(SLO)$/regband.obj \
$(SLO)$/region.obj \
- $(SLO)$/wall.obj \
- $(SLO)$/base14.obj \
- $(SLO)$/pdfwriter.obj \
- $(SLO)$/salgdilayout.obj \
- $(SLO)$/extoutdevdata.obj \
- $(SLO)$/salnativewidgets-none.obj
+ $(SLO)$/extoutdevdata.obj
# --- Targets ------------------------------------------------------
diff --git a/vcl/unx/gtk/app/makefile.mk b/vcl/unx/gtk/app/makefile.mk
index 3e8cd75..c5c071a 100644
--- a/vcl/unx/gtk/app/makefile.mk
+++ b/vcl/unx/gtk/app/makefile.mk
@@ -55,12 +55,12 @@ PKGCONFIG_MODULES=gtk+-2.0
SLOFILES=\
$(SLO)$/gtkdata.obj \
- $(SLO)$/gtkinst.obj \
- $(SLO)$/gtksys.obj
+ $(SLO)$/gtkinst.obj
EXCEPTIONSFILES=\
$(SLO)$/gtkdata.obj\
- $(SLO)$/gtkinst.obj
+ $(SLO)$/gtkinst.obj \
+ $(SLO)$/gtksys.obj
.ELSE # "$(ENABLE_GTK)" != ""
diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk
index bd75499..21dab6b 100644
--- a/vcl/unx/source/app/makefile.mk
+++ b/vcl/unx/source/app/makefile.mk
@@ -60,7 +60,6 @@ SLOFILES=\
$(SLO)$/salinst.obj \
$(SLO)$/salsys.obj \
$(SLO)$/soicon.obj \
- $(SLO)$/sm.obj \
$(SLO)$/keysymnames.obj \
$(SLO)$/wmadaptor.obj
@@ -72,7 +71,8 @@ EXCEPTIONSFILES=\
$(SLO)$/i18n_status.obj \
$(SLO)$/i18n_cb.obj \
$(SLO)$/i18n_ic.obj \
- $(SLO)$/salsys.obj
+ $(SLO)$/salsys.obj \
+ $(SLO)$/sm.obj
.IF "$(ENABLE_RANDR)" != ""
diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk
index 536aadc..b2aee56 100644
--- a/vcl/unx/source/gdi/makefile.mk
+++ b/vcl/unx/source/gdi/makefile.mk
@@ -47,27 +47,27 @@ dummy:
.ELSE # "$(GUIBASE)"!="unx"
SLOFILES= \
- $(SLO)$/salgdi2.obj \
$(SLO)$/salbmp.obj \
$(SLO)$/salgdi.obj \
- $(SLO)$/salvd.obj \
- $(SLO)$/dtint.obj \
$(SLO)$/salcvt.obj \
- $(SLO)$/xfont.obj \
$(SLO)$/xlfd_attr.obj \
$(SLO)$/xlfd_extd.obj \
$(SLO)$/xlfd_smpl.obj \
$(SLO)$/salgdi3.obj \
- $(SLO)$/gcach_xpeer.obj \
- $(SLO)$/xrender_peer.obj \
- $(SLO)$/pspgraphics.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)$/salgdi2.obj \
$(SLO)$/salgdi3.obj \
- $(SLO)$/salcvt.obj
+ $(SLO)$/salcvt.obj \
+ $(SLO)$/salvd.obj \
+ $(SLO)$/xfont.obj
.IF "$(USE_XPRINT)" == "TRUE"
CFLAGS+=-D_USE_PRINT_EXTENSION_=1
More information about the Libreoffice-commits
mailing list