diff options
author | Michael Stahl <mst@openoffice.org> | 2011-04-15 17:27:06 +0000 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 16:51:32 +0200 |
commit | 2ac6f1c4f775d10e92e22379d473c1c31835e8ff (patch) | |
tree | 8204f931bd1bc6073bd81126b9fc4b526456ea8d /dbaccess/Library_dbui.mk | |
parent | gnumake4: fix to use new add rules [hg:76c825726ff2] (diff) | |
download | core-2ac6f1c4f775d10e92e22379d473c1c31835e8ff.tar.gz core-2ac6f1c4f775d10e92e22379d473c1c31835e8ff.zip |
gnumake4: reportdesign, dbaccess: remove DOS lineendings [hg:ba7a15028880]
Diffstat (limited to 'dbaccess/Library_dbui.mk')
-rw-r--r-- | dbaccess/Library_dbui.mk | 276 |
1 files changed, 138 insertions, 138 deletions
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index 157dc277583c..11123318c812 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -1,119 +1,119 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,dbui)) +#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,dbui))
$(eval $(call gb_Library_add_package_headers,dbui,dbaccess_inc))
$(eval $(call gb_Library_add_precompiled_header,dbui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbui))
- -$(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu)) - -$(eval $(call gb_Library_set_include,dbui,\ - -I$(SRCDIR)/dbaccess/inc \ - -I$(SRCDIR)/dbaccess/source/ui/inc \ - -I$(SRCDIR)/dbaccess/source/inc \ - -I$(SRCDIR)/dbaccess/inc/pch \ - $$(SOLARINC) \ - -I$(OUTDIR)/inc/offuh \ -)) - -ifeq ($(SYSTEM_ODBC_HEADERS),TRUE) -$(eval $(call gb_Library_add_cflags,dbui,\ - -DSYSTEM_ODBC_HEADERS \ -)) +
+$(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu))
+
+$(eval $(call gb_Library_set_include,dbui,\
+ -I$(SRCDIR)/dbaccess/inc \
+ -I$(SRCDIR)/dbaccess/source/ui/inc \
+ -I$(SRCDIR)/dbaccess/source/inc \
+ -I$(SRCDIR)/dbaccess/inc/pch \
+ $$(SOLARINC) \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),TRUE)
+$(eval $(call gb_Library_add_cflags,dbui,\
+ -DSYSTEM_ODBC_HEADERS \
+))
endif
-ifneq ($(WINDOWS_VISTA_PSDK),)
+ifneq ($(WINDOWS_VISTA_PSDK),)
ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_add_defs,dbui,\ - -DDBACCESS_DLLIMPLEMENTATION\ - -DWINDOWS_VISTA_PSDK \ +$(eval $(call gb_Library_add_defs,dbui,\
+ -DDBACCESS_DLLIMPLEMENTATION\
+ -DWINDOWS_VISTA_PSDK \
))
endif
endif
ifeq ($(GUI)$(COM),WNTGCC)
-$(eval $(call gb_Library_add_cflags,dbui,\ - -fpermissive \ +$(eval $(call gb_Library_add_cflags,dbui,\
+ -fpermissive \
))
-endif - +endif
+
ifeq ($(PROF_EDITION),)
ifneq ($(WINDOWS_VISTA_PSDK),)
DISABLE_ADO=TRUE
endif
endif
-ifeq ($(OS),WNT)
+ifeq ($(OS),WNT)
ifeq ($(DISABLE_ADO),)
$(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/dlg/adodatalinks \
))
-endif -endif - -$(eval $(call gb_Library_add_defs,dbui,\ - -DDBACCESS_DLLIMPLEMENTATION\ -)) - -$(eval $(call gb_Library_add_linked_libs,dbui,\ - comphelper \ - cppuhelper \ - cppu \ - dbtools \ - i18nisolang1 \ - fwe \ - sal \ - salhelper \ - sfx \ - svl \ - svt \ - stl \ - vcl \ - for \ - tl \ - utl \ - ucbhelper \ - svxcore \ - svx \ - tk \ - sot \ - dba \ - vos3 \ - $(gb_STDLIBS) \ -)) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,dbui,\ - ole32 \ - oleaut32 \ - uuid \ -)) -endif - -$(eval $(call gb_Library_add_exception_objects,dbui,\ +endif
+endif
+
+$(eval $(call gb_Library_add_defs,dbui,\
+ -DDBACCESS_DLLIMPLEMENTATION\
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbui,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ i18nisolang1 \
+ fwe \
+ sal \
+ salhelper \
+ sfx \
+ svl \
+ svt \
+ stl \
+ vcl \
+ for \
+ tl \
+ utl \
+ ucbhelper \
+ svxcore \
+ svx \
+ tk \
+ sot \
+ dba \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,dbui,\
+ ole32 \
+ oleaut32 \
+ uuid \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/app/AppDetailView \
dbaccess/source/ui/app/AppController \
dbaccess/source/ui/app/AppControllerDnD \
@@ -137,8 +137,8 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/browser/sbamultiplex \
dbaccess/source/ui/browser/exsrcbrw \
dbaccess/source/ui/browser/dbtreemodel \
- dbaccess/source/ui/browser/dsEntriesNoExp \ - dbaccess/source/ui/browser/dbtreeview \ + dbaccess/source/ui/browser/dsEntriesNoExp \
+ dbaccess/source/ui/browser/dbtreeview \
dbaccess/source/ui/control/statusbarontroller \
dbaccess/source/ui/control/RelationControl \
dbaccess/source/ui/control/toolboxcontroller \
@@ -148,7 +148,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/control/sqledit \
dbaccess/source/ui/control/ColumnControlWindow \
dbaccess/source/ui/control/FieldDescControl \
- dbaccess/source/ui/control/opendoccontrols \ + dbaccess/source/ui/control/opendoccontrols \
dbaccess/source/ui/dlg/directsql \
dbaccess/source/ui/dlg/dbwiz \
dbaccess/source/ui/dlg/dbwizsetup \
@@ -184,7 +184,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/dlg/DriverSettings \
dbaccess/source/ui/dlg/odbcconfig \
dbaccess/source/ui/dlg/advancedsettings \
- dbaccess/source/ui/dlg/textconnectionsettings \ + dbaccess/source/ui/dlg/textconnectionsettings \
dbaccess/source/ui/misc/asyncmodaldialog \
dbaccess/source/ui/misc/imageprovider \
dbaccess/source/ui/misc/singledoccontroller \
@@ -216,7 +216,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/misc/dsmeta \
dbaccess/source/ui/misc/controllerframe \
dbaccess/source/ui/misc/propertystorage \
- dbaccess/source/ui/misc/dbaundomanager \ + dbaccess/source/ui/misc/dbaundomanager \
dbaccess/source/ui/querydesign/ConnectionLineAccess \
dbaccess/source/ui/querydesign/TableWindowAccess \
dbaccess/source/ui/querydesign/JAccess \
@@ -244,12 +244,12 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/querydesign/querycontainerwindow \
dbaccess/source/ui/querydesign/queryview \
dbaccess/source/ui/querydesign/TableConnection \
- dbaccess/source/ui/querydesign/TableConnectionData \ + dbaccess/source/ui/querydesign/TableConnectionData \
dbaccess/source/ui/relationdesign/RTableConnection \
dbaccess/source/ui/relationdesign/RTableConnectionData \
dbaccess/source/ui/relationdesign/RelationTableView \
dbaccess/source/ui/relationdesign/RelationDesignView \
- dbaccess/source/ui/relationdesign/RelationController \ + dbaccess/source/ui/relationdesign/RelationController \
dbaccess/source/ui/tabledesign/TableDesignControl \
dbaccess/source/ui/tabledesign/TableFieldDescWin \
dbaccess/source/ui/tabledesign/TableController \
@@ -261,7 +261,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/tabledesign/FieldDescriptions \
dbaccess/source/ui/tabledesign/TableRow \
dbaccess/source/ui/tabledesign/TableRowExchange \
- dbaccess/source/ui/tabledesign/TableUndo \ + dbaccess/source/ui/tabledesign/TableUndo \
dbaccess/source/ui/uno/composerdialogs \
dbaccess/source/ui/uno/unosqlmessage \
dbaccess/source/ui/uno/unoadmin \
@@ -276,44 +276,44 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/uno/ColumnControl \
dbaccess/source/ui/uno/ColumnPeer \
dbaccess/source/ui/uno/dbinteraction \
- dbaccess/source/ui/uno/textconnectionsettings_uno \ -)) - -$(eval $(call gb_Library_add_noexception_objects,dbui, \ - dbaccess/source/ui/control/ScrollHelper \ - dbaccess/source/ui/control/VertSplitView \ - dbaccess/source/ui/control/SqlNameEdit \ - dbaccess/source/ui/control/listviewitems \ - dbaccess/source/ui/control/undosqledit \ - dbaccess/source/ui/control/marktree \ - dbaccess/source/ui/control/curledit \ - dbaccess/source/ui/control/charsetlistbox \ - dbaccess/source/ui/app/AppIconControl \ - dbaccess/source/ui/browser/AsyncronousLink \ + dbaccess/source/ui/uno/textconnectionsettings_uno \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,dbui, \
+ dbaccess/source/ui/control/ScrollHelper \
+ dbaccess/source/ui/control/VertSplitView \
+ dbaccess/source/ui/control/SqlNameEdit \
+ dbaccess/source/ui/control/listviewitems \
+ dbaccess/source/ui/control/undosqledit \
+ dbaccess/source/ui/control/marktree \
+ dbaccess/source/ui/control/curledit \
+ dbaccess/source/ui/control/charsetlistbox \
+ dbaccess/source/ui/app/AppIconControl \
+ dbaccess/source/ui/browser/AsyncronousLink \
dbaccess/source/ui/dlg/dlgsize \
dbaccess/source/ui/dlg/dlgattr \
- dbaccess/source/ui/dlg/optionalboolitem \ + dbaccess/source/ui/dlg/optionalboolitem \
dbaccess/source/ui/querydesign/TableFieldInfo \
dbaccess/source/ui/querydesign/QTableConnectionData \
dbaccess/source/ui/querydesign/QTableWindowData \
dbaccess/source/ui/querydesign/ConnectionLine \
- dbaccess/source/ui/querydesign/ConnectionLineData \ - dbaccess/source/shared/dbu_reghelper \ - dbaccess/source/shared/dbustrings \ -)) - -# the following source file can't be compiled with optimization by some compilers (crash or endless loop): -# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC -# the latter is currently not supported by gbuild and needs a fix here later -ifeq ($(COM),$(filter-out GCC,$(COM))) -$(eval $(call gb_Library_add_exception_objects,dbui,\ - dbaccess/source/ui/uno/copytablewizard \ -)) -else -$(eval $(call gb_Library_add_cxxobjects,dbui,\ - dbaccess/source/ui/uno/copytablewizard \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -endif - -# vim: set noet sw=4 ts=4: + dbaccess/source/ui/querydesign/ConnectionLineData \
+ dbaccess/source/shared/dbu_reghelper \
+ dbaccess/source/shared/dbustrings \
+))
+
+# the following source file can't be compiled with optimization by some compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifeq ($(COM),$(filter-out GCC,$(COM)))
+$(eval $(call gb_Library_add_exception_objects,dbui,\
+ dbaccess/source/ui/uno/copytablewizard \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,dbui,\
+ dbaccess/source/ui/uno/copytablewizard \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
|