diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2010-10-22 10:24:18 +0200 |
|---|---|---|
| committer | Thomas Klausner <wiz@NetBSD.org> | 2010-10-22 10:24:18 +0200 |
| commit | 58097cd69b480f3e82fddeb41bf483d386af894c (patch) | |
| tree | 3e6a4f2aca1639f1e8d4cb876fb5dd2e4d3ae012 | |
| parent | 7b309a8e09ba35902ce15cbf9d442494c07f2272 (diff) | |
Add more files to EXCEPTIONSFILES, needed at least on NetBSD.
| -rw-r--r-- | svx/source/gallery2/makefile.mk | 22 | ||||
| -rw-r--r-- | svx/source/items/makefile.mk | 44 | ||||
| -rw-r--r-- | svx/source/stbctrls/makefile.mk | 19 |
3 files changed, 41 insertions, 44 deletions
diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk index 4d73a4af2ad2..7f1a3bb7a7d3 100644 --- a/svx/source/gallery2/makefile.mk +++ b/svx/source/gallery2/makefile.mk @@ -42,23 +42,19 @@ SRC1FILES = \ galtheme.src SLOFILES = \ - $(SLO)$/galexpl.obj \ + $(EXCEPTIONSFILES) \ + $(SLO)$/codec.obj + +EXCEPTIONSFILES = \ + $(SLO)$/galbrws.obj \ + $(SLO)$/galbrws1.obj \ + $(SLO)$/galbrws2.obj \ $(SLO)$/galctrl.obj \ + $(SLO)$/galexpl.obj \ $(SLO)$/gallery1.obj \ - $(SLO)$/galtheme.obj \ $(SLO)$/galmisc.obj \ $(SLO)$/galobj.obj \ - $(SLO)$/codec.obj \ - $(SLO)$/galbrws.obj \ - $(SLO)$/galbrws1.obj \ - $(SLO)$/galbrws2.obj - -EXCEPTIONSFILES = \ - $(SLO)$/gallery1.obj \ - $(SLO)$/galtheme.obj \ - $(SLO)$/galmisc.obj \ - $(SLO)$/galbrws1.obj \ - $(SLO)$/galexpl.obj + $(SLO)$/galtheme.obj RESLIB1NAME = $(TARGET) RESLIB1IMAGES = $(PRJ)$/res diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk index 6e1f2a3177bc..8bd3edc036e7 100644 --- a/svx/source/items/makefile.mk +++ b/svx/source/items/makefile.mk @@ -50,34 +50,36 @@ SRC1FILES = \ LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/algitem.obj \ - $(SLO)$/drawitem.obj \ - $(SLO)$/chrtitem.obj \ - $(SLO)$/e3ditem.obj \ - $(SLO)$/grfitem.obj \ - $(SLO)$/clipfmtitem.obj \ - $(SLO)$/customshapeitem.obj + $(SLO)$/algitem.obj \ + $(SLO)$/chrtitem.obj \ + $(SLO)$/clipfmtitem.obj \ + $(SLO)$/customshapeitem.obj \ + $(SLO)$/drawitem.obj \ + $(SLO)$/e3ditem.obj \ + $(SLO)$/grfitem.obj LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ - $(SLO)$/ofaitem.obj \ - $(SLO)$/postattr.obj \ - $(SLO)$/hlnkitem.obj \ - $(SLO)$/pageitem.obj \ - $(SLO)$/viewlayoutitem.obj \ - $(SLO)$/rotmodit.obj \ - $(SLO)$/numinf.obj \ - $(SLO)$/svxerr.obj \ - $(SLO)$/numfmtsh.obj \ - $(SLO)$/zoomitem.obj \ - $(SLO)$/svxempty.obj \ - $(SLO)$/SmartTagItem.obj \ - $(SLO)$/zoomslideritem.obj \ + $(SLO)$/SmartTagItem.obj \ + $(SLO)$/hlnkitem.obj \ + $(SLO)$/numfmtsh.obj \ + $(SLO)$/numinf.obj \ + $(SLO)$/ofaitem.obj \ + $(SLO)$/pageitem.obj \ + $(SLO)$/postattr.obj \ + $(SLO)$/rotmodit.obj \ + $(SLO)$/svxempty.obj \ + $(SLO)$/svxerr.obj \ + $(SLO)$/viewlayoutitem.obj \ + $(SLO)$/zoomitem.obj \ + $(SLO)$/zoomslideritem.obj SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) EXCEPTIONSFILES= \ - $(SLO)$/customshapeitem.obj + $(SLO)$/chrtitem.obj \ + $(SLO)$/customshapeitem.obj \ + $(SLO)$/numfmtsh.obj .INCLUDE : target.mk diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk index 0cd85945637f..ac9445d982bb 100644 --- a/svx/source/stbctrls/makefile.mk +++ b/svx/source/stbctrls/makefile.mk @@ -46,17 +46,16 @@ SRC1FILES = \ stbctrls.src SLOFILES= \ + $(EXCEPTIONSFILES) + +EXCEPTIONSFILES= \ $(SLO)$/insctrl.obj \ - $(SLO)$/zoomctrl.obj \ + $(SLO)$/modctrl.obj \ $(SLO)$/pszctrl.obj \ $(SLO)$/selctrl.obj \ - $(SLO)$/modctrl.obj \ - $(SLO)$/xmlsecctrl.obj \ - $(SLO)$/zoomsliderctrl.obj - -EXCEPTIONSFILES= \ - $(SLO)$/modctrl.obj \ - $(SLO)$/zoomsliderctrl.obj + $(SLO)$/xmlsecctrl.obj \ + $(SLO)$/zoomctrl.obj \ + $(SLO)$/zoomsliderctrl.obj HXX1TARGET=stbctrls HXX1EXT= hxx @@ -67,8 +66,8 @@ HXX1DEPN=\ $(INC)$/pszctrl.hxx \ $(INC)$/selctrl.hxx \ $(INC)$/modctrl.hxx \ - $(INC)$/xmlsecctrl.hxx \ - $(INC)$/zoomsliderctrl.hxx \ + $(INC)$/xmlsecctrl.hxx \ + $(INC)$/zoomsliderctrl.hxx \ # --- Targets ------------------------------------------------------- |