fdo#60949: Move the last libs to OOOLIBS

Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
Reviewed-on: https://gerrit.libreoffice.org/3561
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

8 files changed, 52 insertions, 77 deletions

diff --git a/Repository.mk b/Repository.mk
index 0ccc03d9548d..054d9a325871 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -579,28 +579,56 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     PresenterScreen \
     basprov \
     cairocanvas \
+    canvasfactory \
+    cmdmail \
+    directx9canvas \
     dlgprov \
     expwrap \
     fastsax \
+    fpicker \
+    fps_office \
     gconfbe1 \
+    gdipluscanvas \
+    hatchwindowfactory \
     i18nsearch \
     kdebe1 \
     kde4be1 \
     ldapbe2 \
+    losessioninstall \
+    macbe1 \
     migrationoo2 \
     migrationoo3 \
     msforms \
     mtfrenderer \
     OGLTrans \
+    passwordcontainer \
+    pdfimport \
+    postgresql-sdbc \
+    postgresql-sdbc-impl \
     pythonloader \
+    simplecanvas \
     slideshow \
     stringresource \
+    syssh \
     tdebe1 \
+    ucpcmis1 \
+    ucpext \
     ucpgio1 \
     ucpgvfs1 \
+    ucptdoc1 \
+    updatefeed \
     vbaevents \
     vbaobj \
     vbaswobj \
+    vclcanvas \
+    $(if $(filter $(OS),MACOSX), \
+        fps_aqua \
+    ) \
+    $(if $(filter $(OS),WNT), \
+        oleautobridge \
+        smplmail \
+        wininetbe1 \
+    ) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
@@ -612,36 +640,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
 	ucpexpand1 \
 ))
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
-    canvasfactory \
-    cmdmail \
     directx5canvas \
-    directx9canvas \
-    fpicker \
-    fps_office \
-    gdipluscanvas \
-    hatchwindowfactory \
-    losessioninstall \
-    macbe1 \
     nullcanvas \
-    passwordcontainer \
-    pdfimport \
-    postgresql-sdbc \
-    postgresql-sdbc-impl \
-    simplecanvas \
-    syssh \
-    ucpcmis1 \
-    ucpext \
-    ucptdoc1 \
-    updatefeed \
-    vclcanvas \
-    $(if $(filter $(OS),MACOSX), \
-        fps_aqua \
-    ) \
-	$(if $(filter $(OS),WNT), \
-		oleautobridge \
-		smplmail \
-		wininetbe1 \
-	) \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index 90e8631662b4..fddf45863716 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -45,9 +45,9 @@ Module gid_Module_Optional_PostgresqlSdbc
     Styles = ();
 End
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno)
+STD_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc)
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl.uno)
+STD_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl)
 
 File gid_File_PostgresqlSdbc_Ini
     TXT_FILE_BODY;
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index f390a9ed550f..c2e6ec52aac7 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -27,5 +27,5 @@
 
 #include "macros.inc"
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
+STD_LIB_FILE(gid_File_CanvasFactory, canvasfactory)
+STD_LIB_FILE(gid_File_SimpleCanvas, simplecanvas)
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index cfa762d3175c..7c36becfbfb2 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -28,6 +28,6 @@
 #include "macros.inc"
 
 #ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas.uno)
+STD_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas)
+STD_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas)
 #endif
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index c17301f56d76..48bf5f9e84fd 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -27,4 +27,4 @@
 
 #include "macros.inc"
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
+STD_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas)
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index cf9a4980a6f2..9f824d82ded2 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -29,7 +29,7 @@
 #ifdef ENABLE_GIO
 STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 )
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
+STD_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall)
 #endif
 
 #ifdef ENABLE_GNOMEVFS
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1677e01cd8e2..ab3105eeb02f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -138,7 +138,7 @@ End
 
 
 #if ! defined WNT // no longer supported on Windows
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
+STD_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail )
 #endif
 
 #ifndef SYSTEM_CURL
@@ -380,12 +380,7 @@ End
 #endif
 
 #ifdef MACOSX
-File gid_File_Lib_Fps_Aqua
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
-End
+STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua )
 
 File gid_File_Lib_MacOSXSpell
 	LIB_FILE_BODY;
@@ -404,9 +399,8 @@ End
 #endif
 #endif
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
-
+STD_LIB_FILE( gid_File_Lib_Fps_Office, fps_office )
+STD_LIB_FILE( gid_File_Lib_Fpicker, fpicker )
 
 #ifndef SYSTEM_LCMS2
 
@@ -482,7 +476,7 @@ End
 
 #endif
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
+STD_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory )
 
 STD_LIB_FILE( gid_File_Lib_I18nsearch, i18nsearch )
 
@@ -676,17 +670,10 @@ End
 #endif
 
 #if defined(WNT) && !defined(DISABLE_ATL)
-
-File gid_File_Lib_Ole
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "oleautobridge.uno.dll";
-End
-
+STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
 #endif
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
+STD_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer )
 
 STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
 
@@ -865,14 +852,7 @@ End
 #endif
 
 #ifdef WNT
-
-File gid_File_Lib_Smplmail
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "smplmail.uno.dll";
-End
-
+STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail )
 #endif
 
 #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
@@ -912,14 +892,14 @@ File gid_File_Lib_Sysdtrans
 End
 #endif
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
+STD_LIB_FILE( gid_File_Lib_Syssh, syssh )
 
 #ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
+STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
 #endif
 
 #ifdef MACOSX
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
+STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
 #endif
 
 STD_LIB_FILE( gid_File_Lib_Acc, acc )
@@ -991,11 +971,11 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
+STD_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1)
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
+STD_LIB_FILE(gid_File_Ucpext, ucpext)
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
+STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1)
 
 File gid_File_Lib_Lnth
     LIB_FILE_BODY;
@@ -1136,7 +1116,7 @@ STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 )
 
 STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
+STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
 
 #ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Openssl
diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp
index 06f4583673af..0d42536961a6 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -56,12 +56,7 @@ File gid_File_Exe_Xpdfimport
     Styles = (PACKED);
 End
 
-File gid_File_Lib_PdfimportUno
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = SCP2_URE_DL_BARE("pdfimport.uno");
-    Styles = (PACKED);
-End
+STD_LIB_FILE( gid_File_Lib_PdfimportUno, pdfimport )
 
 File gid_File_Xcd_Pdfimport
     TXT_FILE_BODY;