diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-06-29 17:34:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-29 17:43:31 +0200 |
| commit | e03a5f5e8303668cb68844b6df9ec53a561792bc (patch) | |
| tree | 3424fadf42fb83b06ff16e47c3d832e57a783241 /onlineupdate | |
| parent | 8c07510faa32211536a1d3c461b674812b025bdd (diff) | |
online update: Configure switch --enable-online-update=mar
This will enable the mar-based online update instead of the 'traditional' one.
At the moment, this does not build, as libbz2 was not packaged as an external
library yet.
Change-Id: I1ad7d9adf7a12a427786682ad932597eb2319256
Diffstat (limited to 'onlineupdate')
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 8 | ||||
| -rw-r--r-- | onlineupdate/Module_onlineupdate.mk | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index 149a3a1e2d23..f8537bebe4b8 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Executable_set_include,updater,\ -I$(SRCDIR)/onlineupdate/source/update/src \ -I$(SRCDIR)/onlineupdate/source/update/inc \ -I$(SRCDIR)/onlineupdate/source/update/common \ - -I$(SRCDIR)/onlineupdate/source/update/updater/libbz2/src \ -I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \ -lpthread \ $$(INCLUDE) \ @@ -80,13 +79,6 @@ $(eval $(call gb_Executable_add_cobjects,updater,\ onlineupdate/source/update/src/mar_create \ onlineupdate/source/update/src/mar_extract \ onlineupdate/source/update/src/mar_read \ - onlineupdate/source/update/updater/libbz2/src/blocksort \ - onlineupdate/source/update/updater/libbz2/src/bzlib \ - onlineupdate/source/update/updater/libbz2/src/compress \ - onlineupdate/source/update/updater/libbz2/src/crctable \ - onlineupdate/source/update/updater/libbz2/src/decompress \ - onlineupdate/source/update/updater/libbz2/src/huffman \ - onlineupdate/source/update/updater/libbz2/src/randtable \ )) # vim:set shiftwidth=4 tabstop=4 noexpandtab: */ diff --git a/onlineupdate/Module_onlineupdate.mk b/onlineupdate/Module_onlineupdate.mk index fc09440c0ce9..113c03179815 100644 --- a/onlineupdate/Module_onlineupdate.mk +++ b/onlineupdate/Module_onlineupdate.mk @@ -10,9 +10,11 @@ $(eval $(call gb_Module_Module,onlineupdate)) +ifneq ($(ENABLE_ONLINE_UPDATE_MAR),) $(eval $(call gb_Module_add_targets,onlineupdate,\ Executable_mar \ Executable_updater \ )) +endif # vim: set noet sw=4 ts=4: |