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_updater.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_updater.mk')
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index 6ba6d4df8897..fba7e3c7bcd7 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -10,16 +10,13 @@ $(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 \ @@ -67,4 +64,10 @@ $(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: */ |