diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_crashrep.com.mk | 4 | ||||
| -rw-r--r-- | desktop/Executable_soffice.bin.mk | 46 | ||||
| -rw-r--r-- | desktop/Executable_soffice_bin.mk | 59 | ||||
| -rw-r--r-- | desktop/Executable_unopkg.bin.mk | 24 | ||||
| -rw-r--r-- | desktop/Executable_unopkg.com.mk | 4 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 9 | ||||
| -rw-r--r-- | desktop/Package_soffice_bin.mk | 16 |
7 files changed, 47 insertions, 115 deletions
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 13807cdb4329..15d69bf04adf 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -23,8 +23,4 @@ $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) -# the resulting executable is called crashrep_com.exe, copy it to crashrep.com -$(eval $(call gb_Package_Package,crashrep_com,$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,crashrep_com,bin/crashrep.com,crashrep_com.exe)) - # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index d7d604379acf..90b56fdfa3ed 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -7,22 +7,22 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Executable_Executable,soffice.bin)) +$(eval $(call gb_Executable_Executable,soffice_bin)) -$(eval $(call gb_Executable_set_targettype_gui,soffice.bin,YES)) +$(eval $(call gb_Executable_set_targettype_gui,soffice_bin,YES)) -$(eval $(call gb_Executable_set_include,soffice.bin,\ +$(eval $(call gb_Executable_set_include,soffice_bin,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Executable_use_libraries,soffice.bin,\ +$(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_cobjects,soffice.bin,\ +$(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) @@ -34,4 +34,40 @@ $(eval $(call gb_Executable_set_ldflags,\ endif +ifeq ($(OS),WNT) + +$(eval $(call gb_Executable_use_static_libraries,soffice_bin,\ + ooopathutils \ + winextendloaderenv \ +)) + +$(eval $(call gb_Executable_set_targettype_gui,soffice_bin,YES)) + +$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Executable_add_ldflags,soffice_bin,\ + /STACK:10000000 \ +)) + +# HACK: Copy manifest to $(OUTDIR)/bin under the right name. The +# executable is copied in Package_soffice_bin, but that does not work +# for the manifest, for some reason... +$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest + +$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,soffice_bin) +$(call gb_Executable_get_clean_target,soffice_bin) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest + +$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) + $(call gb_Deliver_deliver,$(call gb_LinkTarget_get_manifestfile,$(call gb_LinkTarget__get_workdir_linktargetname,$(call gb_Executable_get_linktarget,soffice_bin))),$@) + +.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest +$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest : + rm -f $(OUTDIR)/bin/soffice.bin.manifest + +endif + +endif + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk deleted file mode 100644 index 83d32b6cc66e..000000000000 --- a/desktop/Executable_soffice_bin.mk +++ /dev/null @@ -1,59 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Executable_Executable,soffice_bin)) - -$(eval $(call gb_Executable_set_targettype_gui,soffice_bin,YES)) - -$(eval $(call gb_Executable_set_include,soffice_bin,\ - $$(INCLUDE) \ - -I$(SRCDIR)/desktop/source/inc \ -)) - -$(eval $(call gb_Executable_use_libraries,soffice_bin,\ - sal \ - sofficeapp \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Executable_add_cobjects,soffice_bin,\ - desktop/source/app/main \ -)) - -$(eval $(call gb_Executable_use_static_libraries,soffice_bin,\ - ooopathutils \ - winextendloaderenv \ -)) - -ifeq ($(COM),MSC) - -$(eval $(call gb_Executable_add_ldflags,soffice_bin,\ - /STACK:10000000 \ -)) - -# HACK: Copy manifest to $(OUTDIR)/bin under the right name. The -# executable is copied in Package_soffice_bin, but that does not work -# for the manifest, for some reason... -$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest - -$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,soffice_bin) -$(call gb_Executable_get_clean_target,soffice_bin) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest - -$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) - $(call gb_Deliver_deliver,$<.manifest,$@) - -.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest -$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest : - rm -f $(OUTDIR)/bin/soffice.bin.manifest - -endif - -$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 90736db7309c..2ee1985e9742 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -7,22 +7,16 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(OS),WNT) -desktop_UNOPKGBIN := unopkg_bin -else -desktop_UNOPKGBIN := unopkg.bin -endif +$(eval $(call gb_Executable_Executable,unopkg_bin)) -$(eval $(call gb_Executable_Executable,$(desktop_UNOPKGBIN))) +$(eval $(call gb_Executable_set_targettype_gui,unopkg_bin,YES)) -$(eval $(call gb_Executable_set_targettype_gui,$(desktop_UNOPKGBIN),YES)) - -$(eval $(call gb_Executable_set_include,$(desktop_UNOPKGBIN),\ +$(eval $(call gb_Executable_set_include,unopkg_bin,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ +$(eval $(call gb_Executable_use_libraries,unopkg_bin,\ comphelper \ sal \ tl \ @@ -30,16 +24,8 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ +$(eval $(call gb_Executable_add_cobjects,unopkg_bin,\ desktop/source/pkgchk/unopkg/unopkg_main \ )) -ifeq ($(OS),WNT) - -# the resulting executable is called $(desktop_UNOPKGBIN).exe, copy it to $(desktop_UNOPKGBIN) -$(eval $(call gb_Package_Package,$(desktop_UNOPKGBIN),$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,$(desktop_UNOPKGBIN),bin/unopkg.bin,$(desktop_UNOPKGBIN).exe)) - -endif - # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk index bcff06a6d05e..2c46d2c109a6 100644 --- a/desktop/Executable_unopkg.com.mk +++ b/desktop/Executable_unopkg.com.mk @@ -19,8 +19,4 @@ $(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 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 \ diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk deleted file mode 100644 index acc9cab86dc5..000000000000 --- a/desktop/Package_soffice_bin.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,desktop_soffice_bin,$(gb_Executable_BINDIR))) - -$(eval $(call gb_Package_set_outdir,desktop_soffice_bin,$(gb_INSTROOT))) - -$(eval $(call gb_Package_add_file,desktop_soffice_bin,$(LIBO_BIN_FOLDER)/soffice.bin,soffice_bin$(gb_Executable_EXT))) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: |