[Libreoffice-commits] .: Branch 'feature/gnumake4' - 9 commits - Module_ooo.mk RepositoryExternal.mk RepositoryFixes.mk Repository.mk solenv/gbuild

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Fri Jun 17 09:05:47 PDT 2011 

 Module_ooo.mk                      |    1 
 Repository.mk                      |   19 ++++++
 RepositoryExternal.mk              |   48 ++++++++++++++++
 RepositoryFixes.mk                 |    9 +++
 solenv/gbuild/CppunitTest.mk       |    3 +
 solenv/gbuild/LinkTarget.mk        |  107 ++++++++++++-------------------------
 solenv/gbuild/TargetLocations.mk   |    3 -
 solenv/gbuild/gbuild.mk            |    3 +
 solenv/gbuild/gbuild_simple.mk     |   58 ++++++++++++++++++++
 solenv/gbuild/platform/linux.mk    |   16 ++---
 solenv/gbuild/platform/macosx.mk   |   21 +++----
 solenv/gbuild/platform/solaris.mk  |   15 ++---
 solenv/gbuild/platform/windows.mk  |    3 -
 solenv/gbuild/platform/winmingw.mk |   31 +---------
 14 files changed, 211 insertions(+), 126 deletions(-)

New commits:
commit 423569dc381b4ccb0b035d01e03d757aa0482ad2
Author: Michael Stahl <mst at openoffice.org>
Date:   Mon Apr 18 11:13:57 2011 +0000

    gnumake4: #i117610#: move openssl to RepositoryExternal.mk [hg:8df80965ae98]

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6c14015..8ba5fee 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -312,4 +312,52 @@ endef
 
 endif # SYSTEM_ICU
 
+
+ifeq ($(SYSTEM_OPENSSL),YES)
+
+define gb_LinkTarget__use_openssl
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(OPENSSL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
+endef
+
+else # !SYSTEM_OPENSSL
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    crypto \
+    ssl \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    crypto \
+    ssl \
+))
+endif
+
+define gb_LinkTarget__use_openssl
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	crypto \
+	ssl \
+)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	crypto \
+	ssl \
+)
+ifeq ($(OS),SOLARIS)
+$(call gb_LinkTarget_add_libs,$(1),\
+	-lnsl \
+	-lsocket \
+)
+endif
+endif
+endef
+
+endif # SYSTEM_OPENSSL
+
+
 # vim: set noet sw=4 ts=4:
commit 27037dbb8c07d25346a13ce1ab90145be383ca08
Author: Michael Stahl <mst at openoffice.org>
Date:   Mon Apr 18 11:13:56 2011 +0000

    gnumake4: #i117845#: LinkTarget.mk: remove debug stuff [hg:22467b40e637]

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 03dc413..7af9035 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -237,9 +237,7 @@ define gb_LinkTarget__command_dep
 $(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
-	echo '$$(info ************** THIS IS LIBTARGET.d *********)'> /tmp/hack && \
     RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-				 /tmp/hack \
         $(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \
         $(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \
         $(foreach object,$(5),$(call gb_ObjCxxObject_get_dep_target,$(object)))\
commit 2216dc0e858ad70dfc125387e6890ec5ea48e41c
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 15 17:27:07 2011 +0000

    gnumake4: #i117845#: LinkTarget.mk: refactor dep-files: [hg:371ab623e90d]
    
    introduce dependency from object dep-file to object.
    consolidate commands into gb_Object__command_dep.
    remove error rule for GenCxxObject which never worked anyway.
    use -include for the dep file: the makefile dependency does not work anyway.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index ce1d711..03dc413 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -44,33 +44,41 @@ OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 endif
 
 
-# CObject class
-
-gb_CObject_REPOS := $(gb_REPOS)
-
-gb_CObject_get_source = $(1)/$(2).c
-# defined by platform
-#  gb_CObject__command
+# For every object there is a dep file (if gb_FULLDEPS is active).
+# The dep file depends on the object: the Object__command also updates the
+# dep file as a side effect.
+# In the dep file rule just touch it so it's newer than the object.
 
-# 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
+# The gb_Object__command_dep generates an "always rebuild" dep file;
+# It is _only_ used in case the user deletes the object dep file.
 ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_dep
+define gb_Object__command_dep
 mkdir -p $(dir $(1)) && \
-    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+	echo '$(2) : $$(gb_Helper_PHONY)' > $(1)
 
 endef
 else
-gb_CObject__command_dep =
+gb_Object__command_dep = \
+ $(call gb_Output_error,gb_Object__command_dep is only for gb_FULLDEPS)
 endif
 
+
+# CObject class
+
+gb_CObject_REPOS := $(gb_REPOS)
+
+gb_CObject_get_source = $(1)/$(2).c
+# defined by platform
+#  gb_CObject__command
+
 define gb_CObject__rules
 $$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
 	$$(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),%)
-	$$(call gb_CObject__command_dep,$$@,$$*,$$<)
+$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_target,%)
+	$$(if $$(wildcard $$@),touch $$@,\
+	  $$(call gb_Object__command_dep,$$@,$$(call gb_CObject_get_target,$$*)))
 endif
 
 endef
@@ -91,19 +99,6 @@ gb_CxxObject_get_source = $(1)/$(2).cxx
 # defined by platform
 #  gb_CxxObject__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_CxxObject__command_dep
-mkdir -p $(dir $(1)) && \
-    echo '$(call gb_CxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_CxxObject__command_dep =
-endif
-
 # Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
 # are the same as the T_CXXFLAGS and DEFS we want to use for this object. This
 # should usually be the case.  The DEFS/T_CXXFLAGS would have too be manually
@@ -138,9 +133,10 @@ $$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
 	$$(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),%)
-    $$(eval $$(gb_CxxObject__set_pchflags))
-    $$(call gb_CxxObject__command_dep,$$@,$$*,$$<)
+$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_target,%)
+	$$(if $$(wildcard $$@),touch $$@,\
+	  $$(eval $$(gb_CxxObject__set_pchflags))\
+	  $$(call gb_Object__command_dep,$$@,$$(call gb_CxxObject_get_target,$$*)))
 endif
 
 endef
@@ -162,27 +158,13 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx
 # defined by platform
 #  gb_CxxObject__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_GenCxxObject__command_dep
-mkdir -p $(dir $(1)) && \
-    echo '$(call gb_GenCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-endef
-else
-gb_GenCxxObject__command_dep =
-endif
-
 $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
 	$(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,%)
-    $(call gb_GenCxxObject__command_dep,$@,$*,$<)
-
-$(call gb_GenCxxObject_get_dep_target,%) :
-    $(eval $(call gb_Output_error,Unable to find generated C++ file $(call gb_GenCxxObject_get_source,$*) in WORKDIR.))
+$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%)
+	$(if $(wildcard $@),touch $@,\
+	  $(call gb_Object__command_dep,$@,$(call gb_GenCxxObject_get_target,$*)))
 endif
 
 gb_GenCxxObject_GenCxxObject =
@@ -196,25 +178,14 @@ gb_ObjCxxObject_get_source = $(1)/$(2).mm
 # defined by platform
 #  gb_ObjCxxObject__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_ObjCxxObject__command_dep
-mkdir -p $(dir $(1)) && \
-    echo '$(call gb_ObjCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_ObjCxxObject__command_dep =
-endif
-
 define gb_ObjCxxObject__rules
 $$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
 	$$(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),%)
-	$$(call gb_ObjCxxObject__command_dep,$$@,$$*,$$<)
+$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_target,%)
+	$$(if $$(wildcard $$@),touch $$@,\
+	  $$(call gb_Object__command_dep,$$@,$$(call gb_ObjCxxObject_get_target,$$*)))
 endif
 
 endef
@@ -266,7 +237,9 @@ define gb_LinkTarget__command_dep
 $(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
+	echo '$$(info ************** THIS IS LIBTARGET.d *********)'> /tmp/hack && \
     RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+				 /tmp/hack \
         $(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \
         $(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \
         $(foreach object,$(5),$(call gb_ObjCxxObject_get_dep_target,$(object)))\
@@ -388,11 +361,7 @@ $(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
 $(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
 
 ifeq ($(gb_FULLDEPS),$(true))
-ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),)
-include $(call gb_LinkTarget_get_dep_target,$(1))
-else
-$(firstword $(MAKEFILE_LIST)) : $(call gb_LinkTarget_get_dep_target,$(1))
-endif
+-include $(call gb_LinkTarget_get_dep_target,$(1))
 $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := 
 $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := 
 $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
commit 0ad0ad30f41bffc1ab88d25415fbac79aadf1e8a
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 15 17:27:07 2011 +0000

    gnumake4: #i117845#: LinkTarget.mk: fix dep-files for GenCxxObjects: [hg:7bc9148e9497]
    
    pass the dep-file target explicitly as a parameter to the Object__commands.
    fixes the bug that for GenCxxObjects the dep-file of CxxObject is written.
    remove some duplication in windows.mk/winmingw.mk.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 177b7d3..ce1d711 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -66,7 +66,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),%)
@@ -135,7 +135,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),%)
@@ -175,7 +175,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,%)
@@ -210,7 +210,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),%)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 67faa61..db16663 100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -137,12 +137,11 @@ $(eval $(call gb_Helper_make_dep_targets,\
     CObject \
     CxxObject \
     ObjCxxObject \
+	GenCxxObject \
     LinkTarget \
     SrsPartTarget \
     SrsTarget \
 ))
-# needs to use same dep target because we use gb_CxxObject__command
-gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)
 
 # other getters
 
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 2264e4c..ece1a10 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -164,18 +164,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
@@ -183,18 +183,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
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4642d3a..6d9f380 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -157,15 +157,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
@@ -177,15 +176,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
@@ -196,15 +194,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
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 295de89..0638603 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -144,14 +144,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)) \
@@ -164,15 +163,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
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d4c8694..8e5e0f9 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -319,7 +319,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
 
 
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 313405c..025a9d2 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -213,7 +213,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) \
@@ -227,10 +227,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
@@ -244,34 +244,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,\
@@ -283,7 +262,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
 
 
commit 1e6b6e27dac8a1eaa588e440a1ea1ff083b4b683
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 15 17:27:06 2011 +0000

    gnumake4: oox, writerfilter, CppunitTest.mk: adapt to changes in gnumake4 [hg:d0e98479a69a]

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 531da95..d5c16e6 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -59,8 +59,7 @@ endef
 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
-$(call gb_LinkTarget_set_defs,$(2),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_CppunitTest_DEFS) \
 )
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
commit 34ca72300b72864634e811be8c02e7fe5849f02f
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 15 12:55:25 2011 +0000

    writerfilter10: merge DEV300_m106 [hg:abb16aec07d4]

diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 49bff87..295de89 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -263,6 +263,7 @@ gb_Library_PLAINLIBS_NONE += \
     dl \
     freetype \
 	jpeg \
+	m \
 	nsl \
     pthread \
 	socket \
commit 96ceba9b2607c24e1c413bfa1ddbfe8abe8486c3
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date:   Tue Apr 5 11:09:42 2011 +0200

    writerfilter10: make CppunitTest run for wntmsci12 [hg:73b123a33920]

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1a18a39..531da95 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -59,6 +59,10 @@ endef
 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
+$(call gb_LinkTarget_set_defs,$(2),\
+	$$(DEFS) \
+	$(gb_CppunitTest_DEFS) \
+)
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
new file mode 100644
index 0000000..e7735d3
--- /dev/null
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# this is a subset of gbuild functionality, for use in custom makefiles
+
+include $(GBUILDDIR)/Output.mk
+
+# BuildDirs uses the Output functions already
+include $(GBUILDDIR)/BuildDirs.mk
+
+include $(GBUILDDIR)/Helper.mk
+
+ifeq ($(OS),LINUX)
+include $(GBUILDDIR)/platform/linux.mk
+else
+ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+include $(GBUILDDIR)/platform/winmingw.mk
+else
+include $(GBUILDDIR)/platform/windows.mk
+endif
+else
+ifeq ($(OS),SOLARIS)
+include $(GBUILDDIR)/platform/solaris.mk
+else
+ifeq ($(OS),MACOSX)
+include $(GBUILDDIR)/platform/macosx.mk
+else
+$(eval $(call gb_Output_error,Unsupported OS: $(OS)))
+endif
+endif
+endif
+endif
+
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 643b8ab..d4c8694 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -619,6 +619,7 @@ endef
 
 # CppunitTest class
 
+gb_CppunitTest_DEFS := -D_DLL
 gb_CppunitTest_CPPTESTPRECOMMAND :=
 gb_CppunitTest_SYSPRE := itest_
 gb_CppunitTest_EXT := .lib
commit 8bce8c151e9f3d6abed16f3861a88b6a4d2ce1e6
Author: hb <hbrinkm at openoffice.org>
Date:   Thu Mar 24 10:26:52 2011 +0100

    writerfilter10: make compile on unxsols4.pro [hg:b26ee4159e52]

diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 043b5a0..49bff87 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -263,7 +263,9 @@ gb_Library_PLAINLIBS_NONE += \
     dl \
     freetype \
 	jpeg \
+	nsl \
     pthread \
+	socket \
     ICE \
     SM \
     X11 \
commit 0fec15ba51f5a6afb8fa93cf377ef1184cbf2a44
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Mon Mar 7 13:07:44 2011 +0100

    [mq]: oox_gmake.patch [hg:d0beb4a8aa40]

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 3a207b6..f7b698b 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     framework \
     idl \
 	linguistic \
+    oox \
     padmin \
 	regexp \
 	reportdesign \
diff --git a/Repository.mk b/Repository.mk
index 8f59ac4..ad76593 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -181,4 +181,23 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     zlib \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    crypto \
+    ssl \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    crypto \
+    ssl \
+))
+endif
+
+ifeq ($(SYSTEM_OPENSSL),YES)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+	crypto \
+	ssl \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 49caf56..776abec 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -87,6 +87,8 @@ gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
@@ -183,4 +185,11 @@ ifeq ($(USE_SYSTEM_STL),YES)
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
 endif
 
+ifeq ($(SYSTEM_OPENSSL),YES)
+gb_StaticLibrary_TARGETS := $(filter-out crypto,$(gb_StaticLibrary_TARGETS))
+gb_StaticLibrary_TARGETS := $(filter-out ssl,$(gb_StaticLibrary_TARGETS))
+gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 57c8bdc..61a281f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -255,5 +255,8 @@ endif
 
 export gb_AWK
 export gb_XSLTPROC
+export GBUILDDIR
+# FIXME exporting SRCDIR seems kind of a hack
+export SRCDIR
 
 # vim: set noet sw=4 ts=4:

More information about the Libreoffice-commits mailing list