[Libreoffice-commits] .: avmedia/source connectivity/source editeng/source
Thomas Klausner
tklausner at kemper.freedesktop.org
Thu Oct 21 13:43:44 PDT 2010
avmedia/source/framework/makefile.mk | 9 +++----
avmedia/source/viewer/makefile.mk | 8 ++----
connectivity/source/drivers/file/makefile.mk | 28 +++++++++++-----------
connectivity/source/parse/makefile.mk | 12 ++++-----
connectivity/source/simpledbt/makefile.mk | 12 ++++-----
editeng/source/items/makefile.mk | 33 +++++++++++----------------
editeng/source/rtf/makefile.mk | 6 ++--
7 files changed, 50 insertions(+), 58 deletions(-)
New commits:
commit cbe2d337516b6bec5c42a1f5097dd47bc1d91f04
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Thu Oct 21 22:43:27 2010 +0200
Add more files to EXCEPTIONSFILES, needed at least on NetBSD.
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 4185f3c..4c814c5 100644
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/source/framework/makefile.mk
@@ -42,14 +42,13 @@ SRC1FILES =\
# --- Files -------------------------------------
SLOFILES= \
+ $(EXCEPTIONSFILES) \
$(SLO)$/mediaitem.obj \
- $(SLO)$/mediamisc.obj \
- $(SLO)$/mediacontrol.obj \
- $(SLO)$/mediatoolbox.obj \
- $(SLO)$/mediaplayer.obj \
- $(SLO)$/soundhandler.obj
EXCEPTIONSFILES = \
+ $(SLO)$/mediacontrol.obj \
+ $(SLO)$/mediamisc.obj \
+ $(SLO)$/mediaplayer.obj \
$(SLO)$/mediatoolbox.obj \
$(SLO)$/soundhandler.obj
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
index 8d5d6a5..7771d1e 100644
--- a/avmedia/source/viewer/makefile.mk
+++ b/avmedia/source/viewer/makefile.mk
@@ -42,15 +42,13 @@ SRC1FILES =\
# --- Files -------------------------------------
SLOFILES= \
- $(SLO)$/mediaevent_impl.obj \
- $(SLO)$/mediawindowbase_impl.obj \
- $(SLO)$/mediawindow_impl.obj \
- $(SLO)$/mediawindow.obj
+ $(EXCEPTIONSFILES)
EXCEPTIONSFILES= \
+ $(SLO)$/mediaevent_impl.obj \
$(SLO)$/mediawindow.obj \
+ $(SLO)$/mediawindow_impl.obj \
$(SLO)$/mediawindowbase_impl.obj \
- $(SLO)$/mediawindow_impl.obj
# --- Targets ----------------------------------
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 6cc615a..bd6a29e 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -45,27 +45,27 @@ CDEFS += -DOOO_DLLIMPLEMENTATION_FILE
# --- Files -------------------------------------
EXCEPTIONSFILES=\
- $(SLO)$/FNoException.obj \
- $(SLO)$/FConnection.obj \
- $(SLO)$/FResultSetMetaData.obj \
- $(SLO)$/FColumns.obj \
- $(SLO)$/FTables.obj \
- $(SLO)$/FTable.obj \
$(SLO)$/FCatalog.obj \
+ $(SLO)$/FColumns.obj \
+ $(SLO)$/FConnection.obj \
+ $(SLO)$/FDatabaseMetaData.obj \
+ $(SLO)$/FDateFunctions.obj \
+ $(SLO)$/FDriver.obj \
+ $(SLO)$/FNoException.obj \
+ $(SLO)$/FNumericFunctions.obj \
+ $(SLO)$/FPreparedStatement.obj \
$(SLO)$/FResultSet.obj \
+ $(SLO)$/FResultSetMetaData.obj \
$(SLO)$/FStatement.obj \
- $(SLO)$/FPreparedStatement.obj \
- $(SLO)$/FDatabaseMetaData.obj \
- $(SLO)$/FDriver.obj \
+ $(SLO)$/FStringFunctions.obj \
+ $(SLO)$/FTable.obj \
+ $(SLO)$/FTables.obj \
$(SLO)$/fanalyzer.obj \
- $(SLO)$/fcomp.obj \
- $(SLO)$/fcode.obj
+ $(SLO)$/fcode.obj \
+ $(SLO)$/fcomp.obj
SLOFILES=\
$(EXCEPTIONSFILES) \
- $(SLO)$/FStringFunctions.obj \
- $(SLO)$/FDateFunctions.obj \
- $(SLO)$/FNumericFunctions.obj \
$(SLO)$/quotedstring.obj
diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk
index 98eb468..510fbb2 100644
--- a/connectivity/source/parse/makefile.mk
+++ b/connectivity/source/parse/makefile.mk
@@ -43,15 +43,15 @@ YACCFILES= sqlbison.y
YACCFLAGS=-v -d -l -pSQLyy -bsql
EXCEPTIONSFILES = \
- $(SLO)$/PColumn.obj \
+ $(SLO)$/PColumn.obj \
+ $(SLO)$/internalnode.obj \
$(SLO)$/sqliterator.obj \
- $(SLO)$/sqlnode.obj \
- $(SLO)$/wrap_sqlbison.obj \
- $(SLO)$/internalnode.obj
+ $(SLO)$/sqlnode.obj \
+ $(SLO)$/wrap_sqlbison.obj \
+ $(SLO)$/wrap_sqlflex.obj
SLOFILES = \
- $(EXCEPTIONSFILES) \
- $(SLO)$/wrap_sqlflex.obj
+ $(EXCEPTIONSFILES)
# --- Targets -------------------------------------------------------
diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk
index 49409e2..96bce96 100644
--- a/connectivity/source/simpledbt/makefile.mk
+++ b/connectivity/source/simpledbt/makefile.mk
@@ -36,15 +36,15 @@ TARGET=simpledbt
# --- Files --------------------------------------------------------
EXCEPTIONSFILES=\
- $(SLO)$/charset_s.obj \
- $(SLO)$/staticdbtools_s.obj \
- $(SLO)$/parsenode_s.obj \
- $(SLO)$/parser_s.obj
+ $(SLO)$/charset_s.obj \
+ $(SLO)$/dbtfactory.obj \
+ $(SLO)$/parsenode_s.obj \
+ $(SLO)$/parser_s.obj \
+ $(SLO)$/staticdbtools_s.obj
SLOFILES=\
$(EXCEPTIONSFILES) \
- $(SLO)$/refbase.obj \
- $(SLO)$/dbtfactory.obj \
+ $(SLO)$/refbase.obj
# --- Targets ------------------------------------------------------
diff --git a/editeng/source/items/makefile.mk b/editeng/source/items/makefile.mk
index 1a24244..375d3a9 100644
--- a/editeng/source/items/makefile.mk
+++ b/editeng/source/items/makefile.mk
@@ -52,29 +52,24 @@ SRC1FILES = \
svxitems.src
SLOFILES= \
- $(SLO)$/optitems.obj \
- $(SLO)$/svdfield.obj \
- $(SLO)$/writingmodeitem.obj \
- $(SLO)$/frmitems.obj \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/charhiddenitem.obj \
$(SLO)$/justifyitem.obj \
- $(SLO)$/paraitem.obj \
- $(SLO)$/textitem.obj \
- $(SLO)$/flditem.obj \
- $(SLO)$/svxfont.obj \
- $(SLO)$/paperinf.obj \
- $(SLO)$/itemtype.obj \
- $(SLO)$/bulitem.obj \
- $(SLO)$/numitem.obj \
- $(SLO)$/xmlcnitm.obj \
- $(SLO)$/charhiddenitem.obj
+ $(SLO)$/optitems.obj \
+ $(SLO)$/writingmodeitem.obj
EXCEPTIONSFILES= \
- $(SLO)$/svdfield.obj \
- $(SLO)$/paraitem.obj \
+ $(SLO)$/bulitem.obj \
+ $(SLO)$/flditem.obj \
$(SLO)$/frmitems.obj \
- $(SLO)$/numitem.obj\
- $(SLO)$/xmlcnitm.obj\
- $(SLO)$/flditem.obj
+ $(SLO)$/itemtype.obj \
+ $(SLO)$/numitem.obj \
+ $(SLO)$/paperinf.obj \
+ $(SLO)$/paraitem.obj \
+ $(SLO)$/svdfield.obj \
+ $(SLO)$/svxfont.obj \
+ $(SLO)$/textitem.obj \
+ $(SLO)$/xmlcnitm.obj
.INCLUDE : target.mk
diff --git a/editeng/source/rtf/makefile.mk b/editeng/source/rtf/makefile.mk
index ef1c5f4..6a05ab6 100644
--- a/editeng/source/rtf/makefile.mk
+++ b/editeng/source/rtf/makefile.mk
@@ -38,12 +38,12 @@ TARGET=rtf
# --- Files --------------------------------------------------------
EXCEPTIONSFILES= \
- $(SLO)$/svxrtf.obj
+ $(SLO)$/svxrtf.obj \
+ $(SLO)$/rtfgrf.obj
SLOFILES= \
$(EXCEPTIONSFILES) \
- $(SLO)$/rtfitem.obj \
- $(SLO)$/rtfgrf.obj
+ $(SLO)$/rtfitem.obj
# ==========================================================================
More information about the Libreoffice-commits
mailing list