Create unopkg.bin directly.

3 files changed, 9 insertions, 54 deletions

diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index e472b1d001bd..46876ece7ae5 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -46,4 +46,12 @@ $(eval $(call gb_Executable_add_cobjects,unopkg.bin,\
     desktop/source/pkgchk/unopkg/unopkg_main \
 ))
 
+ifeq ($(OS),WNT)
+
+# the resulting executable is called unopkg.bin.exe, copy it to unopkg.bin
+$(eval $(call gb_Package_Package,unopkg.bin,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,unopkg.bin,bin/unopkg.bin,unopkg.bin.exe))
+
+endif
+
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
deleted file mode 100644
index 3dffb08d5e97..000000000000
--- a/desktop/Executable_unopkg.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are licable
-# instead of those above.
-
-$(eval $(call gb_Executable_Executable,unopkg))
-
-$(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
-
-$(eval $(call gb_Executable_add_precompiled_header,unopkg,desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,unopkg,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/desktop/inc/pch \
-    -I$(SRCDIR)/desktop/source/inc \
-))
-
-$(eval $(call gb_Executable_add_linked_libs,unopkg,\
-    comphelper \
-    sal \
-    tl \
-    unopkgapp \
-))
-
-$(eval $(call gb_Executable_add_cobjects,unopkg,\
-    desktop/source/pkgchk/unopkg/unopkg_main \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 36e41fe32c03..94035b5c3eea 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     AllLangResTarget_deploymentgui \
     AllLangResTarget_dkt \
     Executable_soffice.bin \
+    Executable_unopkg.bin \
     Library_deployment \
     Library_deploymentgui \
     Library_deploymentmisc \
@@ -78,7 +79,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Executable_sweb \
     Executable_swriter \
     Executable_unoinfo \
-    Executable_unopkg \
     Executable_unopkgio \
     Package_manifest \
     Package_rcfile \
@@ -95,10 +95,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 else
 
-$(eval $(call gb_Module_add_targets,desktop,\
-    Executable_unopkg.bin \
-))
-
 ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Module_add_targets,desktop,\