diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-09 11:26:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-09 17:19:05 +0100 |
| commit | 631aa91185ce4787da39386b13b714176fd5bee2 (patch) | |
| tree | aa4ac17890f9066c1d58ce9995e88274b8a31fe4 /svx/Library_svx.mk | |
| parent | 4e01639f2ce64f3f6c3281ef526b3e4645566b6b (diff) | |
simplify makefile
put all of the exception objects into one list
Change-Id: I34ad6b5d4f1495ecb3da79540a6a3ec6dad9d16a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124905
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/Library_svx.mk')
| -rw-r--r-- | svx/Library_svx.mk | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 578e7776ce8e..2a9d9d097127 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -161,6 +161,16 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/weldeditview \ svx/source/dialog/signaturelinehelper \ svx/source/engine3d/float3d \ + svx/source/fmcomp/dbaobjectex \ + svx/source/form/databaselocationinput \ + svx/source/form/dbcharsethelper \ + $(call gb_Helper_optional,DBCONNECTIVITY,svx/source/form/filtnav) \ + svx/source/form/fmobjfac \ + svx/source/form/fmPropBrw \ + svx/source/form/fmsrccfg \ + svx/source/form/fmsrcimp \ + svx/source/form/tabwin \ + svx/source/form/tbxform \ svx/source/items/algitem \ svx/source/items/autoformathelper \ svx/source/items/hlnkitem \ @@ -255,19 +265,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/unogallery/unogalthemeprovider \ )) -$(eval $(call gb_Library_add_exception_objects,svx,\ - svx/source/fmcomp/dbaobjectex \ - svx/source/form/databaselocationinput \ - svx/source/form/dbcharsethelper \ - $(call gb_Helper_optional,DBCONNECTIVITY,svx/source/form/filtnav) \ - svx/source/form/fmobjfac \ - svx/source/form/fmPropBrw \ - svx/source/form/fmsrccfg \ - svx/source/form/fmsrcimp \ - svx/source/form/tabwin \ - svx/source/form/tbxform \ -)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,svx,\ advapi32 \ |