diff options
author | Nathan Yee <ny.nathan.yee@gmail.com> | 2015-06-23 17:04:17 -0700 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-29 17:43:30 +0200 |
commit | 7316144b8fbc4c4f4412da7afa68186a545847eb (patch) | |
tree | b69cd35350ff13652cf32228df6d3d9b4734e4b0 /Repository.mk | |
parent | online update: Add MAR library creation capability (diff) | |
download | core-7316144b8fbc4c4f4412da7afa68186a545847eb.tar.gz core-7316144b8fbc4c4f4412da7afa68186a545847eb.zip |
online update: Add mar executable build support
Remove unneeded mar library build support
Add macro workarounds in mar.c; will deal with them in the future
Change PL_strdup to strdup (is this safe?)
Change-Id: Ib3108abdf360f6fc1ccc1bf5030df8529d724b82
Diffstat (limited to 'Repository.mk')
-rw-r--r-- | Repository.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 29113d13f4eb..686a881b5410 100644 --- a/Repository.mk +++ b/Repository.mk @@ -179,6 +179,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \ )) endif +$(eval $(call gb_Helper_register_executables_for_install,OOO,onlineupdate, \ + $(if $(ENABLE_ONLINE_UPDATE), \ + mar \ + ) \ +)) + $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ regmerge \ @@ -227,7 +233,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \ $(if $(ENABLE_ONLINE_UPDATE), \ - mar \ updatecheckui \ updchk \ ) \ |