diff options
| author | Ras-al-Ghul <dipankar1995@gmail.com> | 2016-03-12 23:30:22 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-14 09:15:09 +0000 |
| commit | e60506acc53098b4b479d565048c316562657cec (patch) | |
| tree | 9c7b457f4e875e24471990490173934c2452642e /onlineupdate/Executable_updater.mk | |
| parent | 60286229fa54b71c67a5d25a7cce59e54b6b8680 (diff) | |
tdf#98602 Duplicate code in onlineupdate/
Converted libmar into static library and removed duplicated code
Change-Id: I6a6c8ce24103a400e1835ccf7e6421024f5cec4b
Reviewed-on: https://gerrit.libreoffice.org/23179
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'onlineupdate/Executable_updater.mk')
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index fba7e3c7bcd7..6ba6d4df8897 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -10,13 +10,16 @@ $(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_Library_use_static_libraries,Executable_updater,\ + libmar \ +)) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,updater,\ Ws2_32.lib \ @@ -64,10 +67,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: */ |