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>

2 files changed, 59 insertions, 65 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 \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 8e596acd4605..0c3adee945c3 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -140,6 +140,54 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/engine3d/view3d \
     svx/source/engine3d/view3d1 \
     svx/source/engine3d/viewpt3d2 \
+    svx/source/fmcomp/dbaexchange \
+    svx/source/fmcomp/fmgridcl \
+    svx/source/fmcomp/fmgridif \
+    svx/source/fmcomp/gridcell \
+    svx/source/fmcomp/gridcols \
+    svx/source/fmcomp/gridctrl \
+    svx/source/fmcomp/xmlexchg \
+    svx/source/form/dataaccessdescriptor \
+    svx/source/form/datalistener \
+    svx/source/form/datanavi \
+    svx/source/form/delayedevent \
+    svx/source/form/labelitemwindow \
+    svx/source/form/fmcontrolbordermanager \
+    svx/source/form/fmcontrollayout \
+    svx/source/form/fmdmod \
+    svx/source/form/fmdocumentclassification \
+    svx/source/form/fmdpage \
+    svx/source/form/fmexch \
+    svx/source/form/fmexpl \
+    svx/source/form/fmmodel \
+    svx/source/form/fmobj \
+    svx/source/form/fmpage \
+    svx/source/form/fmpgeimp \
+    svx/source/form/fmscriptingenv \
+    svx/source/form/fmservs \
+    svx/source/form/fmshell \
+    svx/source/form/fmshimp \
+    svx/source/form/fmtextcontroldialogs \
+    svx/source/form/fmtextcontrolfeature \
+    svx/source/form/fmtextcontrolshell \
+    svx/source/form/fmtools \
+    svx/source/form/fmundo \
+    svx/source/form/fmview \
+    svx/source/form/fmvwimp \
+    svx/source/form/formcontrolfactory \
+    svx/source/form/formcontroller \
+    svx/source/form/formcontrolling \
+    svx/source/form/formdispatchinterceptor \
+    svx/source/form/formfeaturedispatcher \
+    svx/source/form/formtoolbars \
+    svx/source/form/legacyformcontroller \
+    svx/source/form/navigatortree \
+    svx/source/form/navigatortreemodel \
+    svx/source/form/ParseContext \
+    svx/source/form/sdbdatacolumn \
+    svx/source/form/sqlparserclient \
+    svx/source/form/typemap \
+    svx/source/form/xfm_addcondition \
     svx/source/gallery2/codec \
     svx/source/gallery2/galbrws1 \
     svx/source/gallery2/galbrws2 \
@@ -388,6 +436,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/tbxctrls/StylesPreviewWindow \
     svx/source/toolbars/extrusionbar \
     svx/source/toolbars/fontworkbar \
+    svx/source/uitest/sdrobject \
     svx/source/unodraw/gluepts \
     svx/source/unodraw/shapepropertynotifier \
     svx/source/unodraw/SvxXTextColumns \
@@ -433,58 +482,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/xoutdev/xtablend \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,svxcore,\
-    svx/source/fmcomp/dbaexchange \
-    svx/source/fmcomp/fmgridcl \
-    svx/source/fmcomp/fmgridif \
-    svx/source/fmcomp/gridcell \
-    svx/source/fmcomp/gridcols \
-    svx/source/fmcomp/gridctrl \
-    svx/source/fmcomp/xmlexchg \
-    svx/source/form/dataaccessdescriptor \
-    svx/source/form/datalistener \
-    svx/source/form/datanavi \
-    svx/source/form/delayedevent \
-    svx/source/form/labelitemwindow \
-    svx/source/form/fmcontrolbordermanager \
-    svx/source/form/fmcontrollayout \
-    svx/source/form/fmdmod \
-    svx/source/form/fmdocumentclassification \
-    svx/source/form/fmdpage \
-    svx/source/form/fmexch \
-    svx/source/form/fmexpl \
-    svx/source/form/fmmodel \
-    svx/source/form/fmobj \
-    svx/source/form/fmpage \
-    svx/source/form/fmpgeimp \
-    svx/source/form/fmscriptingenv \
-    svx/source/form/fmservs \
-    svx/source/form/fmshell \
-    svx/source/form/fmshimp \
-    svx/source/form/fmtextcontroldialogs \
-    svx/source/form/fmtextcontrolfeature \
-    svx/source/form/fmtextcontrolshell \
-    svx/source/form/fmtools \
-    svx/source/form/fmundo \
-    svx/source/form/fmview \
-    svx/source/form/fmvwimp \
-    svx/source/form/formcontrolfactory \
-    svx/source/form/formcontroller \
-    svx/source/form/formcontrolling \
-    svx/source/form/formdispatchinterceptor \
-    svx/source/form/formfeaturedispatcher \
-    svx/source/form/formtoolbars \
-    svx/source/form/legacyformcontroller \
-    svx/source/form/navigatortree \
-    svx/source/form/navigatortreemodel \
-    svx/source/form/ParseContext \
-    svx/source/form/sdbdatacolumn \
-    svx/source/form/sqlparserclient \
-    svx/source/form/typemap \
-    svx/source/form/xfm_addcondition \
-    svx/source/uitest/sdrobject \
-))
-
 $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
 
 $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\