summaryrefslogtreecommitdiff
path: root/desktop/Module_desktop.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-05-02 10:32:14 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-02 10:56:22 +0200
commit947244c188dabe7a1799254c9e9c58ddb2eccf98 (patch)
tree4adeb2027cb1b9bca6bf4934e054687ee711aae7 /desktop/Module_desktop.mk
parent1fa4154c1c99dc06713da3ab03096ce4a05e74c4 (diff)
convert custom makefile code into a package
Change-Id: I72b41e4826b7e93b5c8aeacbf6d9d52e3780f090
Diffstat (limited to 'desktop/Module_desktop.mk')
-rw-r--r--desktop/Module_desktop.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index abafafb3faaf..cb067b3205c6 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
- Executable_soffice.bin \
Executable_unopkg.bin \
Library_deploymentgui \
Library_migrationoo2 \
@@ -57,6 +56,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
Pagein_writer \
))
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,desktop,\
+ Executable_soffice.bin \
+))
+endif
+
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,desktop,\
@@ -80,11 +85,13 @@ $(eval $(call gb_Module_add_targets,desktop,\
Executable_simpress \
Executable_smath \
Executable_soffice \
+ Executable_soffice_bin \
Executable_sweb \
Executable_swriter \
Executable_unoinfo \
Executable_unopkg \
Executable_unopkg.com \
+ Package_soffice_bin \
WinResTarget_quickstart \
WinResTarget_sbase \
WinResTarget_scalc \