diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-24 13:17:40 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 14:36:42 +0200 |
| commit | 9eed485db35b14f4c4bf0a5849b4baf0039e4293 (patch) | |
| tree | de5ee079188fc007a09844dca8ffb7ceb07740c9 /scp2 | |
| parent | 2b3fc45d256b1969cd0bbd4601eb70d03801d07f (diff) | |
bin i18npool/version.mk, hardcode the version
This makefile must be included from other makefiles, which means it must
be delivered first, which does not play so well with gbuild's
all-in-one-process build. Because the version has not changed once since
the library was introduced in 2006, I consider this just an unecessary
complication of already complex build process.
Change-Id: I8304f0e8ef9e59a046b10f423dbe61d75e3fc5c2
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 927c4e1d2f34..928edad55a3f 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -134,10 +134,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ MINGW_ZLIB_DLL \ )) -include $(OUTDIR)/inc/i18npool/version.mk - $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ - -DISOLANG_MAJOR=$(ISOLANG_MAJOR) \ $(if $(filter MACOSX,$(OS)),\ -DENABLE_CAIROCANVAS \ ) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 0b4a78e1dfde..b2a6cbbf29c0 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -706,9 +706,9 @@ End File gid_File_Lib_I18nisolang #ifdef UNX - Name = STRING(CONCAT4(libi18nisolang,ISOLANG_MAJOR,COMID,UNXSUFFIX)); + Name = STRING(CONCAT3(libi18nisolang1,COMID,UNXSUFFIX)); #else - Name = STRING(CONCAT4(i18nisolang,ISOLANG_MAJOR,COMID,.dll)); + Name = STRING(CONCAT3(i18nisolang1,COMID,.dll)); #endif PACKED_LIB_FILE_BODY; End |