[Libreoffice-commits] .: desktop/Executable_guiloader.mk desktop/Executable_unopkg.mk desktop/Module_desktop.mk

[Jan Holesovsky]

 desktop/Executable_guiloader.mk |   55 ----------------------------------------
 desktop/Executable_unopkg.mk    |   50 ++++++++++++++++++++++++++++++++++++
 desktop/Module_desktop.mk       |    2 -
 3 files changed, 51 insertions(+), 56 deletions(-)

New commits:
commit 6f65af360c94a9649f6411d2954d8a15ecbfa837
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Sep 20 15:47:45 2011 +0200

    Build unopkg.exe directly.

diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk
deleted file mode 100644
index d04ee32..0000000
--- a/desktop/Executable_guiloader.mk
+++ /dev/null
@@ -1,55 +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 at 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 applicable
-# instead of those above.
-
-$(eval $(call gb_Executable_Executable,guiloader))
-
-$(eval $(call gb_Executable_set_targettype_gui,guiloader,YES))
-
-$(eval $(call gb_Executable_add_precompiled_header,guiloader,desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,guiloader,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/desktop/inc/pch \
-))
-
-$(eval $(call gb_Executable_add_linked_static_libs,guiloader,\
-    ooopathutils \
-))
-
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Executable_add_linked_libs,guiloader,\
-    user32 \
-))
-
-endif
-
-
-$(eval $(call gb_Executable_add_noexception_objects,guiloader,\
-    desktop/win32/source/extendloaderenvironment \
-    desktop/win32/source/guiloader/genericloader \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
new file mode 100644
index 0000000..f68ec85
--- /dev/null
+++ b/desktop/Executable_unopkg.mk
@@ -0,0 +1,50 @@
+# 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 at 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 applicable
+# 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 \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
+    ooopathutils \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,unopkg,\
+    user32 \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,unopkg,\
+    desktop/win32/source/extendloaderenvironment \
+    desktop/win32/source/guiloader/genericloader \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 5c7a5a4..ad0165c 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,desktop,\
-    Executable_guiloader \
     Executable_guistdio \
     Executable_loader2 \
     Executable_quickstart \
@@ -79,6 +78,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Executable_sweb \
     Executable_swriter \
     Executable_unoinfo \
+    Executable_unopkg \
     Executable_unopkg.com \
     Package_manifest \
     Package_rcfile \