diff options
| author | Andras Timar <atimar@suse.com> | 2012-09-28 16:57:02 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-09-28 16:57:02 +0200 |
| commit | dbac379f77a034f10e62e607258fcbafad41b7ab (patch) | |
| tree | 38c9db63bb991d8ff0ca8060274f8c6aaf92e3c9 /Repository.mk | |
| parent | 822ac662c758916af546a293a408ee6fbb9cfe7e (diff) | |
| parent | 8b97644bab0e9106b798a5b8969aa796e558ef3f (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
l10ntools/Module_l10ntools.mk
l10ntools/source/merge.cxx
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ExtensionTarget.mk
solenv/gbuild/InstallModuleTarget.mk
solenv/gbuild/TargetLocations.mk
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/Repository.mk b/Repository.mk index 8e5847418533..cb511a076a22 100644 --- a/Repository.mk +++ b/Repository.mk @@ -27,11 +27,13 @@ #************************************************************************* $(eval $(call gb_Helper_register_executables,NONE, \ + HelpIndexer \ + HelpLinker \ bestreversemap \ bmp \ bmpsum \ - checksingleton \ cfgex \ + checksingleton \ cppunit/cppunittester \ g2g \ gencoll_rule \ @@ -44,6 +46,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ lngconvex \ localize \ mkunroll \ + mork_helper \ osl_process_child \ pdf2xml \ pdfunzip \ @@ -60,12 +63,15 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svidl \ transex3 \ typesconfig \ - ucpp \ + $(if $(filter UCPP,$(BUILD_TYPE)),\ + ucpp \ + ) \ + uiex \ ulfconv \ ulfex \ xml2cmp \ - xrmex \ xpdfimport \ + xrmex \ )) $(eval $(call gb_Helper_register_executables,SDK, \ @@ -76,8 +82,9 @@ ifneq ($(OS),IOS) $(eval $(call gb_Helper_register_executables,SDK, \ autodoc \ - javamaker \ + climaker \ cppumaker \ + javamaker \ regcompare \ uno-skeletonmaker \ )) @@ -86,8 +93,6 @@ endif $(eval $(call gb_Helper_register_executables,OOO, \ gnome-open-url.bin \ - HelpLinker \ - HelpIndexer \ spadmin.bin \ $(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \ tdefilepicker \ @@ -96,6 +101,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \ kdefilepicker \ ) \ + ui-previewer \ )) ifeq ($(OS),WNT) @@ -301,6 +307,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ lwpft \ MacOSXSpell \ merged \ + mork \ mozab2 \ mozabdrv \ msfilter \ @@ -399,12 +406,17 @@ endif $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ affine_uno \ + cli_cppuhelper_native \ + cli_uno \ + gcc3_uno \ + java_uno \ jpipe \ juh \ juhx \ log_uno \ sal_textenc \ sunjavaplugin \ + sunpro5_uno \ unsafe_uno \ xmlreader \ )) @@ -413,6 +425,8 @@ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ jpipx \ + msci_uno \ + mscx_uno \ )) endif @@ -677,13 +691,16 @@ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ xmlsec1 \ xmlsec1-nss \ +)) +ifneq ($(CROSS_COMPILING),YES) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ xmlsec1-mscrypto \ )) +endif else $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ xmlsec1 \ xmlsec1-nss \ - xmlsec1-mscrypto \ )) endif |