diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-28 17:35:51 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-16 13:40:39 +0200 |
| commit | 93b6f9cf2916dfe99b590370404103eb949ccde6 (patch) | |
| tree | 6da7aece23ec28edfc17569ad6a608ea4d4bde98 | |
| parent | b8abc817c4d1b39b1cc12b6ba3a09c44672d251b (diff) | |
CWS gnumake4: convert regexp to new build system [hg:56e4316f8d74]
| -rwxr-xr-x | Repository.mk | 1 | ||||
| -rwxr-xr-x | scp2/source/ooo/file_library_ooo.scp | 11 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/Repository.mk b/Repository.mk index 32799fafa7d8..922eae6faaf1 100755 --- a/Repository.mk +++ b/Repository.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwl \ fwm \ i18npaper \ + i18nregexp \ lng \ msfilter \ msword \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6f2905f47505..94f42dcb96e4 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -645,16 +645,7 @@ File gid_File_Lib_I18npool #endif End -File gid_File_Lib_I18nregexp - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT3(libi18nregexp,COMID,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(i18nregexp,COMID,.dll)); - #endif -End +STD_LIB_FILE( gid_File_I18nregexp, i18nregexp ) File gid_File_Lib_I18nsearch TXT_FILE_BODY; diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index d7f9cb1f1d64..c0781a9f5076 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -53,6 +53,7 @@ I18NUTILLIB=-li18nutil$(COMID) .INCLUDE .IGNORE : i18npool/version.mk I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) +I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX) .IF "$(GUI)$(COM)"=="WNTGCC" SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) .ELSE # "$(GUI)$(COM)"=="WNTGCC" @@ -368,6 +369,7 @@ ICUDATALIB=icudata.lib I18NUTILLIB=ii18nutil.lib I18NISOLANGLIB=ii18nisolang.lib I18NPAPERLIB=ii18npaper.lib +I18NREGEXPLIB=ii18nregexp.lib SALHELPERLIB=isalhelper.lib XMLSCRIPTLIB=ixcr.lib COMPHELPERLIB=icomphelp.lib |