use custom target for copying sources

4 files changed, 87 insertions, 5 deletions

diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index dfee1b85f833..62839005a2b4 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -34,6 +34,10 @@ $(eval $(call gb_Library_set_x64,so_activex_x64,YES))
 
 $(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
 
+$(eval $(call gb_Library_add_package_headers,so_activex_x64,\
+    extensions_so_activex_x64_sources \
+))
+
 $(eval $(call gb_Library_set_include,so_activex_x64,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/extensions/source/activex \
@@ -48,11 +52,6 @@ $(eval $(call gb_Library_add_api,so_activex_x64,\
 
 $(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res))
 
-$(WORKDIR)/CustomTarget/extensions/source/activex/%.cxx : \
-		$(SRCDIR)/extensions/source/activex/%.cxx
-	mkdir -p $(dir $@)
-	cp $< $@
-
 $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\
 	CustomTarget/extensions/source/activex/so_activex \
 	CustomTarget/extensions/source/activex/SOActiveX \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 97ad06d0df99..1be04f9b078a 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 ifeq ($(BUILD_X64),TRUE)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_so_activex_x64 \
+	Package_so_activex_x64 \
 ))
 endif # BUILD_X64
 endif # DISABLE_ACTIVEX
diff --git a/extensions/Package_so_activex_x64.mk b/extensions/Package_so_activex_x64.mk
new file mode 100644
index 000000000000..952bb46fb6b6
--- /dev/null
+++ b/extensions/Package_so_activex_x64.mk
@@ -0,0 +1,41 @@
+# -*- 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/source/activex/Makefile b/extensions/source/activex/Makefile
new file mode 100644
index 000000000000..bf79e4c03c1e
--- /dev/null
+++ b/extensions/source/activex/Makefile
@@ -0,0 +1,41 @@
+# -*- 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.
+
+% : $(SRCDIR)/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: