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_mar.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_mar.mk')
| -rw-r--r-- | onlineupdate/Executable_mar.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk index c2dccafc38b8..3000a1c70d30 100644 --- a/onlineupdate/Executable_mar.mk +++ b/onlineupdate/Executable_mar.mk @@ -11,12 +11,15 @@ $(eval $(call gb_Executable_Executable,mar)) $(eval $(call gb_Executable_set_include,mar,\ -I$(SRCDIR)/onlineupdate/source/libmar/inc/ \ - -I$(SRCDIR)/onlineupdate/source/libmar/src/ \ -I$(SRCDIR)/onlineupdate/source/libmar/verify/ \ -I$(SRCDIR)/onlineupdate/source/libmar/sign/ \ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_static_libraries,Executable_mar,\ + libmar \ +)) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,mar,\ ws2_32.lib \ @@ -30,9 +33,6 @@ $(eval $(call gb_Executable_add_defs,mar,-DMAR_NSS)) endif $(eval $(call gb_Executable_add_cobjects,mar,\ - onlineupdate/source/libmar/src/mar_create \ - onlineupdate/source/libmar/src/mar_extract \ - onlineupdate/source/libmar/src/mar_read \ onlineupdate/source/libmar/sign/nss_secutil \ onlineupdate/source/libmar/sign/mar_sign \ onlineupdate/source/libmar/verify/cryptox \ |