[Libreoffice-commits] .: 9 commits - accessibility/bridge accessibility/CustomTarget_bridge_inc.mk accessibility/CustomTarget_bridge.mk accessibility/Jar_accessibility.mk accessibility/Library_java_uno_accessbridge.mk accessibility/Module_accessibility.mk accessibility/Package_bridge_inc.mk accessibility/Package_bridge.mk clucene/CustomTarget_source.mk clucene/Library_clucene.mk clucene/Module_clucene.mk clucene/Package_source.mk clucene/source sal/CustomTarget_generated.mk sal/Module_sal.mk sal/Package_generated.mk sal/util solenv/gbuild tools/CustomTarget_reversemap.mk tools/Library_tl.mk tools/Module_tools.mk tools/Package_reversemap.mk tools/source vcl/CustomTarget_afm_hash.mk vcl/CustomTarget_kde4_moc.mk vcl/generic vcl/Library_vcl.mk vcl/Library_vclplug_kde4.mk vcl/Module_vcl.mk vcl/Package_afmhash.mk vcl/Package_kde4moc.mk vcl/unx
Matus Kukan
mkukan at kemper.freedesktop.org
Sat Mar 31 13:51:09 PDT 2012
accessibility/CustomTarget_bridge.mk | 53 ++++++++++++++++
accessibility/CustomTarget_bridge_inc.mk | 41 ++++++++++++
accessibility/Jar_accessibility.mk | 5 -
accessibility/Library_java_uno_accessbridge.mk | 9 --
accessibility/Module_accessibility.mk | 4 -
accessibility/Package_bridge.mk | 32 ---------
accessibility/Package_bridge_inc.mk | 36 -----------
accessibility/bridge/Makefile | 52 ----------------
accessibility/bridge/source/java/Makefile | 43 -------------
clucene/CustomTarget_source.mk | 81 +++++++++++++++++++++++++
clucene/Library_clucene.mk | 6 -
clucene/Module_clucene.mk | 1
clucene/Package_source.mk | 20 ------
clucene/source/Makefile | 75 -----------------------
sal/CustomTarget_generated.mk | 77 +++++++++++++++++++++++
sal/Module_sal.mk | 1
sal/Package_generated.mk | 4 -
sal/util/Makefile | 72 ----------------------
solenv/gbuild/Executable.mk | 1
solenv/gbuild/Library.mk | 1
solenv/gbuild/LinkTarget.mk | 51 +++++----------
solenv/gbuild/StaticLibrary.mk | 1
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 8 +-
tools/CustomTarget_reversemap.mk | 37 +++++++++++
tools/Library_tl.mk | 4 -
tools/Module_tools.mk | 2
tools/Package_reversemap.mk | 34 ----------
tools/source/reversemap/Makefile | 33 ----------
vcl/CustomTarget_afm_hash.mk | 36 +++++++++++
vcl/CustomTarget_kde4_moc.mk | 38 +++++++++++
vcl/Library_vcl.mk | 8 --
vcl/Library_vclplug_kde4.mk | 7 --
vcl/Module_vcl.mk | 8 +-
vcl/Package_afmhash.mk | 30 ---------
vcl/Package_kde4moc.mk | 31 ---------
vcl/generic/fontmanager/Makefile | 32 ---------
vcl/unx/kde4/Makefile | 34 ----------
37 files changed, 408 insertions(+), 600 deletions(-)
New commits:
commit bd51ff439c6cecaefbd67c0871106a9bfdb13935
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Mar 30 12:40:06 2012 +0200
clucene: use CustomTarget makefile
diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk
new file mode 100644
index 0000000..f36f997
--- /dev/null
+++ b/clucene/CustomTarget_source.mk
@@ -0,0 +1,81 @@
+# -*- 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., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#
+# 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_CustomTarget_CustomTarget,clucene/source,new_style))
+
+CLSO := $(call gb_CustomTarget_get_workdir,clucene/source)
+
+$(call gb_CustomTarget_get_target,clucene/source) : $(CLSO)/done
+
+# FIXME: do not hardcode the path here
+ifeq ($(OS_FOR_BUILD),WNT)
+cl_FIXED_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+else
+cl_FIXED_TARFILE_LOCATION := $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+endif
+
+ifeq ($(OS),WNT)
+_CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/_clucene-config-MSVC.h
+ifeq ($(COM),MSC)
+CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/clucene-config-MSVC.h
+else
+CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/clucene-config-MINGW.h
+endif
+else
+CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/clucene-config-generic.h
+ifeq ($(OS),LINUX)
+_CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/_clucene-config-LINUX.h
+else
+_CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/_clucene-config-generic.h
+endif
+endif
+
+$(CLSO)/done : $(cl_FIXED_TARFILE_LOCATION) \
+ $(_CLUCENE_CONFIG_H) $(CLUCENE_CONFIG_H)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TAR,1)
+ $(call gb_Helper_abbreviate_dirs_native, \
+ mkdir -p $(dir $@) && cd $(dir $@) && \
+ $(GNUTAR) -x -z $(STRIP_COMPONENTS)=1 -f $< && \
+ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch && \
+ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-warnings.patch && \
+ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-gcc-atomics.patch && \
+ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.patch && \
+ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-narrowing-conversions.patch && \
+ for i in `find $(CLSO)/ -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done)
+ #FIXME ?, our rules expect .cxx
+ifneq ($(OS),WNT)
+ #dirent.h is a problem, move it around
+ mkdir -p $(CLSO)/inc/internal/CLucene/util
+ mv $(CLSO)/src/shared/CLucene/util/dirent.h $(CLSO)/inc/internal/CLucene/util
+endif
+ #To generate these, run cmake for each sufficiently different platform, customize and stick into configs
+ cp $(CLUCENE_CONFIG_H) $(CLSO)/src/shared/CLucene/clucene-config.h
+ cp $(_CLUCENE_CONFIG_H) $(CLSO)/src/shared/CLucene/_clucene-config.h
+ touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 2fe7c5f..2cc9520 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -48,12 +48,6 @@ $(eval $(call gb_Library_add_defs,clucene,\
$(LFS_CFLAGS) \
))
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_add_defs,clucene,\
- -DSYSTEM_ZLIB \
-))
-endif
-
# clucene does not depend on sal nor needs uwinapi here
$(eval $(call gb_Library_add_linked_libs,clucene,\
$(filter-out uwinapi,$(gb_STDLIBS)) \
diff --git a/clucene/Module_clucene.mk b/clucene/Module_clucene.mk
index 0eb7992..2a72ef8 100644
--- a/clucene/Module_clucene.mk
+++ b/clucene/Module_clucene.mk
@@ -28,6 +28,7 @@
$(eval $(call gb_Module_Module,clucene))
$(eval $(call gb_Module_add_targets,clucene,\
+ CustomTarget_source \
Library_clucene \
Package_source \
))
diff --git a/clucene/Package_source.mk b/clucene/Package_source.mk
index c1bf781..f6ebe3e 100644
--- a/clucene/Package_source.mk
+++ b/clucene/Package_source.mk
@@ -26,25 +26,9 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Package_Package,clucene_source,$(WORKDIR)/CustomTarget/clucene/source))
+$(eval $(call gb_Package_Package,clucene_source,$(call gb_CustomTarget_get_workdir,clucene/source)))
-$(eval $(call gb_Package_add_customtarget,clucene_source,clucene/source))
-
-$(eval $(call gb_CustomTarget_add_dependencies,clucene/source,\
- clucene/configs/_clucene-config-generic.h \
- clucene/configs/clucene-config-generic.h \
-))
-
-ifeq ($(OS_FOR_BUILD),WNT)
-FIXED_TARFILE_LOCATION=$(shell cygpath -u $(TARFILE_LOCATION))
-else
-FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
-endif
-
-# FIXME: do not hardcode the path here
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,clucene/source,\
- $(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz \
-))
+$(call gb_Package_get_preparation_target,clucene_source) : $(call gb_CustomTarget_get_target,clucene/source)
$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene.h,src/core/CLucene.h))
$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/clucene-config.h,src/shared/CLucene/clucene-config.h))
diff --git a/clucene/source/Makefile b/clucene/source/Makefile
deleted file mode 100644
index 500c3b9..0000000
--- a/clucene/source/Makefile
+++ /dev/null
@@ -1,75 +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., Caolán McNamara <caolanm at redhat.com>
-# (initial developer)
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-#
-# 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.
-
-gb_PARTIALBUILD := T
-include $(GBUILDDIR)/gbuild_simple.mk
-
-ifeq ($(OS_FOR_BUILD),WNT)
-FIXED_TARFILE_LOCATION=$(shell cygpath -u $(TARFILE_LOCATION))
-else
-FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
-endif
-
-done :
- mkdir -p $(dir $@)
- # FIXME: do not hardcode the path here
- $(GNUTAR) -x -z $(STRIP_COMPONENTS)=1 -f $(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
- $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch
- $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-warnings.patch
- $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-gcc-atomics.patch
- $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.patch
- $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-narrowing-conversions.patch
- #FIXME ?, our rules expect .cxx
- for i in `find . -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done
-ifneq ($(OS),WNT)
- #dirent.h is a problem, move it around
- mkdir -p inc/internal/CLucene/util
- mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util
-endif
- #To generate these, run cmake for each sufficiently different platform, customize and stick into configs
-ifeq ($(OS),WNT)
- cp $(SRCDIR)/clucene/configs/_clucene-config-MSVC.h src/shared/CLucene/_clucene-config.h
-ifeq ($(COM),MSC)
- cp $(SRCDIR)/clucene/configs/clucene-config-MSVC.h src/shared/CLucene/clucene-config.h
-else
- cp $(SRCDIR)/clucene/configs/clucene-config-MINGW.h src/shared/CLucene/clucene-config.h
-endif
-else
- cp $(SRCDIR)/clucene/configs/clucene-config-generic.h src/shared/CLucene/clucene-config.h
-ifeq ($(OS),LINUX)
- cp $(SRCDIR)/clucene/configs/_clucene-config-LINUX.h src/shared/CLucene/_clucene-config.h
-else
- cp $(SRCDIR)/clucene/configs/_clucene-config-generic.h src/shared/CLucene/_clucene-config.h
-endif
-endif
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : done
-
-# vim: set noet sw=4 ts=4:
commit 4b30d8addc4960c65ec5d2ce1633800190d7c067
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Mar 30 01:29:58 2012 +0200
tools: use CustomTarget makefile
diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
new file mode 100644
index 0000000..c15dc0e
--- /dev/null
+++ b/tools/CustomTarget_reversemap.mk
@@ -0,0 +1,37 @@
+# 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. 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.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
+#
+# 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_CustomTarget_CustomTarget,tools/reversemap,new_style))
+
+TLRM := $(call gb_CustomTarget_get_workdir,tools/reversemap)
+
+$(call gb_CustomTarget_get_target,tools/reversemap) : $(TLRM)/reversemap.hxx
+
+$(TLRM)/reversemap.hxx : $(call gb_Executable_get_target_for_build,bestreversemap) \
+ | $(TLRM)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
+ $(call gb_Helper_execute,bestreversemap > $@)
+
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 003f4bb..988f569 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -29,11 +29,11 @@
$(eval $(call gb_Library_Library,tl))
$(eval $(call gb_Library_add_package_headers,tl,tools_inc))
-$(eval $(call gb_Library_add_package_headers,tl,tools_reversemap))
+
+$(eval $(call gb_Library_add_custom_headers,tl,tools/reversemap))
$(eval $(call gb_Library_set_include,tl,\
-I$(SRCDIR)/tools/inc \
- -I$(WORKDIR)/CustomTarget/tools/source/reversemap \
$$(INCLUDE) \
))
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index 2feb922..7d8b523 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -30,9 +30,9 @@
$(eval $(call gb_Module_Module,tools))
$(eval $(call gb_Module_add_targets,tools,\
+ CustomTarget_reversemap \
Library_tl \
Package_inc \
- Package_reversemap \
StaticLibrary_ooopathutils \
))
diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk
deleted file mode 100644
index 513fc01..0000000
--- a/tools/Package_reversemap.mk
+++ /dev/null
@@ -1,34 +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. 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.
-#
-# The Initial Developer of the Original Code is
-# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-#
-# 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,tools_reversemap,$(WORKDIR)/CustomTarget/tools/source/reversemap))
-$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,tools/source/reversemap,\
- $(call gb_Executable_get_target_for_build,bestreversemap) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/tools/source/reversemap/Makefile b/tools/source/reversemap/Makefile
deleted file mode 100644
index 5b427a8..0000000
--- a/tools/source/reversemap/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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. 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.
-#
-# The Initial Developer of the Original Code is
-# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-#
-# 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.
-
-all : reversemap.hxx
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-reversemap.hxx : $(OUTDIR_FOR_BUILD)/bin/bestreversemap
- $(call gb_Helper_execute,bestreversemap > $@)
-
-# vim: set noet sw=4 ts=4:
commit 058723356da9988a5d8c3b9c8b693728c515d022
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Mar 28 21:37:06 2012 +0200
accessibility: use CustomTarget makefiles
diff --git a/accessibility/CustomTarget_bridge.mk b/accessibility/CustomTarget_bridge.mk
new file mode 100644
index 0000000..bc58988
--- /dev/null
+++ b/accessibility/CustomTarget_bridge.mk
@@ -0,0 +1,53 @@
+# -*- 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) 2011 Red Hat, Inc., David Tardon <dtardon at 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_CustomTarget_CustomTarget,accessibility/bridge,new_style))
+
+ACBR := $(call gb_CustomTarget_get_workdir,accessibility/bridge)
+
+$(call gb_CustomTarget_get_target,accessibility/bridge) : \
+ $(ACBR)/org/openoffice/java/accessibility/Build.java
+
+ifeq ($(PRODUCT),)
+ac_DEBUGSWITCH := true
+ac_PRODUCTSWITCH := false
+else
+ac_DEBUGSWITCH := false
+ac_PRODUCTSWITCH := true
+endif
+
+$(ACBR)/org/openoffice/java/accessibility/Build.java :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ mkdir -p $(dir $@) && (\
+ echo package org.openoffice.java.accessibility\; && \
+ echo public class Build \{ && \
+ echo public static final boolean DEBUG = $(ac_DEBUGSWITCH)\; && \
+ echo public static final boolean PRODUCT = $(ac_PRODUCTSWITCH)\; && \
+ echo \} \
+ ) > $@
+
+# vim: set ts=4 sw=4 et:
diff --git a/accessibility/CustomTarget_bridge_inc.mk b/accessibility/CustomTarget_bridge_inc.mk
new file mode 100644
index 0000000..d64b19b
--- /dev/null
+++ b/accessibility/CustomTarget_bridge_inc.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) 2011 Red Hat, Inc., David Tardon <dtardon at 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_CustomTarget_CustomTarget,accessibility/bridge/inc,new_style))
+
+ACBI := $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)
+
+$(call gb_CustomTarget_get_target,accessibility/bridge/inc) : \
+ $(ACBI)/WindowsAccessBridgeAdapter.h
+
+$(ACBI)/WindowsAccessBridgeAdapter.h :| $(ACBI)/.dir \
+ $(call gb_Jar_get_target,java_uno_accessbridge)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVH,1)
+ cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \
+ javah -classpath . -o $(call gb_Helper_convert_native,$@) org.openoffice.accessibility.WindowsAccessBridgeAdapter
+
+# vim: set ts=4 sw=4 et:
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
index bc68709..49f77a0 100644
--- a/accessibility/Jar_accessibility.mk
+++ b/accessibility/Jar_accessibility.mk
@@ -87,9 +87,4 @@ $(eval $(call gb_Jar_add_generated_sourcefiles,java_accessibility,\
CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \
))
-# Dummy dep. to satisfy make's depsolver: .../classes is created by a
-# custom target, so there is no dependency information for it here.
-# It also makes sure that the package is built before this jar .-)
-$(WORKDIR)/CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build.java :| $(call gb_Package_get_target,accessibility_bridge)
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk
index d6e008f..e03dd43 100644
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -27,14 +27,7 @@
$(eval $(call gb_Library_Library,java_uno_accessbridge))
-$(eval $(call gb_Library_add_package_headers,java_uno_accessbridge,\
- accessibility_bridge_inc \
-))
-
-$(eval $(call gb_Library_set_include,java_uno_accessbridge,\
- $$(INCLUDE) \
- -I$(WORKDIR)/CustomTarget/accessibility/bridge/inc \
-))
+$(eval $(call gb_Library_add_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
$(eval $(call gb_Library_add_api,java_uno_accessbridge,\
offapi \
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
index 04ce346..368973e 100644
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -35,11 +35,11 @@ $(eval $(call gb_Module_add_targets,accessibility,\
ifneq ($(SOLAR_JAVA),)
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,accessibility,\
+ CustomTarget_bridge \
+ CustomTarget_bridge_inc \
Jar_accessibility \
Jar_uno_accessbridge \
Library_java_uno_accessbridge \
- Package_bridge \
- Package_bridge_inc \
))
endif
endif
diff --git a/accessibility/Package_bridge.mk b/accessibility/Package_bridge.mk
deleted file mode 100644
index 44aa98f..0000000
--- a/accessibility/Package_bridge.mk
+++ /dev/null
@@ -1,32 +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) 2010 Red Hat, Inc., David Tardon <dtardon at 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,accessibility_bridge,$(WORKDIR)/CustomTarget/accessibility/bridge))
-
-$(eval $(call gb_Package_add_customtarget,accessibility_bridge,accessibility/bridge))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Package_bridge_inc.mk b/accessibility/Package_bridge_inc.mk
deleted file mode 100644
index 78fe99f..0000000
--- a/accessibility/Package_bridge_inc.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) 2010 Red Hat, Inc., David Tardon <dtardon at 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,accessibility_bridge_inc,$(WORKDIR)/CustomTarget/accessibility/bridge/inc))
-
-$(eval $(call gb_Package_add_customtarget,accessibility_bridge_inc,accessibility/bridge/source/java))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,accessibility/bridge/source/java,\
- $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/bridge/Makefile b/accessibility/bridge/Makefile
deleted file mode 100644
index 9ed435a..0000000
--- a/accessibility/bridge/Makefile
+++ /dev/null
@@ -1,52 +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) 2011 Red Hat, Inc., David Tardon <dtardon at 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.
-
-gb_PARTIALBUILD := T
-
-ifeq ($(PRODUCT),)
-DEBUGSWITCH := true
-PRODUCTSWITCH := false
-else
-DEBUGSWITCH := false
-PRODUCTSWITCH := true
-endif
-
-org/openoffice/java/accessibility/Build.java :
- mkdir -p $(dir $@) && (\
- echo package org.openoffice.java.accessibility\; && \
- echo public class Build \{ && \
- echo public static final boolean DEBUG = $(DEBUGSWITCH)\; && \
- echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; && \
- echo \} \
- ) > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : \
- org/openoffice/java/accessibility/Build.java
-
-# vim: set ts=4 sw=4 et:
diff --git a/accessibility/bridge/source/java/Makefile b/accessibility/bridge/source/java/Makefile
deleted file mode 100644
index b9d9e33..0000000
--- a/accessibility/bridge/source/java/Makefile
+++ /dev/null
@@ -1,43 +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) 2011 Red Hat, Inc., David Tardon <dtardon at 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.
-
-gb_PARTIALBUILD := T
-include $(GBUILDDIR)/gbuild.mk
-
-TARGETDIR := $(WORKDIR)/CustomTarget/accessibility/bridge/inc
-
-$(TARGETDIR)/WindowsAccessBridgeAdapter.h :
- mkdir -p $(dir $@) && \
- cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \
- javah -classpath . -o $(call gb_Helper_convert_native,$@) org.openoffice.accessibility.WindowsAccessBridgeAdapter
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : \
- $(TARGETDIR)/WindowsAccessBridgeAdapter.h
-
-# vim: set ts=4 sw=4 et:
commit 7b3f37f885a46e855f8cb16a4106e9c1fdd5c4fe
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Mar 28 19:45:12 2012 +0200
vcl: use CustomTarget makefiles
diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk
new file mode 100644
index 0000000..57ec6cc
--- /dev/null
+++ b/vcl/CustomTarget_afm_hash.mk
@@ -0,0 +1,36 @@
+# 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. 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.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Jan Holesovsky <kendy at suse.cz>
+#
+# 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_CustomTarget_CustomTarget,vcl/generic/fontmanager,new_style))
+
+VCFM := $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)
+
+$(call gb_CustomTarget_get_target,vcl/generic/fontmanager) : $(VCFM)/afm_hash.hpp
+
+$(VCFM)/afm_hash.hpp : $(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list | $(VCFM)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
+ $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e "s/(char\*)0/(char\*)0, NOPE/g" | grep -v "^#line" > $@
+
+# vim: set noet sw=4:
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
new file mode 100644
index 0000000..5d0e4b5
--- /dev/null
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -0,0 +1,38 @@
+# -*- 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) 2011 Red Hat, Inc., Caolán McNamara <caolanm at 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_CustomTarget_CustomTarget,vcl/unx/kde4,new_style))
+
+VCKM := $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)
+
+$(call gb_CustomTarget_get_target,vcl/unx/kde4) : $(VCKM)/KDEXLib.moc
+
+$(VCKM)/KDEXLib.moc : $(SRCDIR)/vcl/unx/kde4/KDEXLib.hxx | $(VCKM)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
+ $(MOC4) $< -o $@
+
+# vim: set noet sw=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b886389..730fdd5 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -43,14 +43,13 @@ $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
endif
$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
-$(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash))
+
+$(eval $(call gb_Library_add_custom_headers,vcl,vcl/generic/fontmanager))
$(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
- -I$(SRCDIR)/solenv/inc \
$(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \
- -I$(WORKDIR)/CustomTarget/vcl/generic/fontmanager \
))
$(eval $(call gb_Library_add_defs,vcl,\
@@ -451,9 +450,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
endif
ifeq ($(GUIBASE),headless)
-$(eval $(call gb_Library_add_cxxflags,vcl,\
- $$(FREETYPE_CFLAGS) \
-))
$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 9d8dfb3..9c47d1f 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -28,13 +28,11 @@
$(eval $(call gb_Library_Library,vclplug_kde4))
-$(eval $(call gb_Library_add_package_headers,vcl,vcl_kde4moc))
+$(eval $(call gb_Library_add_custom_headers,vclplug_kde4,vcl/unx/kde4))
$(eval $(call gb_Library_set_include,vclplug_kde4,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
- -I$(SRCDIR)/solenv/inc \
- -I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \
))
$(eval $(call gb_Library_set_include,vclplug_kde4,\
@@ -95,10 +93,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Library_add_cxxflags,vclplug_kde4,\
- -Wno-shadow \
+ -Wno-shadow \
))
-
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
dl \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index dfd0e34..dcde2a6 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -30,11 +30,11 @@
$(eval $(call gb_Module_Module,vcl))
$(eval $(call gb_Module_add_targets,vcl,\
+ AllLangResTarget_vcl \
+ CustomTarget_afm_hash \
Library_vcl \
- StaticLibrary_vclmain \
Package_inc \
- Package_afmhash \
- AllLangResTarget_vcl \
+ StaticLibrary_vclmain \
))
ifeq ($(GUIBASE),unx)
@@ -62,8 +62,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
endif
ifneq ($(ENABLE_KDE4),)
$(eval $(call gb_Module_add_targets,vcl,\
+ CustomTarget_kde4_moc \
Library_vclplug_kde4 \
- Package_kde4moc \
))
endif
endif
diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk
deleted file mode 100644
index 2aa384b..0000000
--- a/vcl/Package_afmhash.mk
+++ /dev/null
@@ -1,30 +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. 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.
-#
-# The Initial Developer of the Original Code is
-# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Jan Holesovsky <kendy at suse.cz>
-#
-# 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,vcl_afmhash,$(WORKDIR)/CustomTarget/vcl/generic/fontmanager))
-$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/generic/fontmanager))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Package_kde4moc.mk b/vcl/Package_kde4moc.mk
deleted file mode 100644
index 6924aa0..0000000
--- a/vcl/Package_kde4moc.mk
+++ /dev/null
@@ -1,31 +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) 2011 Red Hat, Inc., Caolán McNamara <caolanm at 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,vcl_kde4moc,$(WORKDIR)/CustomTarget/vcl/unx/kde4))
-$(eval $(call gb_Package_add_customtarget,vcl_kde4moc,vcl/unx/kde4))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/generic/fontmanager/Makefile b/vcl/generic/fontmanager/Makefile
deleted file mode 100644
index 7fb7b03..0000000
--- a/vcl/generic/fontmanager/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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. 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.
-#
-# The Initial Developer of the Original Code is
-# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Jan Holesovsky <kendy at suse.cz>
-#
-# 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.
-
-all : afm_hash.hpp
-
-afm_hash.hpp : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/afm_keyword_list
- $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e "s/(char\*)0/(char\*)0, NOPE/g" | grep -v "^#line" > $@
-
-.PHONY : all
-# vim: set noet sw=4:
diff --git a/vcl/unx/kde4/Makefile b/vcl/unx/kde4/Makefile
deleted file mode 100644
index 88cda66..0000000
--- a/vcl/unx/kde4/Makefile
+++ /dev/null
@@ -1,34 +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) 2011 Red Hat, Inc., Caolán McNamara <caolanm at 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.
-
-KDEXLib.cxx : KDEXLib.moc
-
-KDEXLib.moc : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/KDEXLib.hxx
- $(MOC4) $< -o $@
-
-.PHONY : all
-# vim: set noet sw=4:
commit afd5eb1f04971edb083e47a2f9c2e9d77c9737c9
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Mar 28 12:27:45 2012 +0200
sal: use CustomTarget makefile
diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
new file mode 100644
index 0000000..a70acd3
--- /dev/null
+++ b/sal/CustomTarget_generated.mk
@@ -0,0 +1,77 @@
+# -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan at gmail.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_CustomTarget_CustomTarget,sal/generated,new_style))
+
+SAUT := $(call gb_CustomTarget_get_workdir,sal/generated)
+
+$(call gb_CustomTarget_get_target,sal/generated) : \
+ $(SAUT)/rtlbootstrap.mk $(SAUT)/sal/udkversion.h \
+ $(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h)
+
+$(SAUT)/rtlbootstrap.mk : $(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h) | $(SAUT)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)
+ $(call gb_Helper_abbreviate_dirs_native, \
+ (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(SAUT)/bootstrap.cxx && \
+ $(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I$(SAUT) -I$(SRCDIR)/sal/rtl/source \
+ -I$(SRCDIR)/sal/inc $(SAUT)/bootstrap.cxx > $@.tmp && \
+ cat $@.tmp | grep '^RTL_' | sed -e 's/"//g' > $@ && \
+ rm $(SAUT)/bootstrap.cxx $@.tmp)
+
+$(SAUT)/sal/typesizes.h :| $(SAUT)/sal/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ echo '/* This file is autogenerated from configure script data */' > $@
+ echo >> $@
+ echo "#define SAL_TYPES_ALIGNMENT2 $(ALIGNOF_SHORT)" >> $@
+ echo "#define SAL_TYPES_ALIGNMENT4 $(ALIGNOF_INT)" >> $@
+ifeq ($(SIZEOF_LONG),8)
+ echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_LONG)" >> $@
+else ifeq ($(SIZEOF_DOUBLE),8)
+ echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_DOUBLE)" >> $@
+else
+ echo "#error alignment of some 8-byte type unknown" >> $@
+endif
+ echo "#define SAL_TYPES_SIZEOFSHORT $(SIZEOF_SHORT)" >> $@
+ echo "#define SAL_TYPES_SIZEOFINT $(SIZEOF_INT)" >> $@
+ echo "#define SAL_TYPES_SIZEOFLONG $(SIZEOF_LONG)" >> $@
+ echo "#define SAL_TYPES_SIZEOFLONGLONG $(SIZEOF_LONGLONG)" >> $@
+ echo "#define SAL_TYPES_SIZEOFPOINTER $(SIZEOF_POINTER)" >> $@
+
+include $(SRCDIR)/solenv/inc/udkversion.mk
+
+$(SAUT)/sal/udkversion.h :| $(SAUT)/sal/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ echo '#ifndef _SAL_UDKVERSION_H_' > $@
+ echo '#define _SAL_UDKVERSION_H_' >> $@
+ echo '' >> $@
+ echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@
+ echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@
+ echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
+ echo '' >> $@
+ echo '#endif' >> $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index e705122..4bf0ec8 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -29,6 +29,7 @@
$(eval $(call gb_Module_Module,sal))
$(eval $(call gb_Module_add_targets,sal,\
+ CustomTarget_generated \
$(if $(filter $(OS),IOS),, \
Executable_osl_process_child) \
Executable_cppunittester \
diff --git a/sal/Package_generated.mk b/sal/Package_generated.mk
index 6c946ff..719e97c 100644
--- a/sal/Package_generated.mk
+++ b/sal/Package_generated.mk
@@ -25,9 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Package_Package,sal_generated,$(WORKDIR)/CustomTarget/sal/util))
-
-$(eval $(call gb_Package_add_customtarget,sal_generated,sal/util))
+$(eval $(call gb_Package_Package,sal_generated,$(call gb_CustomTarget_get_workdir,sal/generated)))
$(eval $(call gb_Package_add_file,sal_generated,inc/rtlbootstrap.mk,rtlbootstrap.mk))
$(eval $(call gb_Package_add_file,sal_generated,inc/sal/udkversion.h,sal/udkversion.h))
diff --git a/sal/util/Makefile b/sal/util/Makefile
deleted file mode 100644
index 87b3e29..0000000
--- a/sal/util/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
-
-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild_simple.mk
-
-all: rtlbootstrap.mk $(if $(filter-out $(COM),MSC),sal/typesizes.h) sal/udkversion.h sal
-
-sal:
- mkdir sal
-
-rtlbootstrap.mk: sal/typesizes.h
- (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > bootstrap.cxx
- $(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I. -I$(SRCDIR)/sal/rtl/source -I$(SRCDIR)/sal/inc bootstrap.cxx | grep '^RTL_' | sed -e 's/"//g' > $@
-
-sal/typesizes.h: sal
- echo '/* This file is autogenerated from configure script data */' > $@
- echo >> $@
- echo "#define SAL_TYPES_ALIGNMENT2 $(ALIGNOF_SHORT)" >> $@
- echo "#define SAL_TYPES_ALIGNMENT4 $(ALIGNOF_INT)" >> $@
-ifeq ($(SIZEOF_LONG),8)
- echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_LONG)" >> $@
-else ifeq ($(SIZEOF_DOUBLE),8)
- echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_DOUBLE)" >> $@
-else
- echo "#error alignment of some 8-byte type unknown" >> $@
-endif
- echo "#define SAL_TYPES_SIZEOFSHORT $(SIZEOF_SHORT)" >> $@
- echo "#define SAL_TYPES_SIZEOFINT $(SIZEOF_INT)" >> $@
- echo "#define SAL_TYPES_SIZEOFLONG $(SIZEOF_LONG)" >> $@
- echo "#define SAL_TYPES_SIZEOFLONGLONG $(SIZEOF_LONGLONG)" >> $@
- echo "#define SAL_TYPES_SIZEOFPOINTER $(SIZEOF_POINTER)" >> $@
-
-include $(SRCDIR)/solenv/inc/udkversion.mk
-
-sal/udkversion.h: sal
- echo '#ifndef _SAL_UDKVERSION_H_' > $@
- echo '#define _SAL_UDKVERSION_H_' >> $@
- echo '' >> $@
- echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@
- echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@
- echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
- echo '' >> $@
- echo '#endif' >> $@
-
-.DEFAULT_GOAL := all
-.PHONY: all
-# vim: set noet sw=4 ts=4:
commit 776cb1beac9d1416e4c7a6758b6eb872c995b895
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Mar 31 20:22:14 2012 +0200
gbuild: do not let generated source files depend on headers
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 11eeb02..ba3ea56 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -745,7 +745,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2)
$(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2))
-$(call gb_GenCObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3)
$(call gb_GenCObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
@@ -762,7 +762,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
-$(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
$(call gb_GenCxxObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
commit c6bf4fd4af60d7a24d77a90e021555d18faa563c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Mar 31 00:52:25 2012 +0200
gbuild: add gb_LinkTarget_add_custom_headers
to be used for generated headers which are not delivered to solver.
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 90d1f09..8a7fc26 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -109,6 +109,7 @@ $(eval $(foreach method,\
add_linked_static_libs \
use_external \
use_externals \
+ add_custom_headers \
add_package_headers \
add_sdi_headers \
add_nativeres \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index b7df1f4..2200add 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -185,6 +185,7 @@ $(eval $(foreach method,\
add_linked_static_libs \
use_external \
use_externals \
+ add_custom_headers \
add_external_headers \
add_package_headers \
add_sdi_headers \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index ccd098b..11eeb02 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -900,6 +900,17 @@ $(2) :| $(call gb_LinkTarget_get_external_headers_target,$(1))
endef
+define gb_LinkTarget_add_custom_headers
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2))
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2))
+endif
+$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_CustomTarget_get_target,$(2)))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
+
+endef
+
define gb_LinkTarget_add_package_headers
$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package))))
$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package)))
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 888918c..2058839 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -111,6 +111,7 @@ $(eval $(foreach method,\
add_linked_static_libs \
use_external \
use_externals \
+ add_custom_headers \
add_package_headers \
add_sdi_headers \
set_warnings_not_errors \
commit 0a5c0806ee447e61171100c4432bb7931d8757b0
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Mar 30 13:14:36 2012 +0200
gbuild: add comments, fix order to be more readable
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 4ec9a80..90fca91 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -232,7 +232,7 @@ gb_COMPILERNOOPTFLAGS := -Od
ifeq ($(gb_FULLDEPS),$(true))
gb_COMPILERDEPFLAGS := -showIncludes
define gb_create_deps
-| $(GBUILDDIR)/filter-showIncludes.pl $(2) $(1) $(3); exit $${PIPESTATUS[0]}
+| $(GBUILDDIR)/filter-showIncludes.pl $(1) $(2) $(3); exit $${PIPESTATUS[0]}
endef
else
gb_COMPILERDEPFLAGS :=
@@ -279,6 +279,7 @@ endef
# CObject class
+# $(call gb_CObject__command,object,relative-source,source,dep-file)
define gb_CObject__command
$(call gb_Output_announce,$(2).c,$(true),C ,3)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -292,12 +293,13 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(INCLUDE) \
-c $(3) \
- -Fo$(1)) $(call gb_create_deps,$(1),$(4),$(3))
+ -Fo$(1)) $(call gb_create_deps,$(4),$(1),$(3))
endef
# CxxObject class
+# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
define gb_CxxObject__command
$(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -312,7 +314,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(INCLUDE_STL) $(INCLUDE) \
$(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \
-c $(3) \
- -Fo$(1)) $(call gb_create_deps,$(1),$(4),$(3))
+ -Fo$(1)) $(call gb_create_deps,$(4),$(1),$(3))
endef
commit a4e2453b42b54ba904c1ee8ad07e26f1e6d939e5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Mar 30 12:41:21 2012 +0200
gbuild: gb_Object__command_dep should be used here and a little cleanup
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 80c24ba..ccd098b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -123,8 +123,6 @@ $(call gb_CObject_get_dep_target,%) : $(call gb_CObject_get_target,%)
endif
-gb_CObject_CObject =
-
# CxxObject class
@@ -142,8 +140,6 @@ $(call gb_CxxObject_get_dep_target,%) : $(call gb_CxxObject_get_target,%)
endif
-gb_CxxObject_CxxObject =
-
# GenCObject class
@@ -162,8 +158,6 @@ $(call gb_GenCObject_get_dep_target,%) : $(call gb_GenCObject_get_target,%)
endif
-gb_GenCObject_GenCObject =
-
# GenCxxObject class
@@ -182,7 +176,6 @@ $(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%)
endif
-gb_GenCxxObject_GenCxxObject =
# YaccTarget class
@@ -192,6 +185,8 @@ gb_GenCxxObject_GenCxxObject =
# tries to use it.
gb_YaccTarget_get_source = $(1)/$(2).y
+# defined by platform
+# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, include-target)
.PHONY : $(call gb_YaccTarget_get_clean_target,%)
$(call gb_YaccTarget_get_clean_target,%) :
@@ -210,9 +205,6 @@ endef
gb_YACC := bison
-# YaccTarget class
-# defined by platform
-# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, include-target)
# ObjCxxObject class
#
@@ -231,7 +223,6 @@ $(call gb_ObjCxxObject_get_dep_target,%) : $(call gb_ObjCxxObject_get_target,%)
endif
-gb_ObjCxxObject_ObjCxxObject =
# ObjCObject class
#
@@ -240,30 +231,15 @@ gb_ObjCObject_get_source = $(1)/$(2).m
# defined by platform
# gb_ObjCObject__command
-# this rule generates an "always rebuild" dep file, to have something to include.
-# the dep file will be overridden on the fly, when the object is compiled
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_ObjCObject__command_dep
-mkdir -p $(dir $(1)) && \
- echo '$(call gb_ObjCObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_ObjCObject__command_dep =
-endif
-
$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
- $(call gb_ObjCObject__command,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
+ $(call gb_ObjCObject__command,$@,$*,$<)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
- $(call gb_ObjCObject__command_dep,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
+$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%)
+ $(call gb_Object__command_dep,$@,$(call gb_ObjCObject_get_target,$*))
endif
-gb_ObjCObject_ObjCObject =
-
-
# AsmObject class
@@ -281,8 +257,6 @@ $(call gb_AsmObject_get_dep_target,%) : $(call gb_AsmObject_get_target,%)
endif
-gb_AsmObject_AsmObject =
-
# LinkTarget class
More information about the Libreoffice-commits
mailing list