[Libreoffice-commits] .: filter/source

Thomas Klausner tklausner at kemper.freedesktop.org
Fri Oct 22 02:47:21 PDT 2010 

 filter/source/graphicfilter/egif/makefile.mk    |    9 +++++++--
 filter/source/graphicfilter/eos2met/makefile.mk |    5 ++++-
 filter/source/graphicfilter/epbm/makefile.mk    |    7 +++++--
 filter/source/graphicfilter/epgm/makefile.mk    |    7 +++++--
 filter/source/graphicfilter/epict/makefile.mk   |    2 ++
 filter/source/graphicfilter/eppm/makefile.mk    |    8 ++++++--
 filter/source/graphicfilter/eps/makefile.mk     |    7 ++++---
 filter/source/graphicfilter/eras/makefile.mk    |    1 +
 filter/source/graphicfilter/etiff/makefile.mk   |    1 +
 filter/source/graphicfilter/expm/makefile.mk    |    1 +
 filter/source/graphicfilter/idxf/makefile.mk    |   16 ++++++++--------
 filter/source/graphicfilter/ieps/makefile.mk    |    1 +
 filter/source/graphicfilter/ios2met/makefile.mk |    3 ++-
 filter/source/graphicfilter/ipbm/makefile.mk    |    1 +
 filter/source/graphicfilter/ipcd/makefile.mk    |    3 ++-
 filter/source/graphicfilter/ipcx/makefile.mk    |    1 +
 filter/source/graphicfilter/ipict/makefile.mk   |    3 ++-
 filter/source/graphicfilter/ipsd/makefile.mk    |    1 +
 filter/source/graphicfilter/iras/makefile.mk    |    1 +
 filter/source/graphicfilter/itga/makefile.mk    |    3 ++-
 20 files changed, 57 insertions(+), 24 deletions(-)

New commits:
commit 279c35fd3c809616593ab08afd9c3593dba789b3
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Fri Oct 22 11:46:56 2010 +0200

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

diff --git a/filter/source/graphicfilter/egif/makefile.mk b/filter/source/graphicfilter/egif/makefile.mk
index 27dae49..3a26053 100644
--- a/filter/source/graphicfilter/egif/makefile.mk
+++ b/filter/source/graphicfilter/egif/makefile.mk
@@ -46,9 +46,14 @@ SRS1NAME=$(TARGET)
 SRC1FILES =	dlgegif.src		\
         egifstr.src
 .IF "$(L10N_framework)"==""
-SLOFILES= 	$(SLO)$/egif.obj		\
-        $(SLO)$/dlgegif.obj	\
+SLOFILES= \
+        $(EXCEPTIONSFILES)	\
         $(SLO)$/giflzwc.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/dlgegif.obj	\
+        $(SLO)$/egif.obj
+
 .ENDIF
 
 # ==========================================================================
diff --git a/filter/source/graphicfilter/eos2met/makefile.mk b/filter/source/graphicfilter/eos2met/makefile.mk
index 9f8deb7..af90434 100644
--- a/filter/source/graphicfilter/eos2met/makefile.mk
+++ b/filter/source/graphicfilter/eos2met/makefile.mk
@@ -46,8 +46,11 @@ SRS1NAME=$(TARGET)
 SRC1FILES= 	dlgeos2.src	\
             eos2mstr.src
 .IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/eos2met.obj	\
+SLOFILES = $(EXCEPTIONSFILES)
+EXCEPTIONSFILES= \
+            $(SLO)$/eos2met.obj \
             $(SLO)$/dlgeos2.obj
+
 .ENDIF
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/epbm/makefile.mk b/filter/source/graphicfilter/epbm/makefile.mk
index 3b24822..6cf6531 100644
--- a/filter/source/graphicfilter/epbm/makefile.mk
+++ b/filter/source/graphicfilter/epbm/makefile.mk
@@ -46,8 +46,11 @@ SRS1NAME=$(TARGET)
 SRC1FILES=	dlgepbm.src \
             epbmstr.src
 .IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/epbm.obj \
-            $(SLO)$/dlgepbm.obj
+SLOFILES = \
+	$(EXCEPTIONSFILES)
+EXCEPTIONSFILES =	\
+	$(SLO)$/epbm.obj \
+	$(SLO)$/dlgepbm.obj
 .ENDIF
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/epgm/makefile.mk b/filter/source/graphicfilter/epgm/makefile.mk
index 70ab5ec..edfd9b4 100644
--- a/filter/source/graphicfilter/epgm/makefile.mk
+++ b/filter/source/graphicfilter/epgm/makefile.mk
@@ -47,8 +47,11 @@ SRS1NAME=$(TARGET)
 SRC1FILES=	dlgepgm.src \
             epgmstr.src
 .IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/epgm.obj \
