make-package-modules-not-suck

Gbp-Pq: Name make-package-modules-not-suck.diff

diff --git a/Repository.mk b/Repository.mk
index 0ab6322313edd1efe7dd59db671cbf31c741bd64..38fd2475e209bea561100492f9012e424e9ae3a7 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -241,13 +241,29 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
        abp \
+       calc \
+       dba \
+       dbahsql \
+       $(call gb_Helper_optional,DBCONNECTIVITY, \
+               dbase \
+               dbaxml) \
        dbp \
        dbu \
+       $(call gb_Helper_optional,DBCONNECTIVITY,flat) \
+       $(if $(ENABLE_JAVA),jdbc) \
+       $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
+       $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
+       odbc \
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,base, \
+       $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
+       $(if $(ENABLE_JAVA),hsqldb) \
+       sdbc2 \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
        analysis \
-       $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
        date \
        pricing \
        sc \
@@ -259,6 +275,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
        $(call gb_Helper_optional,SCRIPTING,vbaobj) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,draw, \
+       animcore \
+       sd \
+       sdd \
+       sdfilt \
+       sdui \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
        svgfilter \
        wpftdraw \
@@ -266,10 +290,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
-       animcore \
        PresenterScreen \
        PresentationMinimizer \
        wpftimpress \
+       slideshow \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
@@ -339,11 +363,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
        configmgr \
        ctl \
        cui \
-       dba \
-       dbahsql \
-       $(call gb_Helper_optional,DBCONNECTIVITY, \
-               dbase \
-               dbaxml) \
        dbtools \
        deploymentmisc \
        $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
@@ -357,7 +376,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
        evtatt \
        expwrap \
        $(call gb_Helper_optional,DBCONNECTIVITY, \
-               flat \
                file) \
        filterconfig \
        fps_office \
@@ -378,7 +396,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
     gie \
        hyphen \
     icg \
-       $(if $(ENABLE_JAVA),jdbc) \
        $(if $(ENABLE_LDAP),ldapbe2) \
        $(if $(filter WNT,$(OS)),WinUserInfoBe) \
        localebe1 \
@@ -394,10 +411,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
        msfilter \
        $(call gb_Helper_optional,SCRIPTING,msforms) \
        mtfrenderer \
-       $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
-       $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
        numbertext \
-       odbc \
        odfflatxml \
        offacc \
        oox \
@@ -410,13 +424,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
        sb \
        $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
        scn \
-       sd \
-       sdd \
-       sdfilt \
-       sdui \
        sfx \
        simplecanvas \
-       slideshow \
        sot \
        $(if $(filter-out iOS,$(OS)),spell) \
        $(if $(DISABLE_GUI),,spl) \
@@ -428,7 +437,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
        svt \
        svx \
        svxcore \
-       sw \
        syssh \
        textconversiondlgs \
        textfd \
@@ -515,6 +523,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
        hwp \
        $(if $(ENABLE_LWP),lwpft) \
        msword \
+       sw \
        swd \
        swui \
        t602filter \
@@ -593,14 +602,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
        cached1 \
        collator_data \
        comphelper \
-       $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
        $(call gb_Helper_optional,BREAKPAD,crashreport) \
        deployment \
        deploymentgui \
        dict_ja \
        dict_zh \
        embobj \
-       $(if $(ENABLE_JAVA),hsqldb) \
        i18nutil \
        index_data \
        $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), libreofficekitgtk) \
@@ -615,7 +622,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
        emboleobj \
        package2 \
        $(call gb_Helper_optional,SCRIPTING,scriptframe) \
-       sdbc2 \
        sofficeapp \
        srtrs1 \
        $(if $(filter $(OS),WNT),sysdtrans) \

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 9b18c1ecce08efbbf22005078ff7d0013b0b9471..9622445e6f929f3e33eca516043a6947a3964d6f 100644 (file)
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL
 $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))

diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
index a7c02bef4bac35907807543c77c0c31c280ef7ce..d48edf2b9e90f6819cb1dba7449329091f156109 100644 (file)
--- a/scp2/InstallModule_draw.mk
+++ b/scp2/InstallModule_draw.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\
+       draw \
        draw_brand \
 ))
 

diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 87375797e1c6e411807a90e4e91e7108923bbbe5..a3ee5f935f4027b7e3e1f082527b3e3bef1d6dd0 100644 (file)
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -18,6 +18,7 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/draw"
 #include "AutoInstall/draw_brand"
 
 Module gid_Module_Prg_Draw
@@ -34,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin
     Sortkey = "100";
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
+    Files = (auto_draw_ALL,
+    gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
     gid_File_Share_Registry_Draw_Xcd,
     gid_File_Tmp_Userinstall_Draw_Inf);
 End