[Libreoffice-commits] .: dbaccess/source
Thomas Klausner
tklausner at kemper.freedesktop.org
Mon Nov 1 15:02:23 PDT 2010
dbaccess/source/core/resource/makefile.mk | 5 +-
dbaccess/source/ui/app/makefile.mk | 6 +-
dbaccess/source/ui/browser/makefile.mk | 32 +++++++-------
dbaccess/source/ui/control/makefile.mk | 34 +++++++-------
dbaccess/source/ui/dlg/makefile.mk | 66 ++++++++++++++---------------
dbaccess/source/ui/querydesign/makefile.mk | 58 ++++++++++++-------------
6 files changed, 102 insertions(+), 99 deletions(-)
New commits:
commit 04ba44dfe598b1cb433126b9bc657466ccc9d64a
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Mon Nov 1 23:01:51 2010 +0100
Add more files to EXCEPTIONSFILES, needed at least on NetBSD.
diff --git a/dbaccess/source/core/resource/makefile.mk b/dbaccess/source/core/resource/makefile.mk
index 293b92b..35a54c6 100644
--- a/dbaccess/source/core/resource/makefile.mk
+++ b/dbaccess/source/core/resource/makefile.mk
@@ -41,7 +41,10 @@ SRS1NAME=core_strings
SRC1FILES= \
strings.src \
-SLOFILES= $(SLO)$/core_resource.obj \
+EXCEPTIONSFILES= \
+ $(SLO)$/core_resource.obj
+
+SLOFILES= $(EXCEPTIONSFILES)
# --- Targets ----------------------------------
diff --git a/dbaccess/source/ui/app/makefile.mk b/dbaccess/source/ui/app/makefile.mk
index a7097b4..658456f 100644
--- a/dbaccess/source/ui/app/makefile.mk
+++ b/dbaccess/source/ui/app/makefile.mk
@@ -40,19 +40,19 @@ TARGET=app
# --- Files --------------------------------------------------------
EXCEPTIONSFILES=\
- $(SLO)$/AppDetailView.obj \
$(SLO)$/AppController.obj \
$(SLO)$/AppControllerDnD.obj \
$(SLO)$/AppControllerGen.obj \
$(SLO)$/AppDetailPageHelper.obj \
+ $(SLO)$/AppDetailView.obj \
+ $(SLO)$/AppIconControl.obj \
$(SLO)$/AppSwapWindow.obj \
$(SLO)$/AppTitleWindow.obj \
- $(SLO)$/AppView.obj \
+ $(SLO)$/AppView.obj \
$(SLO)$/subcomponentmanager.obj
SLOFILES =\
- $(SLO)$/AppIconControl.obj \
$(EXCEPTIONSFILES)
SRS1NAME=$(TARGET)
diff --git a/dbaccess/source/ui/browser/makefile.mk b/dbaccess/source/ui/browser/makefile.mk
index a7dbd74..4d0cbc8 100644
--- a/dbaccess/source/ui/browser/makefile.mk
+++ b/dbaccess/source/ui/browser/makefile.mk
@@ -37,25 +37,25 @@ TARGET=browser
# --- Files --------------------------------------------------------
EXCEPTIONSFILES=\
- $(SLO)$/genericcontroller.obj \
- $(SLO)$/dsbrowserDnD.obj \
- $(SLO)$/dataview.obj \
- $(SLO)$/dbexchange.obj \
- $(SLO)$/dbloader.obj \
- $(SLO)$/sbagrid.obj \
- $(SLO)$/formadapter.obj \
- $(SLO)$/brwview.obj \
- $(SLO)$/brwctrlr.obj \
- $(SLO)$/unodatbr.obj \
- $(SLO)$/sbamultiplex.obj \
+ $(SLO)$/AsyncronousLink.obj \
+ $(SLO)$/brwctrlr.obj \
+ $(SLO)$/brwview.obj \
+ $(SLO)$/dataview.obj \
+ $(SLO)$/dbexchange.obj \
+ $(SLO)$/dbloader.obj \
+ $(SLO)$/dbtreemodel.obj \
+ $(SLO)$/dbtreeview.obj \
+ $(SLO)$/dsEntriesNoExp.obj \
+ $(SLO)$/dsbrowserDnD.obj \
$(SLO)$/exsrcbrw.obj \
- $(SLO)$/dbtreemodel.obj \
- $(SLO)$/dsEntriesNoExp.obj \
- $(SLO)$/dbtreeview.obj
+ $(SLO)$/formadapter.obj \
+ $(SLO)$/genericcontroller.obj \
+ $(SLO)$/sbagrid.obj \
+ $(SLO)$/sbamultiplex.obj \
+ $(SLO)$/unodatbr.obj
SLOFILES =\
- $(EXCEPTIONSFILES)\
- $(SLO)$/AsyncronousLink.obj
+ $(EXCEPTIONSFILES)
SRS1NAME=$(TARGET)
SRC1FILES = sbabrw.src \
diff --git a/dbaccess/source/ui/control/makefile.mk b/dbaccess/source/ui/control/makefile.mk
index 7685749..913a475 100644
--- a/dbaccess/source/ui/control/makefile.mk
+++ b/dbaccess/source/ui/control/makefile.mk
@@ -48,29 +48,29 @@ SRC1FILES = \
# ... exception files .........................
EXCEPTIONSFILES=\
- $(SLO)$/statusbarontroller.obj \
- $(SLO)$/RelationControl.obj \
- $(SLO)$/toolboxcontroller.obj \
- $(SLO)$/tabletree.obj \
- $(SLO)$/TableGrantCtrl.obj \
- $(SLO)$/dbtreelistbox.obj \
- $(SLO)$/sqledit.obj \
$(SLO)$/ColumnControlWindow.obj \
$(SLO)$/FieldDescControl.obj \
- $(SLO)$/opendoccontrols.obj
+ $(SLO)$/RelationControl.obj \
+ $(SLO)$/SqlNameEdit.obj \
+ $(SLO)$/TableGrantCtrl.obj \
+ $(SLO)$/VertSplitView.obj \
+ $(SLO)$/charsetlistbox.obj \
+ $(SLO)$/curledit.obj \
+ $(SLO)$/dbtreelistbox.obj \
+ $(SLO)$/listviewitems.obj \
+ $(SLO)$/marktree.obj \
+ $(SLO)$/opendoccontrols.obj \
+ $(SLO)$/sqledit.obj \
+ $(SLO)$/statusbarontroller.obj \
+ $(SLO)$/tabletree.obj \
+ $(SLO)$/toolboxcontroller.obj \
+ $(SLO)$/undosqledit.obj
# ... object files ............................
SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/ScrollHelper.obj \
- $(SLO)$/VertSplitView.obj \
- $(SLO)$/SqlNameEdit.obj \
- $(SLO)$/listviewitems.obj \
- $(SLO)$/undosqledit.obj \
- $(SLO)$/marktree.obj \
- $(SLO)$/curledit.obj \
- $(SLO)$/charsetlistbox.obj
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/ScrollHelper.obj
# --- Targets ----------------------------------
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index 270741d..4f0058a 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -85,47 +85,47 @@ SRC1FILES = \
# ... object files ............................
EXCEPTIONSFILES= \
+ $(SLO)$/AdabasStat.obj \
+ $(SLO)$/CollectionView.obj \
+ $(SLO)$/ConnectionHelper.obj \
+ $(SLO)$/ConnectionPage.obj \
+ $(SLO)$/ConnectionPageSetup.obj \
+ $(SLO)$/DBSetupConnectionPages.obj \
+ $(SLO)$/DbAdminImpl.obj \
+ $(SLO)$/DriverSettings.obj \
+ $(SLO)$/RelationDlg.obj \
+ $(SLO)$/TablesSingleDlg.obj \
+ $(SLO)$/TextConnectionHelper.obj \
+ $(SLO)$/UserAdmin.obj \
+ $(SLO)$/UserAdminDlg.obj \
+ $(SLO)$/admincontrols.obj \
+ $(SLO)$/adminpages.obj \
+ $(SLO)$/adtabdlg.obj \
+ $(SLO)$/advancedsettings.obj \
+ $(SLO)$/dbadmin.obj \
+ $(SLO)$/dbfindex.obj \
+ $(SLO)$/dbwiz.obj \
+ $(SLO)$/dbwizsetup.obj \
+ $(SLO)$/detailpages.obj \
$(SLO)$/directsql.obj \
- $(SLO)$/dbwiz.obj \
- $(SLO)$/dbwizsetup.obj \
+ $(SLO)$/dlgattr.obj \
+ $(SLO)$/dlgsave.obj \
+ $(SLO)$/dlgsize.obj \
+ $(SLO)$/dsselect.obj \
+ $(SLO)$/finteraction.obj \
$(SLO)$/generalpage.obj \
- $(SLO)$/indexfieldscontrol.obj \
$(SLO)$/indexdialog.obj \
- $(SLO)$/RelationDlg.obj \
- $(SLO)$/adtabdlg.obj \
- $(SLO)$/dlgsave.obj \
- $(SLO)$/admincontrols.obj \
- $(SLO)$/adminpages.obj \
- $(SLO)$/queryorder.obj \
- $(SLO)$/queryfilter.obj \
+ $(SLO)$/indexfieldscontrol.obj \
+ $(SLO)$/odbcconfig.obj \
$(SLO)$/paramdialog.obj \
- $(SLO)$/dbadmin.obj \
- $(SLO)$/detailpages.obj \
+ $(SLO)$/queryfilter.obj \
+ $(SLO)$/queryorder.obj \
$(SLO)$/sqlmessage.obj \
- $(SLO)$/finteraction.obj \
- $(SLO)$/ConnectionPage.obj \
- $(SLO)$/ConnectionHelper.obj \
- $(SLO)$/TextConnectionHelper.obj \
- $(SLO)$/ConnectionPageSetup.obj \
- $(SLO)$/DBSetupConnectionPages.obj \
- $(SLO)$/UserAdminDlg.obj \
- $(SLO)$/UserAdmin.obj \
- $(SLO)$/AdabasStat.obj \
$(SLO)$/tablespage.obj \
- $(SLO)$/DbAdminImpl.obj \
- $(SLO)$/TablesSingleDlg.obj \
- $(SLO)$/CollectionView.obj \
- $(SLO)$/dsselect.obj \
- $(SLO)$/dbfindex.obj \
- $(SLO)$/DriverSettings.obj \
- $(SLO)$/odbcconfig.obj \
- $(SLO)$/advancedsettings.obj \
$(SLO)$/textconnectionsettings.obj
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/dlgsize.obj \
- $(SLO)$/dlgattr.obj \
+SLOFILES= \
+ $(EXCEPTIONSFILES) \
$(SLO)$/optionalboolitem.obj
.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
diff --git a/dbaccess/source/ui/querydesign/makefile.mk b/dbaccess/source/ui/querydesign/makefile.mk
index 36e36c9..a4a39c3 100644
--- a/dbaccess/source/ui/querydesign/makefile.mk
+++ b/dbaccess/source/ui/querydesign/makefile.mk
@@ -38,42 +38,42 @@ TARGET=querydesign
# --- Files --------------------------------------------------------
EXCEPTIONSFILES =\
+ $(SLO)$/ConnectionLine.obj \
$(SLO)$/ConnectionLineAccess.obj \
- $(SLO)$/TableWindowAccess.obj \
- $(SLO)$/JAccess.obj \
- $(SLO)$/JoinDesignView.obj \
- $(SLO)$/JoinController.obj \
- $(SLO)$/QueryDesignView.obj \
- $(SLO)$/SelectionBrowseBox.obj \
- $(SLO)$/querydlg.obj \
- $(SLO)$/QueryTabWinUndoAct.obj \
+ $(SLO)$/JAccess.obj \
+ $(SLO)$/JoinController.obj \
+ $(SLO)$/JoinDesignView.obj \
+ $(SLO)$/JoinExchange.obj \
+ $(SLO)$/JoinTableView.obj \
+ $(SLO)$/QTableConnection.obj \
+ $(SLO)$/QTableConnectionData.obj \
+ $(SLO)$/QTableWindow.obj \
+ $(SLO)$/QTableWindowData.obj \
+ $(SLO)$/QueryDesignView.obj \
$(SLO)$/QueryMoveTabWinUndoAct.obj \
$(SLO)$/QueryTabConnUndoAction.obj \
+ $(SLO)$/QueryTabWinUndoAct.obj \
+ $(SLO)$/QueryTableView.obj \
+ $(SLO)$/QueryTextView.obj \
+ $(SLO)$/QueryViewSwitch.obj \
+ $(SLO)$/SelectionBrowseBox.obj \
+ $(SLO)$/TableConnection.obj \
+ $(SLO)$/TableConnectionData.obj \
$(SLO)$/TableFieldDescription.obj \
- $(SLO)$/JoinTableView.obj \
- $(SLO)$/QueryViewSwitch.obj \
- $(SLO)$/QueryTableView.obj \
- $(SLO)$/TableWindowData.obj \
- $(SLO)$/QTableWindow.obj \
- $(SLO)$/TableWindow.obj \
- $(SLO)$/JoinExchange.obj \
- $(SLO)$/TableWindowListBox.obj \
- $(SLO)$/TableWindowTitle.obj \
- $(SLO)$/QueryTextView.obj \
- $(SLO)$/QTableConnection.obj \
- $(SLO)$/querycontroller.obj \
+ $(SLO)$/TableWindow.obj \
+ $(SLO)$/TableWindowAccess.obj \
+ $(SLO)$/TableWindowData.obj \
+ $(SLO)$/TableWindowListBox.obj \
+ $(SLO)$/TableWindowTitle.obj \
$(SLO)$/querycontainerwindow.obj \
- $(SLO)$/queryview.obj \
- $(SLO)$/TableConnection.obj \
- $(SLO)$/TableConnectionData.obj
+ $(SLO)$/querycontroller.obj \
+ $(SLO)$/querydlg.obj \
+ $(SLO)$/queryview.obj
SLOFILES =\
- $(EXCEPTIONSFILES) \
- $(SLO)$/TableFieldInfo.obj \
- $(SLO)$/QTableConnectionData.obj \
- $(SLO)$/QTableWindowData.obj \
- $(SLO)$/ConnectionLine.obj \
- $(SLO)$/ConnectionLineData.obj
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/ConnectionLineData.obj \
+ $(SLO)$/TableFieldInfo.obj
SRS1NAME=$(TARGET)
SRC1FILES = query.src \
More information about the Libreoffice-commits
mailing list