diff options
| author | Ras-al-Ghul <dipankar1995@gmail.com> | 2016-03-17 01:05:54 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-06-13 07:45:12 +0000 |
| commit | 90371480b5e8eab4f79a43faa216dec42ddafbb4 (patch) | |
| tree | d81f485d73fa3ff03eba87592909d3da4f4a2ab1 /onlineupdate/Executable_updater.mk | |
| parent | b3e939971f56d53e60448a954a616ec295544098 (diff) | |
tdf#98602 Duplicate code in onlineupdate/
Converted libmar into static library and removed duplicate code.
Change-Id: I51c58ae9a6a1f1128422b4a79491d0cd62e6ced6
Reviewed-on: https://gerrit.libreoffice.org/23312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'onlineupdate/Executable_updater.mk')
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index 7420f1fce073..9542130f6f29 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -10,13 +10,15 @@ $(eval $(call gb_Executable_Executable,updater)) $(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/xpcom/glue \ $$(INCLUDE) \ )) +$(eval $(call gb_Executable_use_static_libraries,updater,\ + libmar \ +)) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,updater,\ Ws2_32.lib \ @@ -58,10 +60,4 @@ $(eval $(call gb_Executable_add_exception_objects,updater,\ onlineupdate/source/update/common/updatelogging \ )) -$(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 \ -)) - # vim:set shiftwidth=4 tabstop=4 noexpandtab: */ |