diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-01 14:53:13 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-04 11:31:58 +0200 |
commit | b635ee568cba6dc828084cdbd9e9b9995ddf7a68 (patch) | |
tree | c55566ceedfad93a6ac398396d0d6e16e977af69 /extensions | |
parent | 8cb0d4f0b7368a86ba98cdb3bfeaa45b43a5f1f1 (diff) |
extensions: use CustomTarget makefiles
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/CustomTarget_so_activex_idl.mk (renamed from extensions/source/activex/idl/Makefile) | 21 | ||||
-rw-r--r-- | extensions/CustomTarget_so_activex_x64.mk (renamed from extensions/source/activex/Makefile) | 24 | ||||
-rw-r--r-- | extensions/Library_so_activex.mk | 5 | ||||
-rw-r--r-- | extensions/Library_so_activex_x64.mk | 6 | ||||
-rw-r--r-- | extensions/Module_extensions.mk | 4 | ||||
-rw-r--r-- | extensions/Package_so_activex_idl.mk | 36 | ||||
-rw-r--r-- | extensions/Package_so_activex_x64.mk | 41 | ||||
-rw-r--r-- | extensions/WinResTarget_activex.mk | 2 |
8 files changed, 29 insertions, 110 deletions
diff --git a/extensions/source/activex/idl/Makefile b/extensions/CustomTarget_so_activex_idl.mk index 62b915081846..e389f5bf7ac2 100644 --- a/extensions/source/activex/idl/Makefile +++ b/extensions/CustomTarget_so_activex_idl.mk @@ -25,15 +25,20 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(GBUILDDIR)/gbuild_simple.mk +$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl,new_style)) + +EXAI := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl) + +$(call gb_CustomTarget_get_target,extensions/source/activex/idl) : \ + $(EXAI)/so_activex.tlb # XXX: I presume that the "$(COM)"=="GCC" case in the original # extensions/source/activex/msidl/makefile.mk was for the # use-mingw-on-windows case and thus is not interesting for us. -ifeq ($(OS_FOR_BUILD),WNT) -override SRCDIR := $(shell cygpath -m $(SRCDIR)) -endif -so_activex.tlb : +$(EXAI)/so_activex.tlb : \ + $(SRCDIR)/extensions/source/activex/so_activex.idl | $(EXAI)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) + $(call gb_Helper_abbreviate_dirs_native, \ midl.exe \ -tlb $@ \ -h so_activex.h \ @@ -42,10 +47,6 @@ so_activex.tlb : -proxy so_activex_p.c \ -Oicf \ $(INCLUDE) \ - $(SRCDIR)/extensions/source/activex/so_activex.idl - -.DEFAULT_GOAL := all -.PHONY : all -all : so_activex.tlb + $<) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/source/activex/Makefile b/extensions/CustomTarget_so_activex_x64.mk index 65f82ea209ec..f894bac805ba 100644 --- a/extensions/source/activex/Makefile +++ b/extensions/CustomTarget_so_activex_x64.mk @@ -25,17 +25,19 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -% : $(SRCDIR)/extensions/source/activex/% - cp $< $@ +$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex,new_style)) + +EXSA := $(call gb_CustomTarget_get_workdir,extensions/source/activex) -.DEFAULT_GOAL := all -.PHONY : all -all : \ - SOActionsApproval.cxx \ - SOActiveX.cxx \ - SOComWindowPeer.cxx \ - SODispatchInterceptor.cxx \ - StdAfx2.cxx \ - so_activex.cxx \ +$(call gb_CustomTarget_get_target,extensions/source/activex) : \ + $(EXSA)/SOActionsApproval.cxx \ + $(EXSA)/SOActiveX.cxx \ + $(EXSA)/SOComWindowPeer.cxx \ + $(EXSA)/SODispatchInterceptor.cxx \ + $(EXSA)/StdAfx2.cxx \ + $(EXSA)/so_activex.cxx \ + +$(EXSA)/% : $(SRCDIR)/extensions/source/activex/% + cp $< $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 235bcbe39f6d..798fc0fe22d5 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -30,13 +30,10 @@ $(eval $(call gb_Library_Library,so_activex)) -$(eval $(call gb_Library_add_package_headers,so_activex,\ - extensions_so_activex_idl \ -)) +$(eval $(call gb_Library_add_custom_headers,so_activex,extensions/source/activex/idl)) $(eval $(call gb_Library_set_include,so_activex,\ $$(INCLUDE) \ - -I$(WORKDIR)/CustomTarget/extensions/source/activex/idl \ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index af70b6646b10..3839f9e0c1a7 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -32,15 +32,11 @@ $(eval $(call gb_Library_Library,so_activex_x64)) $(eval $(call gb_Library_set_x64,so_activex_x64,YES)) -$(eval $(call gb_Library_add_package_headers,so_activex_x64,\ - extensions_so_activex_idl \ - extensions_so_activex_x64_sources \ -)) +$(eval $(call gb_Library_add_custom_headers,so_activex_x64,extensions/source/activex/idl)) $(eval $(call gb_Library_set_include,so_activex_x64,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/source/activex \ - -I$(WORKDIR)/CustomTarget/extensions/source/activex/idl \ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index f6a8a22a0f63..f7e71802d4aa 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -69,15 +69,15 @@ ifeq ($(OS),WNT) ifeq ($(COM),MSC) ifneq ($(DISABLE_ACTIVEX),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ + CustomTarget_so_activex_idl \ WinResTarget_activex \ Library_so_activex \ - Package_so_activex_idl \ )) ifeq ($(BUILD_X64),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ + CustomTarget_so_activex_x64 \ Library_so_activex_x64 \ - Package_so_activex_x64 \ )) endif # BUILD_X64 endif # DISABLE_ACTIVEX diff --git a/extensions/Package_so_activex_idl.mk b/extensions/Package_so_activex_idl.mk deleted file mode 100644 index b49c48240997..000000000000 --- a/extensions/Package_so_activex_idl.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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) 2012 Red Hat, Inc., David Tardon <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 applicable -# instead of those above. - -$(eval $(call gb_Package_Package,extensions_so_activex_idl,$(WORKDIR)/extensions/source/activex/idl)) - -$(eval $(call gb_Package_add_customtarget,extensions_so_activex_idl,extensions/source/activex/idl)) - -$(eval $(call gb_CustomTarget_add_dependencies,extensions/source/activex/idl,\ - extensions/source/activex/so_activex.idl \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Package_so_activex_x64.mk b/extensions/Package_so_activex_x64.mk deleted file mode 100644 index 952bb46fb6b6..000000000000 --- a/extensions/Package_so_activex_x64.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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) 2012 Red Hat, Inc., David Tardon <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 applicable -# instead of those above. - -$(eval $(call gb_Package_Package,extensions_so_activex_x64_sources,$(WORKDIR)/extensions/source/activex)) - -$(eval $(call gb_Package_add_customtarget,extensions_so_activex_x64_sources,extensions/source/activex)) - -$(eval $(call gb_CustomTarget_add_dependencies,extensions/source/activex,\ - extensions/source/activex/SOActionsApproval.cxx \ - extensions/source/activex/SOActiveX.cxx \ - extensions/source/activex/SOComWindowPeer.cxx \ - extensions/source/activex/SODispatchInterceptor.cxx \ - extensions/source/activex/StdAfx2.cxx \ - extensions/source/activex/so_activex.cxx \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index df6d833a7938..bad7a0b99503 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -46,6 +46,6 @@ $(eval $(call gb_WinResTarget_set_defs,activex_res,\ # I suppose this dep is not really necessary, because it should always # be fulfilled anyway. But it cannot hurt to have it... -$(call gb_WinResTarget_get_target,activex_res) : $(call gb_Package_get_target,extensions_so_activex_idl) +$(call gb_WinResTarget_get_target,activex_res) : $(WORKDIR)/CustomTarget/extensions/source/activex/idl # vim:set shiftwidth=4 softtabstop=4 expandtab: |