summaryrefslogtreecommitdiff
path: root/desktop/Module_desktop.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-09-21 01:34:26 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-22 11:08:32 +0200
commit764e688fcf497d4b44bcc4d4b009a0cc886b6c14 (patch)
tree20d1432f5624a3156dc716101b994db64ae1d200 /desktop/Module_desktop.mk
parent814ec7640fc2a529343e358ab4fd3b9a59d645ca (diff)
desktop: soffice.bin and unopkg.bin cleanup
Clean up the horrible mess around unopkg.bin unopkg.com unopkg.exe and soffice.bin soffice.exe and crashrep.com executables and associated renaming via Packages in the desktop makefiles by simply using RepositoryFixes to correct the names. Change-Id: I4d3a549462cfa90a63d62b35db1b0407b25239f7
Diffstat (limited to 'desktop/Module_desktop.mk')
-rw-r--r--desktop/Module_desktop.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 847f036f5049..8c1dd94d66b6 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -32,6 +32,7 @@ endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
+ Executable_soffice.bin \
Executable_unopkg.bin \
Library_migrationoo2 \
Library_migrationoo3 \
@@ -45,12 +46,6 @@ $(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,\
@@ -74,13 +69,11 @@ $(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 \