-            $(SLO)$/dlgepgm.obj
+SLOFILES = \
+	$(EXCEPTIONSFILES)
+EXCEPTIONSFILES = \
+	$(SLO)$/epgm.obj \
+	$(SLO)$/dlgepgm.obj
 .ENDIF
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/epict/makefile.mk b/filter/source/graphicfilter/epict/makefile.mk
index a7c99eb..bf32b0e 100644
--- a/filter/source/graphicfilter/epict/makefile.mk
+++ b/filter/source/graphicfilter/epict/makefile.mk
@@ -49,6 +49,8 @@ SRC1FILES =	dlgepct.src	\
 .IF "$(L10N_framework)"==""
 SLOFILES =  $(SLO)$/epict.obj \
             $(SLO)$/dlgepct.obj
+EXCEPTIONSFILES =  $(SLO)$/epict.obj \
+            $(SLO)$/dlgepct.obj
 .ENDIF
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/eppm/makefile.mk b/filter/source/graphicfilter/eppm/makefile.mk
index 44e6ca1..62d5f20 100644
--- a/filter/source/graphicfilter/eppm/makefile.mk
+++ b/filter/source/graphicfilter/eppm/makefile.mk
@@ -46,8 +46,12 @@ SRS1NAME=$(TARGET)
 SRC1FILES=	dlgeppm.src \
             eppmstr.src
 .IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/eppm.obj \
-            $(SLO)$/dlgeppm.obj
+SLOFILES =	\
+	$(SLO)$/eppm.obj \
+	$(SLO)$/dlgeppm.obj
+EXCEPTIONSFILES= \
+	$(SLO)$/eppm.obj \
+	$(SLO)$/dlgeppm.obj
 .ENDIF
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/eps/makefile.mk b/filter/source/graphicfilter/eps/makefile.mk
index 189972e..34c87f1 100644
--- a/filter/source/graphicfilter/eps/makefile.mk
+++ b/filter/source/graphicfilter/eps/makefile.mk
@@ -47,9 +47,10 @@ SRS1NAME=$(TARGET)
 SRC1FILES =	dlgeps.src \
             epsstr.src
 .IF "$(L10N_framework)"==""
-EXCEPTIONSFILES=$(SLO)$/eps.obj
-SLOFILES =	$(SLO)$/eps.obj \
-            $(SLO)$/dlgeps.obj
+EXCEPTIONSFILES= \
+	$(SLO)$/eps.obj \
+	$(SLO)$/dlgeps.obj
+SLOFILES = $(EXCEPTIONSFILES)
 .ENDIF
 
 # ==========================================================================
diff --git a/filter/source/graphicfilter/eras/makefile.mk b/filter/source/graphicfilter/eras/makefile.mk
index 051c706..befdc43 100644
--- a/filter/source/graphicfilter/eras/makefile.mk
+++ b/filter/source/graphicfilter/eras/makefile.mk
@@ -42,6 +42,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 
 SLOFILES =	$(SLO)$/eras.obj
+EXCEPTIONSFILES =	$(SLO)$/eras.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/etiff/makefile.mk b/filter/source/graphicfilter/etiff/makefile.mk
index a3f5219..21c3f83 100644
--- a/filter/source/graphicfilter/etiff/makefile.mk
+++ b/filter/source/graphicfilter/etiff/makefile.mk
@@ -42,6 +42,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 SLOFILES =	$(SLO)$/etiff.obj
+EXCEPTIONSFILES =	$(SLO)$/etiff.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/expm/makefile.mk b/filter/source/graphicfilter/expm/makefile.mk
index 7431497..efd3d98 100644
--- a/filter/source/graphicfilter/expm/makefile.mk
+++ b/filter/source/graphicfilter/expm/makefile.mk
@@ -43,6 +43,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 SLOFILES =	$(SLO)$/expm.obj
+EXCEPTIONSFILES =	$(SLO)$/expm.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/idxf/makefile.mk b/filter/source/graphicfilter/idxf/makefile.mk
index 046f076..4710cdc 100644
--- a/filter/source/graphicfilter/idxf/makefile.mk
+++ b/filter/source/graphicfilter/idxf/makefile.mk
@@ -42,18 +42,18 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 EXCEPTIONSFILES=\
-            $(SLO)$/dxfentrd.obj \
-            $(SLO)$/dxf2mtf.obj
-
-SLOFILES =  $(SLO)$/dxfgrprd.obj \
-            $(SLO)$/dxfvec.obj   \
-            $(SLO)$/dxfentrd.obj \
+            $(SLO)$/dxf2mtf.obj  \
             $(SLO)$/dxfblkrd.obj \
-            $(SLO)$/dxftblrd.obj \
+            $(SLO)$/dxfentrd.obj \
+            $(SLO)$/dxfgrprd.obj \
             $(SLO)$/dxfreprd.obj \
