scp2: move postgresqlsdbc libraries to AutoInstall

Change-Id: Ia96e85191d877ebfd7621f7aa572f29e6482716c

5 files changed, 16 insertions, 12 deletions

diff --git a/Repository.mk b/Repository.mk
index ddf9a96c5a39..4c1443acbe2a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -419,6 +419,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \
+	postgresql-sdbc \
+	postgresql-sdbc-impl \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
 	pdfimport \
 ))
@@ -636,8 +641,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	postgresql-sdbc \
-	postgresql-sdbc-impl \
 	pythonloader \
 ))
 
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index f40e0a4fc22d..1958e746f4a2 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND
 $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,python))
+$(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index ca85bf5b0978..84942d7990b2 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -9,7 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 
-$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\
+	base \
+	postgresqlsdbc \
+))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/base,\
 	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index d27cf43d6f77..ba6d094080d4 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -9,14 +9,15 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/postgresqlsdbc"
+
 #if defined WITH_POSTGRESQL_SDBC
 
 Module gid_Module_Optional_PostgresqlSdbc
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
     ParentID = gid_Module_Prg_Base_Bin;
-    Files = (gid_File_Lib_PostgresqlSdbc,
-             gid_File_Lib_PostgresqlSdbcImpl,
+    Files = (auto_postgresqlsdbc_ALL,
              gid_File_PostgresqlSdbc_Ini,
              gid_File_PostgresqlSdbc_Rdb,
              gid_File_PostgresqlSdbc_Xcd);
@@ -25,10 +26,6 @@ Module gid_Module_Optional_PostgresqlSdbc
     Styles = ();
 End
 
-STD_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc)
-
-STD_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl)
-
 File gid_File_PostgresqlSdbc_Ini
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 60e628fedc70..4b8b59f159e1 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -12,7 +12,7 @@
 define gb_AutoInstall__make_define
 echo "#define auto_$*_ALL \ " >> $@
 $(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "    $(subst .,_,$(subst -,_,$(binary))), \ " >> $@;)
-echo "    $(lastword $(1))" >> $@;
+echo "    $(subst .,_,$(subst -,_,$(lastword $(1))))" >> $@;
 echo "" >> $@
 endef
 
@@ -26,7 +26,7 @@ $(file >>$@,\
 endef
 
 define gb_AutoInstall__gen_lib
-$(SCP2LIBTEMPLATE)(auto_$*_lib_$(1),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))
+$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(1))),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))
 
 endef
 
@@ -46,7 +46,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
 		$(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \
 		$(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg)))
 	$(foreach lib,$(gb_Library_MODULE_$*),\
-		echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;)
+		echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(lib))),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;)
 else
 	$(file >$@,/* autogenerated installs for group $* */)
 	$(call gb_AutoInstall__gen_define,\