diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-03-14 10:30:31 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-14 10:31:13 +0100 |
| commit | 0ce8320eeb1df7eb4f54774e92c2b0e5488570e3 (patch) | |
| tree | de7946ed1ebb80e69f29d9f0e452d20cac675277 /onlineupdate/Executable_mar.mk | |
| parent | bd1a3e75738d65a3bdd615c106ea57a999d51376 (diff) | |
Revert "tdf#98602 Duplicate code in onlineupdate/"
Unfortunately needs more work, I've pushed it too early...
This reverts commit e60506acc53098b4b479d565048c316562657cec.
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 3000a1c70d30..c2dccafc38b8 100644 --- a/onlineupdate/Executable_mar.mk +++ b/onlineupdate/Executable_mar.mk @@ -11,15 +11,12 @@ $(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 \ @@ -33,6 +30,9 @@ $(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 \ |