ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

extensions: use CustomTarget makefiles

Browse Source
This commit is contained in:
Matúš Kukan
2012-04-04 11:31:58 +02:00
parent 8cb0d4f0b7
commit b635ee568c
8 changed files with 29 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/source/activex/idl/Makefile → extensions/CustomTarget_so_activex_idl.mk
+11 -10
View File
@@ -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:
extensions/source/activex/Makefile → extensions/CustomTarget_so_activex_x64.mk
+13 -11
View File
@@ -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/%
$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex,new_style))
EXSA := $(call gb_CustomTarget_get_workdir,extensions/source/activex)
$(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 $< $@
.DEFAULT_GOAL := all
.PHONY : all
all : \
SOActionsApproval.cxx \
SOActiveX.cxx \
SOComWindowPeer.cxx \
SODispatchInterceptor.cxx \
StdAfx2.cxx \
so_activex.cxx \
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
extensions/Library_so_activex.mk
+1 -4
View File
@@ -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)) \
))
extensions/Library_so_activex_x64.mk
+1 -5
View File
@@ -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)) \
))
extensions/Module_extensions.mk
+2 -2
View File
@@ -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
extensions/Package_so_activex_idl.mk
-36
View File
@@ -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:
extensions/Package_so_activex_x64.mk
-41
View File
@@ -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:
extensions/WinResTarget_activex.mk
+1 -1
View File
@@ -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: