[Libreoffice-commits] .: Branch 'feature/gnumake4' - 14 commits - configure.in Module_ooo.mk RepositoryExternal.mk RepositoryFixes.mk Repository.mk scp2/source scp2/util set_soenv.in solenv/gbuild
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Jun 17 05:41:09 PDT 2011
Module_ooo.mk | 2 -
Repository.mk | 22 ++++++++++---
RepositoryExternal.mk | 56 +++++++++++++++++++++++++++-------
RepositoryFixes.mk | 7 ++--
configure.in | 10 ++++++
scp2/source/canvas/makefile.mk | 2 -
scp2/util/makefile.mk | 2 -
set_soenv.in | 1
solenv/gbuild/CppunitTest.mk | 1
solenv/gbuild/Executable.mk | 7 ++++
solenv/gbuild/Helper.mk | 18 ++++++++++
solenv/gbuild/JavaClassSet.mk | 4 +-
solenv/gbuild/Library.mk | 4 +-
solenv/gbuild/LinkTarget.mk | 22 ++++++++++++-
solenv/gbuild/Output.mk | 2 -
solenv/gbuild/StaticLibrary.mk | 3 -
solenv/gbuild/platform/linux.mk | 2 -
solenv/gbuild/platform/windows.mk | 5 +--
solenv/gbuild/platform/winmingw.mk | 4 +-
solenv/gbuild/templates/Executable.mk | 3 +
solenv/gbuild/templates/Library.mk | 5 +--
21 files changed, 145 insertions(+), 37 deletions(-)
New commits:
commit daa6d37b319ab9d6df269269cb3f8108c1cced66
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Apr 14 10:11:15 2011 +0200
gnumake4: added dbaccess and reportdesign [hg:a75d5667430f]
diff --git a/Repository.mk b/Repository.mk
index 103a678..ca91e52 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -44,6 +44,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
AppleRemote \
+ adabas \
+ adabasui \
agg \
avmedia \
basebmp \
@@ -52,10 +54,19 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
canvastools \
cppcanvas \
cui \
+ dba \
+ dbaxml \
+ dbmm \
+ dbui \
+ dbpool \
+ dbtools \
desktop_detector \
drawinglayer \
editeng \
eggtray \
+ file \
+ for \
+ forui \
fwe \
fwi \
fwk \
@@ -66,9 +77,16 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
lng \
msfilter \
msword \
+ odbc \
+ odbcbase \
qstart_gtk \
+ rpt \
+ rptui \
+ rptxml \
sax \
sb \
+ sdbc \
+ sdbt \
sfx \
sm \
smd \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index c73cd3b..1a18a39 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -84,6 +84,7 @@ $(eval $(foreach method,\
add_cflags \
set_cflags \
add_cxxflags \
+ set_yaccflags \
set_cxxflags \
add_objcxxflags \
set_objcxxflags \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 511fdf6..2b06d65 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -80,6 +80,7 @@ $(eval $(foreach method,\
add_generated_exception_objects \
add_cflags \
set_cflags \
+ set_yaccflags \
add_cxxflags \
set_cxxflags \
add_objcxxflags \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a5e5eb0..421cce5 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -116,6 +116,7 @@ $(eval $(foreach method,\
add_generated_exception_objects \
add_cflags \
set_cflags \
+ set_yaccflags \
add_cxxflags \
set_cxxflags \
add_objcxxflags \
commit b85846b6075465280bb5c8abc5ec072de8da5188
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Tue Apr 12 08:11:49 2011 +0200
gnumake4: new defile for subsystem:windows and subsystem:console [hg:82d8df3b0ccd]
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 9c7d47e..511fdf6 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -47,6 +47,7 @@ $(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
endef
define gb_Executable__Executable_impl
+$(call gb_Executable_set_targettype_gui,$(2))
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),Executable)
$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
@@ -57,6 +58,11 @@ $(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call g
endef
+define gb_Executable_set_targettype_gui
+$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2)
+endef
+
+
define gb_Executable_forward_to_Linktarget
gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index f1c9266..643b8ab 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -194,12 +194,11 @@ gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
-NODEFAULTLIB \
-OPT:NOREF \
- -SUBSYSTEM:CONSOLE \
-safeseh \
-nxcompat \
-dynamicbase \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
-
+
gb_DEBUG_CFLAGS := -Zi
# this does not use CFLAGS so it is not overridable
@@ -433,6 +432,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+ $(if $(filter YES,$(gb_Executable_TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
@@ -599,6 +599,7 @@ endef
gb_Executable_EXT := .exe
gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
gb_Executable_get_rpath :=
+gb_Executable_TARGETGUI :=
define gb_Executable_Executable_platform
$(call gb_LinkTarget_set_auxtargets,$(2),\
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 733b2ea..313405c 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -155,7 +155,6 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
--export-all-symbols \
--kill-at \
- --subsystem console \
--exclude-libs ALL \
--enable-stdcall-fixup \
--enable-runtime-pseudo-reloc-v2 \
@@ -397,6 +396,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
$(gb_LINK) \
$(gb_Executable_TARGETTYPEFLAGS) \
+ $(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
$(T_LDFLAGS) \
$(gb_MINGWLIBDIR)/crt2.o \
$(MINGW_CLIB_DIR)/crtbegin.o \
@@ -591,7 +591,7 @@ gb_Executable_EXT := .exe
gb_Executable_TARGETTYPEFLAGS :=
gb_Executable_get_rpath :=
gb_Executable_Executable_platform =
-
+gb_Executable_TARGETGUI :=
# CppunitTest class
diff --git a/solenv/gbuild/templates/Executable.mk b/solenv/gbuild/templates/Executable.mk
index 157233a..84248be 100644
--- a/solenv/gbuild/templates/Executable.mk
+++ b/solenv/gbuild/templates/Executable.mk
@@ -42,4 +42,7 @@ $(eval $(call gb_Executable_add_linked_libs,EXEC,\
$(eval $(call gb_Executable_add_exception_objects,EXEC,\
))
+$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
+))
+
# vim: set noet sw=4 ts=4:
commit 5d358fde1165650cad43dfa41fe56e871163010b
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 16:11:41 2011 +0000
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1e42557..6c14015 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -39,8 +39,7 @@
ifeq ($(SYSTEM_ZLIB),YES)
define gb_LinkTarget__use_zlib
-$(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_ZLIB \
)
$(call gb_LinkTarget_add_libs,$(1),-lz)
@@ -90,8 +89,7 @@ ifeq ($(SYSTEM_EXPAT),YES)
define gb_LinkTarget__use_expat
$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
-$(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_EXPAT \
)
@@ -110,8 +108,7 @@ define gb_LinkTarget__use_expat
$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
$(if $(filter-out ascii_expat_xmlparse,$(2)),\
- $(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+ $(call gb_LinkTarget_add_defs,$(1),\
-DXML_UNICODE \
))
@@ -136,8 +133,7 @@ endef
ifeq ($(SYSTEM_LIBXML),YES)
define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_LIBXML \
)
$(call gb_LinkTarget_set_include,$(1),\
@@ -190,8 +186,7 @@ endif # SYSTEM_LIBXSLT
ifeq ($(SYSTEM_REDLAND),YES)
define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_REDLAND \
)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index fe365fb..a5e5eb0 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -68,8 +68,7 @@ endef
define gb_Library__Library_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),Library)
-$(call gb_LinkTarget_set_defs,$(2),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \
)
$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 17b6bf3..177b7d3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -423,6 +423,10 @@ endif
endef
define gb_LinkTarget_set_defs
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
+else
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -432,6 +436,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
endif
+endif
endef
@@ -444,10 +449,15 @@ endif
endef
define gb_LinkTarget_set_cflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
+else
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
endif
+endif
endef
@@ -462,8 +472,11 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
endif
endef
-# maybe should deprecate this...
define gb_LinkTarget_set_cxxflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
+else
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -472,6 +485,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
endif
+endif
endef
@@ -483,10 +497,15 @@ endif
endef
define gb_LinkTarget_set_objcxxflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
+else
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
endif
+endif
endef
@@ -512,6 +531,7 @@ define gb_LinkTarget_add_ldflags
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
endef
+# real use in RepositoryExternal.mk
define gb_LinkTarget_set_ldflags
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
endef
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index af7db9a..4d3c22b 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -63,8 +63,7 @@ endef
define gb_StaticLibrary__StaticLibrary_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
-$(call gb_LinkTarget_set_defs,$(2),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
$(gb_StaticLibrary_DEFS) \
)
$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk
index 2e62cfe..4b6603a 100644
--- a/solenv/gbuild/templates/Library.mk
+++ b/solenv/gbuild/templates/Library.mk
@@ -49,9 +49,8 @@ $(eval $(call gb_Library_set_include,LIB,\
# add any additional definitions to be set for compilation here
# (e.g. -DLIB_DLLIMPLEMENTATION)
-$(eval $(call gb_Library_set_defs,LIB,\
- $$(DEFS) \
-))
+#$(eval $(call gb_Library_add_defs,LIB,\
+#))
# add libraries to be linked to LIB; again these names need to be given as
# specified in Repository.mk
commit abfeecc9ef7157abdbbd03fa24db1516a1668fac
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 16:11:40 2011 +0000
gnumake4: Output.mk: enable gb_COLOR on xtermc [hg:0a172a5071c0]
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 1056548..9246fd5 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -60,7 +60,7 @@ gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
# - gb_COLOR is set
# - we have a known term
ifneq ($(strip $(gb_COLOR)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color),)
+ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color xtermc),)
gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
commit bea7b057c92eac5b2d62d9e592adb7d7f81d1c70
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 16:11:40 2011 +0000
gnumake4: Helper.mk: check for duplicate registration; [hg:cd671263f60a]
the error message you would get when trying to build a twice
registered library is really opaque.
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 310fa1c..e8b6226 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -143,6 +143,12 @@ define gb_Helper_register_executables
ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for executables. Valid groups are: $$(gb_Executable_VALIDGROUPS)))
endif
+$(foreach group,$(gb_Executable_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_Executable_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_executables: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_executables: contains duplicates: $(2)))
gb_Executable_$(1) += $(2)
@@ -152,6 +158,12 @@ define gb_Helper_register_libraries
ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS)))
endif
+$(foreach group,$(gb_Library_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_Library_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: contains duplicates: $(2)))
gb_Library_$(1) += $(2)
@@ -161,6 +173,12 @@ define gb_Helper_register_static_libraries
ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for static libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS)))
endif
+$(foreach group,$(gb_StaticLibrary_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_StaticLibrary_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_static_libraries: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_static_libraries: contains duplicates: $(2)))
gb_StaticLibrary_$(1) += $(2)
commit b12e885d9c8cc28df078b89377b072c0fd6a15c6
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 16:11:40 2011 +0000
gnumake4: JavaClassSet.mk: strip whitespace when adding to CLASSPATH [hg:4cbea75d255a]
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 0aeaf14..184a14a 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -80,13 +80,13 @@ endef
# build order dependency is a hack to get these prerequisites out of the way in the build command
define gb_JavaClassSet_add_jar
$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
endef
# this does not generate dependency on the jar
define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
endef
commit 6d1475f903230aa1b63f473b8218a6cf89b6af30
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 16:11:40 2011 +0000
gnumake4: #i117610#: move icule to RepositoryExternal.mk [hg:e86f5a26e982]
diff --git a/Repository.mk b/Repository.mk
index ac75959..103a678 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
cppunit \
- icule \
))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5c5c210..1e42557 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -290,6 +290,9 @@ endif # SYSTEM_GRAPHITE
ifeq ($(SYSTEM_ICU),YES)
+define gb_LinkTarget__use_icule
+$(call gb_LinkTarget_add_libs,$(1),-licule)
+endef
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_libs,$(1),-licuuc)
endef
@@ -297,9 +300,15 @@ endef
else # !SYSTEM_ICU
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ icule \
icuuc \
))
+define gb_LinkTarget__use_icule
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ icule \
+)
+endef
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_linked_libs,$(1),\
icuuc \
commit ed1412c35070b563207a300c1fc7411303b3f8ee
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 16:11:39 2011 +0000
gnumake4: #i117610#: move graphite to RepositoryExternal.mk [hg:ca1349af0566]
diff --git a/Repository.mk b/Repository.mk
index a3a17c3..ac75959 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -155,7 +155,6 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
- graphite \
ooopathutils \
salcpprt \
vclmain \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e49b814..5c5c210 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -258,6 +258,36 @@ endef
endif # SYSTEM_CAIRO
+ifeq ($(SYSTEM_GRAPHITE),YES)
+
+#check for building with stlport, but graphite was not built with stlport
+define gb_LinkTarget__use_graphite
+ifneq ($(USE_SYSTEM_STL),YES)
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DADAPT_EXT_STL \
+)
+endif
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(GRAPHITE_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
+endef
+
+else # !SYSTEM_GRAPHITE
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ graphite \
+))
+define gb_LinkTarget__use_graphite
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ graphite \
+)
+endef
+
+endif # SYSTEM_GRAPHITE
+
+
ifeq ($(SYSTEM_ICU),YES)
define gb_LinkTarget__use_icuuc
commit d22511b59c938dfb724cdd7ab4494f755c030a28
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 16:11:39 2011 +0000
gnumake4: adapt makefiles [hg:ec87fcbfae8b]
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 13985e8..e49b814 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -66,7 +66,7 @@ ifeq ($(SYSTEM_JPEG),YES)
define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
$(call gb_LinkTarget_set_ldflags,$(1),\
- $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
+ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
)
endef
commit 9d2d3b0f8b12076dc8c7be2e93368a9df8260c2f
Author: Michael Stahl <mst at openoffice.org>
Date: Wed Apr 13 12:44:29 2011 +0000
gnumake4: merge parts of ooo34fixes [hg:ca410a15b7e1]
diff --git a/Module_ooo.mk b/Module_ooo.mk
index fa59217..a1f7d44 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -52,11 +52,11 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
ucbhelper \
unotools \
unoxml \
+ vbahelper \
vcl \
xmloff \
xmlreader \
xmlscript \
- vbahelper \
))
# vim: set noet ts=4 sw=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index d343164..49caf56 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -92,6 +92,7 @@ gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT)
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 1984e9e..2264e4c 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -278,8 +278,8 @@ endif
gb_Library_PLAINLIBS_NONE += \
dl \
- freetype \
fontconfig \
+ freetype \
m \
pthread \
ICE \
commit bca0c1fc1386a6a015a6b615d5444c88a33d65e1
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Tue Apr 12 20:37:07 2011 +0200
ooo340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS [hg:e09be3339384]
diff --git a/configure.in b/configure.in
index 641d511..34af2af 100644
--- a/configure.in
+++ b/configure.in
@@ -209,6 +209,10 @@ AC_ARG_ENABLE(cairo,
AC_ARG_WITH(system-cairo,
[ --with-system-cairo Use Cairo libraries already on system
],,)
+AC_ARG_ENABLE(cairo-canvas,
+[ --disable-cairo-canvas Determines whether to build the Cairo canvas on
+ platforms where Cairo is available.
+],,enable_cairo_canvas=yes)
AC_ARG_ENABLE(librsvg,
[ --enable-librsvg Determines whether to use librsvg library on
platforms where librsvg is available.
@@ -5783,6 +5787,12 @@ AC_SUBST(SYSTEM_CAIRO)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
+ENABLE_CAIRO_CANVAS="FALSE"
+if test "$enable_cairo_canvas" = "yes" -a "$ENABLE_CAIRO" = "TRUE" ; then
+ ENABLE_CAIRO_CANVAS="TRUE"
+fi
+AC_SUBST(ENABLE_CAIRO_CANVAS)
+
dnl ===================================================================
dnl Check whether the librsvg libraries are available.
dnl ===================================================================
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index f89e1c6..eaffb93 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -49,7 +49,7 @@ SCPDEFS+=-DSYSTEM_AGG
PARFILES= canvascommons.par \
vclcanvas.par
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
PARFILES+= cairocanvas.par
.ENDIF
.IF "$(ENABLE_DIRECTX)" != ""
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 1fed891..c039428 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -178,7 +178,7 @@ SCP1FILES += \
SCP1FILES += \
vclcanvas.par
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
SCP1FILES += cairocanvas.par
.ENDIF
diff --git a/set_soenv.in b/set_soenv.in
index 6a8c65b..c12421a 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1634,6 +1634,7 @@ ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
+ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
commit af1a6d4eb2e130955367c236ffa807eb9243ab56
Author: Michael Stahl <mst at openoffice.org>
Date: Tue Apr 12 15:10:35 2011 +0000
gnumake4: merge ooo34gsl01 [hg:6470e79f0039]
diff --git a/Repository.mk b/Repository.mk
index 2b79183..a3a17c3 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -106,7 +106,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
cppunit \
icule \
- cppunit \
))
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 88de46a..d343164 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -102,7 +102,7 @@ endif
# these are libraries built by OOo, but only a few of them
# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
# we link against their dlls in gcc format directly
-gb_Library_NOILIBFILENAMES:= graphite_dll icule icuuc
+gb_Library_NOILIBFILENAMES:= icule icuuc
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
commit 71c56a5ee3c64663f819a78659c8b5e9948380c9
Author: Philipp Lohmann [pl] <Philipp.Lohmann at oracle.com>
Date: Mon Apr 4 11:54:29 2011 +0200
ooo34gsl01: #i117680# add graphite_dll fix for MINGW, too [hg:6461ee21fbbb]
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 3132ece..88de46a 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -91,7 +91,7 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT)
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))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
commit 11322ffd2107c25b934ecc89c2ca0419dddf429c
Author: Philipp Lohmann [pl] <Philipp.Lohmann at oracle.com>
Date: Mon Apr 4 11:40:41 2011 +0200
ooo34gsl01: #i117680# fixup graphite_dll as static library [hg:859f1dffdb89]
diff --git a/Repository.mk b/Repository.mk
index 8ed986d..2b79183 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -106,7 +106,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
cppunit \
icule \
- graphite_dll \
cppunit \
))
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b23b4ff..3132ece 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -144,6 +144,7 @@ gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
@@ -152,8 +153,7 @@ endif
# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += icuuc
- graphite_dll \
+gb_Library_NOILIBFILENAMES += icuuc \
icule \
imm32\
msimg32 \
More information about the Libreoffice-commits
mailing list