-            $(SLO)$/dxf2mtf.obj  \
+            $(SLO)$/dxftblrd.obj \
             $(SLO)$/idxf.obj
 
+SLOFILES =  \
+            $(EXCEPTIONSFILES)   \
+            $(SLO)$/dxfvec.obj
+
 # ==========================================================================
 
 SHL1TARGET=     idx$(DLLPOSTFIX)
diff --git a/filter/source/graphicfilter/ieps/makefile.mk b/filter/source/graphicfilter/ieps/makefile.mk
index 7d8fdb6..5c17fef 100644
--- a/filter/source/graphicfilter/ieps/makefile.mk
+++ b/filter/source/graphicfilter/ieps/makefile.mk
@@ -42,6 +42,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 SLOFILES =  $(SLO)$/ieps.obj
+EXCEPTIONSFILES =  $(SLO)$/ieps.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/ios2met/makefile.mk b/filter/source/graphicfilter/ios2met/makefile.mk
index b3358ee..39eeca5 100644
--- a/filter/source/graphicfilter/ios2met/makefile.mk
+++ b/filter/source/graphicfilter/ios2met/makefile.mk
@@ -41,7 +41,8 @@ DEPTARGET=vios2met
 CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ios2met.obj
+SLOFILES =  $(EXCEPTIONSFILES)
+EXCEPTIONSFILES = $(SLO)$/ios2met.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/ipbm/makefile.mk b/filter/source/graphicfilter/ipbm/makefile.mk
index 8f29b3a..50648f0 100644
--- a/filter/source/graphicfilter/ipbm/makefile.mk
+++ b/filter/source/graphicfilter/ipbm/makefile.mk
@@ -42,6 +42,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 SLOFILES =	$(SLO)$/ipbm.obj
+EXCEPTIONSFILES =	$(SLO)$/ipbm.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/ipcd/makefile.mk b/filter/source/graphicfilter/ipcd/makefile.mk
index 5b43d95..25442e0 100644
--- a/filter/source/graphicfilter/ipcd/makefile.mk
+++ b/filter/source/graphicfilter/ipcd/makefile.mk
@@ -41,7 +41,8 @@ DEPTARGET=vipcd
 CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ipcd.obj
+SLOFILES =  $(EXCEPTIONSFILES)
+EXCEPTIONSFILES = $(SLO)$/ipcd.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/ipcx/makefile.mk b/filter/source/graphicfilter/ipcx/makefile.mk
index 679ffd2..261c22a 100644
--- a/filter/source/graphicfilter/ipcx/makefile.mk
+++ b/filter/source/graphicfilter/ipcx/makefile.mk
@@ -42,6 +42,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 SLOFILES =  $(SLO)$/ipcx.obj
+EXCEPTIONSFILES =  $(SLO)$/ipcx.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/ipict/makefile.mk b/filter/source/graphicfilter/ipict/makefile.mk
index 679fd79..1f74699 100644
--- a/filter/source/graphicfilter/ipict/makefile.mk
+++ b/filter/source/graphicfilter/ipict/makefile.mk
@@ -41,7 +41,8 @@ DEPTARGET=vipict
 CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ipict.obj
+SLOFILES =  $(EXCEPTIONSFILES)
+EXCEPTIONSFILES = $(SLO)$/ipict.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/ipsd/makefile.mk b/filter/source/graphicfilter/ipsd/makefile.mk
index 8974563..68dee3e 100644
--- a/filter/source/graphicfilter/ipsd/makefile.mk
+++ b/filter/source/graphicfilter/ipsd/makefile.mk
@@ -42,6 +42,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 SLOFILES =	$(SLO)$/ipsd.obj
+EXCEPTIONSFILES =	$(SLO)$/ipsd.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/iras/makefile.mk b/filter/source/graphicfilter/iras/makefile.mk
index 9585a35..d6bddf8 100644
--- a/filter/source/graphicfilter/iras/makefile.mk
+++ b/filter/source/graphicfilter/iras/makefile.mk
@@ -42,6 +42,7 @@ CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
 SLOFILES =	$(SLO)$/iras.obj
+EXCEPTIONSFILES = $(SLO)$/iras.obj
 
 # ==========================================================================
 
diff --git a/filter/source/graphicfilter/itga/makefile.mk b/filter/source/graphicfilter/itga/makefile.mk
index ef810d1..0209580 100644
--- a/filter/source/graphicfilter/itga/makefile.mk
+++ b/filter/source/graphicfilter/itga/makefile.mk
@@ -41,7 +41,8 @@ DEPTARGET=vitga
 CDEFS+= -DEDITDEBUG
 .ENDIF
 .IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/itga.obj
+SLOFILES =	$(EXCEPTIONSFILES)
+EXCEPTIONSFILES = $(SLO)$/itga.obj
 
 # ==========================================================================

More information about the Libreoffice-commits mailing list