summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-09-20 14:59:00 +0200
committerJan Holesovsky <kendy@suse.cz>2011-09-20 14:59:25 +0200
commit151eba7caa58c52ca4c4f2542de91c9aa41d00ab (patch)
treef5fc48a9589f65c6824c07d7d39e33755e8e5364 /desktop
parent80f2495481542528fb4ceb24e4184e39ec1b6d40 (diff)
Create unopkg.com directly.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Executable_unopkg.com.mk (renamed from desktop/Executable_unopkgio.mk)16
-rw-r--r--desktop/Module_desktop.mk2
2 files changed, 11 insertions, 7 deletions
diff --git a/desktop/Executable_unopkgio.mk b/desktop/Executable_unopkg.com.mk
index c0c328448a8c..3eb3ecd60ec4 100644
--- a/desktop/Executable_unopkgio.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -23,23 +23,27 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Executable_Executable,unopkgio))
+$(eval $(call gb_Executable_Executable,unopkg.com))
-$(eval $(call gb_Executable_set_targettype_gui,unopkgio,NO))
+$(eval $(call gb_Executable_set_targettype_gui,unopkg.com,NO))
-$(eval $(call gb_Executable_add_precompiled_header,unopkgio,desktop/inc/pch/precompiled_desktop.hxx))
+$(eval $(call gb_Executable_add_precompiled_header,unopkg.com,desktop/inc/pch/precompiled_desktop.hxx))
-$(eval $(call gb_Executable_set_include,unopkgio,\
+$(eval $(call gb_Executable_set_include,unopkg.com,\
$$(INCLUDE) \
-I$(SRCDIR)/desktop/inc/pch \
))
-$(eval $(call gb_Executable_add_defs,unopkgio,\
+$(eval $(call gb_Executable_add_defs,unopkg.com,\
$(LFS_CFLAGS) \
))
-$(eval $(call gb_Executable_add_exception_objects,unopkgio,\
+$(eval $(call gb_Executable_add_exception_objects,unopkg.com,\
desktop/win32/source/guistdio/unopkgio \
))
+# the resulting executable is called unopkg.com.exe, copy it to unopkg.com
+$(eval $(call gb_Package_Package,unopkg.com,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,unopkg.com,bin/unopkg.com,unopkg.com.exe))
+
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 94035b5c3eea..5c7a5a40778b 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -79,7 +79,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Executable_sweb \
Executable_swriter \
Executable_unoinfo \
- Executable_unopkgio \
+ Executable_unopkg.com \
Package_manifest \
Package_rcfile \
WinResTarget_quickstart \