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_mar.mk | |
| parent | coverity#1362680 Pointer to local outside scope (diff) | |
| download | core-90371480b5e8eab4f79a43faa216dec42ddafbb4.tar.gz core-90371480b5e8eab4f79a43faa216dec42ddafbb4.zip | |
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_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..e42369754732 100644 --- a/onlineupdate/Executable_mar.mk +++ b/onlineupdate/Executable_mar.mk @@ -10,13 +10,16 @@ $(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_Executable_use_static_libraries,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 \ |