[Libreoffice-commits] .: 2 commits - sd/source

[Thomas Klausner]

 sd/source/filter/cgm/makefile.mk |    4 +++-
 sd/source/filter/makefile.mk     |    7 +++----
 sd/source/ui/app/makefile.mk     |   21 ++++++++-------------
 3 files changed, 14 insertions(+), 18 deletions(-)

New commits:
commit 1006a40cc0f02e55edb49a30605c509170cbb082
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Tue Nov 2 17:00:18 2010 +0100

    Add more files to EXCEPTIONSFILES, needed on at least NetBSD.
    
    While here, remove pptin.obj from EXCEPTIONSFILES, it's not
    in SLOFILES and doesn't exist here. Ok caolan.

diff --git a/sd/source/filter/makefile.mk b/sd/source/filter/makefile.mk
index 554b1c5..78d383e 100644
--- a/sd/source/filter/makefile.mk
+++ b/sd/source/filter/makefile.mk
@@ -43,12 +43,11 @@ CDEFS+= -DDBG_ANIM_LOG
 # --- Files --------------------------------------------------------
 
 SLOFILES =\
-        $(SLO)$/sdfilter.obj	\
-        $(SLO)$/sdpptwrp.obj	
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES= \
-           $(SLO)$/pptin.obj		\
-           $(SLO)$/sdfilter.obj
+        $(SLO)$/sdfilter.obj	\
+        $(SLO)$/sdpptwrp.obj
 
 # --- Tagets -------------------------------------------------------
 
commit 8377410d9af064d01c2a306a6d45dbf6062a203a
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Tue Nov 2 16:59:41 2010 +0100

    Add more files to EXCEPTIONSFILES, needed on at least NetBSD.

diff --git a/sd/source/filter/cgm/makefile.mk b/sd/source/filter/cgm/makefile.mk
index 65ac2c4..510a727 100644
--- a/sd/source/filter/cgm/makefile.mk
+++ b/sd/source/filter/cgm/makefile.mk
@@ -36,7 +36,9 @@ TARGET=cgm
 
 # --- Files --------------------------------------------------------
 
-SLOFILES = $(SLO)$/sdcgmfilter.obj	
+SLOFILES = $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = $(SLO)$/sdcgmfilter.obj
 
 # --- Targets --------------------------------------------------------------
 
diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk
index b0ac260..8fbbf31 100755
--- a/sd/source/ui/app/makefile.mk
+++ b/sd/source/ui/app/makefile.mk
@@ -59,24 +59,19 @@ SRC1FILES =	\
 #		$(OBJ)$/sdresid.obj	\
 
 SLOFILES =	\
+        $(EXCEPTIONSFILES)		\
+        $(SLO)$/sdresid.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/optsitem.obj		\
+        $(SLO)$/sddll.obj		\
+        $(SLO)$/sddll1.obj      	\
+        $(SLO)$/sddll2.obj      	\
         $(SLO)$/sdmod.obj		\
         $(SLO)$/sdmod1.obj		\
         $(SLO)$/sdmod2.obj		\
-        $(SLO)$/sddll.obj		\
-        $(SLO)$/sddll1.obj      \
-        $(SLO)$/sddll2.obj      \
-        $(SLO)$/tbxww.obj		\
-        $(SLO)$/optsitem.obj	\
-        $(SLO)$/sdresid.obj		\
         $(SLO)$/sdpopup.obj		\
         $(SLO)$/sdxfer.obj		\
-        $(SLO)$/tmplctrl.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/sddll1.obj      \
-        $(SLO)$/sddll2.obj      \
-        $(SLO)$/sdxfer.obj		\
-        $(SLO)$/sdmod1.obj		\
         $(SLO)$/tbxww.obj		\
         $(SLO)$/tmplctrl.obj