Makefile.in | 1 solenv/gbuild/TargetLocations.mk | 3 - solenv/gbuild/UnoApiMerge.mk | 61 --------------------------------------- solenv/gbuild/gbuild.help.txt | 1 solenv/gbuild/gbuild.mk | 1 5 files changed, 67 deletions(-)
New commits: commit bb01340a5ccd07a29cce27c8e6cf0664a34aacfe Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Apr 24 11:09:32 2013 +0200 UnoApiMerge has become unused now Change-Id: I9e4e153e1a9ac82d4015b73ecf3a9a2429ab346f diff --git a/Makefile.in b/Makefile.in index 6dea2a1..f427136 100644 --- a/Makefile.in +++ b/Makefile.in @@ -124,7 +124,6 @@ gbuild_TARGETS := AllLangHelp \ StaticLibrary \ UIConfig \ UnoApi \ - UnoApiMerge \ UnpackedTarball \ WinResTarget \ Zip \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 71101ca..3c43b36 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -56,8 +56,6 @@ gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/program/resource/$(1).res gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb -gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb -gb_UnoApiMerge_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1).rdb gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip gb_Zip_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/pck/$(1).zip @@ -343,7 +341,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ Library \ StaticLibrary \ UnoApi \ - UnoApiMerge \ )) $(eval $(call gb_Helper_make_dep_targets,\ diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk deleted file mode 100644 index 8d14077..0000000 --- a/solenv/gbuild/UnoApiMerge.mk +++ /dev/null @@ -1,61 +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/. -# - -# Note: targets for this class are the same as for UnoApi, therefore -# there is no need to define them again (and if we did, they would -# overwrite the UnoApi targets anyway...) - -define gb_UnoApiMerge_UnoApiMerge -$(call gb_UnoApiTarget_UnoApiTarget,$(1)) - -$(call gb_UnoApiTarget_set_root,$(1),/) - -$(call gb_UnoApiMerge_get_target,$(1)) :| $(dir $(call gb_UnoApiMerge_get_target,$(1))).dir -$(call gb_UnoApiMerge_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) - -$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY) - -$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) - -$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),UnoApiMerge) - -endef - -define gb_UnoApiMerge_add_rdbfile -$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfile: use gb_UnoApiMerge_use_api instead.) -endef - -define gb_UnoApiMerge__use_api -$(call gb_UnoApiTarget_merge_api,$(1),$(2)) -$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2)) - -endef - -define gb_UnoApiMerge_add_rdbfiles -$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfiles: use gb_UnoApiMerge_use_api instead.) -endef - -define gb_UnoApiMerge_use_api -$(foreach rdb,$(2),$(call gb_UnoApiMerge__use_api,$(1),$(rdb))) - -endef - -define gb_UnoApiMerge_add_reference_rdbfile -$$(call gb_Output_error,gb_UnoApiMerge_add_reference_rdbfile: use gb_UnoApiMerge_set_reference_rdbfile instead.) - -endef - -define gb_UnoApiMerge_set_reference_rdbfile -$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2)) - -endef - -# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 776aeb1..730b34e 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -76,7 +76,6 @@ AVAILABLE TARGETS o StaticLibrary o UI o UnoApi - o UnoApiMerge o UnpackedTarball o WinResTarget o Zip diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index def5ff8..5e06cbb 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -322,7 +322,6 @@ include $(foreach class, \ UIConfig \ UnoApiTarget \ UnoApi \ - UnoApiMerge \ UnpackedTarball \ InternalUnoApi \ CliAssembly \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits