You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 01:06:16 UTC
svn commit: r1409589 - in /incubator/ooo/branches/gbuild/main/solenv/gbuild:
LinkTarget.mk TargetLocations.mk platform/linux.mk platform/macosx.mk
platform/solaris.mk platform/windows.mk platform/winmingw.mk
Author: arist
Date: Thu Nov 15 00:06:15 2012
New Revision: 1409589
URL: http://svn.apache.org/viewvc?rev=1409589&view=rev
Log:
gnumake4_135_7bc9148e9497.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1302888427 0
# Node ID 7bc9148e9497d03b14da2ccaeb255ea53303442b
# Parent f2c9915819e2f9178241caefd4091fa132f03b62
gnumake4: #i117845#: LinkTarget.mk: fix dep-files for GenCxxObjects:
pass the dep-file target explicitly as a parameter to the Object__commands.
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk?rev=1409589&r1=1409588&r2=1409589&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk Thu Nov 15 00:06:15 2012
@@ -62,7 +62,7 @@ endif
define gb_CObject__rules
$$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
- $$(call gb_CObject__command,$$@,$$*,$$<)
+ $$(call gb_CObject__command,$$@,$$*,$$<,$$(call gb_CObject_get_dep_target,$$*))
ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_source,$(1),%)
@@ -131,7 +131,7 @@ endef
define gb_CxxObject__rules
$$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
$$(eval $$(gb_CxxObject__set_pchflags))
- $$(call gb_CxxObject__command,$$@,$$*,$$<)
+ $$(call gb_CxxObject__command,$$@,$$*,$$<,$$(call gb_CxxObject_get_dep_target,$$*))
ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
@@ -171,7 +171,7 @@ gb_GenCxxObject__command_dep =
endif
$(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
- $(call gb_CxxObject__command,$@,$*,$<)
+ $(call gb_CxxObject__command,$@,$*,$<,$(call gb_GenCxxObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_source,%)
@@ -206,7 +206,7 @@ endif
define gb_ObjCxxObject__rules
$$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
- $$(call gb_ObjCxxObject__command,$$@,$$*,$$<)
+ $$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(call gb_ObjCxxObject_get_dep_target,$$*))
ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk?rev=1409589&r1=1409588&r2=1409589&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk Thu Nov 15 00:06:15 2012
@@ -140,13 +140,12 @@ $(eval $(call gb_Helper_make_dep_targets
CObject \
CxxObject \
ObjCxxObject \
+ GenCxxObject \
LinkTarget \
SrsPartTarget \
SrsTarget \
UnoApiTarget \
))
-# needs to use same dep target because we use gb_CxxObject__command
-gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)
# other getters
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409589&r1=1409588&r2=1409589&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Thu Nov 15 00:06:15 2012
@@ -160,18 +160,18 @@ endef
# CObject class
+# $(call gb_CObject__command,object,relative-source,source,dep-file)
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CObject_get_target,$(2)) \
- -MF $(call gb_CObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -185,18 +185,18 @@ endef
# CxxObject class
+# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
- -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk?rev=1409589&r1=1409588&r2=1409589&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk Thu Nov 15 00:06:15 2012
@@ -160,15 +160,14 @@ endef
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CObject_get_target,$(2)) \
- -MF $(call gb_CObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -180,15 +179,14 @@ endef
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
- -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
@@ -199,15 +197,14 @@ endef
define gb_ObjCxxObject__command
$(call gb_Output_announce,$(2),$(true),OCX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_OBJCXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
- -MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk?rev=1409589&r1=1409588&r2=1409589&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk Thu Nov 15 00:06:15 2012
@@ -147,14 +147,13 @@ endef
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- rm -f $(call gb_CObject_get_dep_target,$(2)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ rm -f $(4) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
-c $(3) \
-o $(1) \
-xMMD \
- -xMF $(call gb_CObject_get_dep_target,$(2)) \
+ -xMF $(4) \
$(DEFS) \
$(T_CFLAGS) \
-I$(dir $(3)) \
@@ -167,15 +166,14 @@ endef
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-xMMD \
- -xMF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -xMF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409589&r1=1409588&r2=1409589&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Thu Nov 15 00:06:15 2012
@@ -252,7 +252,7 @@ endef
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
$(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
@@ -266,10 +266,10 @@ $(call gb_Helper_abbreviate_dirs_native,
-v WORKDIR=$(WORKDIR)/ \
-v SRCDIR=$(SRCDIR)/ \
-v REPODIR=$(REPODIR)/ \
- > $(call gb_CObject_get_dep_target,$(2)))
+ > $(2))
endef
else
-CObject__command_deponcompile =
+gb_Object__command_deponcompile =
endif
define gb_CObject__command
@@ -286,33 +286,12 @@ $(call gb_Helper_abbreviate_dirs_native,
$(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
# CxxObject class
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
- $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
- -I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME)%,$(6)) \
- $(3) \
- -f - \
- | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
- -v OBJECTFILE=$(1) \
- -v OUTDIR=$(OUTDIR)/ \
- -v WORKDIR=$(WORKDIR)/ \
- -v SRCDIR=$(SRCDIR)/ \
- -v REPODIR=$(REPODIR)/ \
- > $(call gb_CxxObject_get_dep_target,$(2)))
- endef
-else
-gb_CxxObject__command_deponcompile =
-endif
-
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -327,7 +306,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(INCLUDE_STL) $(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409589&r1=1409588&r2=1409589&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Thu Nov 15 00:06:15 2012
@@ -222,7 +222,7 @@ endef
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
$(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
@@ -236,10 +236,10 @@ $(call gb_Helper_abbreviate_dirs_native,
-v WORKDIR=$(WORKDIR)/ \
-v SRCDIR=$(SRCDIR)/ \
-v REPODIR=$(REPODIR)/ \
- > $(call gb_CObject_get_dep_target,$(2)))
+ > $(2))
endef
else
-CObject__command_deponcompile =
+gb_Object__command_deponcompile =
endif
define gb_CObject__command
@@ -253,34 +253,13 @@ $(call gb_Helper_abbreviate_dirs_native,
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
# CxxObject class
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
- $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
- -I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
- $(3) \
- -f - \
- | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
- -v OBJECTFILE=$(1) \
- -v OUTDIR=$(OUTDIR)/ \
- -v WORKDIR=$(WORKDIR)/ \
- -v SRCDIR=$(SRCDIR)/ \
- -v REPODIR=$(REPODIR)/ \
- > $(call gb_CxxObject_get_dep_target,$(2)))
-endef
-else
-gb_CxxObject__command_deponcompile =
-endif
-
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -292,7 +271,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
endef