diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-10 00:56:28 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-10 20:03:02 +0200 |
commit | 7a878f9c5fde18e1e86ee0784d9a7f1252700e74 (patch) | |
tree | 994b8e6787c4f93a1e1d75f37e61b790f16e03a6 /scp2 | |
parent | 74f5df9bacf50464affdf48c0ea0fbfa01f28728 (diff) |
gbuild: s/AutoInstallLibs/AutoInstall/g
Change-Id: I582a841ea3b2a882cbdc1556058b007a8667024a
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/AutoInstall.mk | 24 | ||||
-rw-r--r-- | scp2/AutoInstallLibs.mk | 24 | ||||
-rw-r--r-- | scp2/Module_scp2.mk | 2 | ||||
-rw-r--r-- | scp2/source/base/module_base.scp | 2 | ||||
-rw-r--r-- | scp2/source/gnome/module_gnome.scp | 2 | ||||
-rw-r--r-- | scp2/source/graphicfilter/module_graphicfilter.scp | 2 | ||||
-rw-r--r-- | scp2/source/impress/module_impress.scp | 2 | ||||
-rw-r--r-- | scp2/source/kde/module_kde.scp | 2 | ||||
-rw-r--r-- | scp2/source/math/module_math.scp | 2 | ||||
-rw-r--r-- | scp2/source/onlineupdate/module_onlineupdate.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/ure.scp | 2 | ||||
-rw-r--r-- | scp2/source/tde/module_tde.scp | 2 | ||||
-rw-r--r-- | scp2/source/writer/module_writer.scp | 2 |
14 files changed, 36 insertions, 36 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk new file mode 100644 index 000000000000..a6dad3c70085 --- /dev/null +++ b/scp2/AutoInstall.mk @@ -0,0 +1,24 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstall_AutoInstall)) + +$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk deleted file mode 100644 index 6363fb1f125f..000000000000 --- a/scp2/AutoInstallLibs.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_AutoInstallLibs_AutoInstallLibs)) - -$(eval $(call gb_AutoInstallLibs_add_module,base,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,gnome,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,graphicfilter,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,impress,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,kde,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,math,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,onlineupdate,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,ooo,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,tde,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) -$(eval $(call gb_AutoInstallLibs_add_module,writer,LIBO_LIB_FILE)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 695c88c4ec40..0712d4a42e1e 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ - AutoInstallLibs \ + AutoInstall \ CustomTarget_langmacros \ InstallModule_accessories \ InstallModule_base \ diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index 9a1f22d1969a..4dfd8863b3ba 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/base" +#include "AutoInstall/base" Module gid_Module_Prg_Base MOD_NAME_DESC(MODULE_PRG_BASE); diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 262799d9a4b4..2b45bb14203c 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/gnome" +#include "AutoInstall/gnome" Module gid_Module_Optional_Gnome ParentID = gid_Module_Optional; diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 6c8b2e8e8581..88ab15668070 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/graphicfilter" +#include "AutoInstall/graphicfilter" Module gid_Module_Optional_Grfflt PackageInfo = "packinfo_office.txt"; diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 8201e9a3f8c5..ebf90a25de47 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/impress" +#include "AutoInstall/impress" Module gid_Module_Prg_Impress MOD_NAME_DESC ( MODULE_PRG_IMPRESS ); diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 23b921e5e8e7..c82a094563c5 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/kde" +#include "AutoInstall/kde" Module gid_Module_Optional_Kde ParentID = gid_Module_Optional; diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index b8427c9a73b9..0c01f984caf9 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/math" +#include "AutoInstall/math" Module gid_Module_Prg_Math MOD_NAME_DESC ( MODULE_PRG_MATH ); diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 4fdb0b3304f3..ecd0cda907e4 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/onlineupdate" +#include "AutoInstall/onlineupdate" Module gid_Module_Optional_Onlineupdate PackageInfo = "packinfo_office.txt"; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index b5452d33dd8d..d8a0a5f49eca 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -17,7 +17,7 @@ */ #include "macros.inc" -#include "AutoInstallLibs/ooo" +#include "AutoInstall/ooo" #ifdef AIX #ifndef SYSTEM_CURL diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 63c8e26c54e3..b2246e847675 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/ure" +#include "AutoInstall/ure" Directory gid_Dir_Ure_Bin #if defined MACOSX diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 2f4523d87739..03138fecf79f 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -11,7 +11,7 @@ #include "macros.inc" -#include "AutoInstallLibs/tde" +#include "AutoInstall/tde" Module gid_Module_Optional_Tde ParentID = gid_Module_Optional; diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index b0a2bc982002..c141fa199cff 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/writer" +#include "AutoInstall/writer" Module gid_Module_Prg_Wrt MOD_NAME_DESC(MODULE_PRG_WRT); |