scp2: move liblangtag to AutoInstall

Change-Id: If79d57cf1743427106c0e4202fb4d5e42b5a807e
This commit is contained in:
Michael Stahl
2014-03-18 17:38:06 +01:00
parent 0c94f23959
commit 01adcd8024
4 changed files with 4 additions and 19 deletions

View File

@@ -993,6 +993,10 @@ endef
else # !SYSTEM_LIBLANGTAG
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
liblangtag_data \
))
define gb_LinkTarget__use_liblangtag
$(call gb_LinkTarget_use_unpacked,$(1),langtag)
$(call gb_LinkTarget_set_include,$(1),\

View File

@@ -23,7 +23,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
$(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
ENABLE_KDE \
ENABLE_LIBLANGTAG \
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
ENABLE_MACOSX_SANDBOX \
ENABLE_NPAPI_FROM_BROWSER \
@@ -46,7 +45,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
SYSTEM_LCMS2 \
SYSTEM_LIBEXTTEXTCAT \
SYSTEM_LIBJPEG \
SYSTEM_LIBLANGTAG \
SYSTEM_LIBXML \
SYSTEM_LIBXSLT \
SYSTEM_LUCENE \

View File

@@ -242,14 +242,6 @@ Directory gid_Dir_Autotext
DosName = "autotext";
End
#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
Directory gid_Dir_Share_Liblangtag
ParentID = gid_Brand_Dir_Share;
DosName = "liblangtag";
Styles = (WORKSTATION, CREATE);
End
#endif
Directory gid_Dir_Basic
ParentID = gid_Brand_Dir_Share;
DosName = "basic";

View File

@@ -85,15 +85,6 @@ File gid_File_Extra_Databasebiblio
Name = "extras_databasebiblio.filelist";
End
#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
File gid_File_Extra_Liblangtag
Dir = FILELIST_DIR;
USER_FILE_BODY;
Styles = (FILELIST);
Name = "liblangtag_data.filelist";
End
#endif
#ifdef UNX
#ifndef WITHOUT_PPDS