Makefile | 4 +++- avmedia/Library_avmediawin.mk | 1 - dtrans/StaticLibrary_dtobj.mk | 5 ----- vcl/Library_desktop_detector.mk | 1 - vcl/Library_vclplug_gen.mk | 1 - vcl/Library_vclplug_gtk.mk | 1 - vcl/Library_vclplug_gtk3.mk | 1 - vcl/Library_vclplug_kde.mk | 1 - vcl/Library_vclplug_svp.mk | 1 - vcl/StaticLibrary_headless.mk | 1 - vcl/StaticLibrary_vclmain.mk | 1 - 11 files changed, 3 insertions(+), 15 deletions(-)
New commits: commit a0c36a1e39c0874b3dc9731544ddfe5b2822e42f Author: Matúš Kukan <matus.ku...@gmail.com> Date: Mon May 14 16:59:52 2012 +0200 quick fix for slowcheck targets in tail_build Change-Id: Ia74a76659d97d10299d9ddfe8d2118d5c1c5725e diff --git a/Makefile b/Makefile index 55d3605..88dad31 100644 --- a/Makefile +++ b/Makefile @@ -244,6 +244,7 @@ xsltml\ zlib\ gb_TAILBUILDMODULES := $(shell make -f $(SRCDIR)/tail_build/Makefile showmodules) +export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules .PHONY: $(1) $(1).all $(1).clean $(1).deliver @@ -257,7 +258,8 @@ $(1).all: bootstrap fetch $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) else $(1).all: bootstrap fetch - cd tail_build && unset MAKEFLAGS && export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1)" && \ + cd tail_build && unset MAKEFLAGS && \ + export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)" && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) endif commit 15f637229dc9d196461af4c096a4b4a99cb255db Author: Matúš Kukan <matus.ku...@gmail.com> Date: Mon May 14 09:38:35 2012 +0200 dxguid.lib not needed here Change-Id: I73ab08289965a311e36ea5f0187d57f7662208ab diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index bac5161..39a065c 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ $(eval $(call gb_Library_add_libs,avmediawin,\ strmiids.lib \ - dxguid.lib \ )) $(eval $(call gb_Library_add_exception_objects,avmediawin,\ commit d2fe7ac24b43e8a00a7c59cdbd0efb4ff117e583 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat May 12 12:28:55 2012 +0200 -I$(SRCDIR)/solenv/inc is from SOLARINC Change-Id: I I4fdd35b2d2c256f7d45022fb837178ace9d678d9 diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk index 200edcb..cdc4a2d 100644 --- a/dtrans/StaticLibrary_dtobj.mk +++ b/dtrans/StaticLibrary_dtobj.mk @@ -28,11 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj)) -$(eval $(call gb_StaticLibrary_set_include,dtobj,\ - $$(INCLUDE) \ - -I$(SRCDIR)/solenv/inc \ -)) - $(eval $(call gb_StaticLibrary_use_api,dtobj,\ udkapi \ offapi \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index df85604..4aa4609 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_Library,desktop_detector)) $(eval $(call gb_Library_set_include,desktop_detector,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_add_defs,desktop_detector,\ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 31df6c2..3ff257a 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,vclplug_gen)) $(eval $(call gb_Library_set_include,vclplug_gen,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_use_api,vclplug_gen,\ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 658c72d..e816fcf 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/unx \ -I$(SRCDIR)/vcl/unx/gtk/inc \ - -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_add_defs,vclplug_gtk,\ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 29bcf0b..120199c 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/unx \ -I$(SRCDIR)/vcl/unx/gtk3/inc \ - -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 1673945..303b98c 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_packages,vclplug_kde,\ $(eval $(call gb_Library_set_include,vclplug_kde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_set_include,vclplug_kde,\ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 9d93a6e..ba0831f 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,vclplug_svp)) $(eval $(call gb_Library_set_include,vclplug_svp,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_add_cxxflags,vclplug_svp,\ diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index ffa71c1..a07497c 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -50,5 +50,4 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,headless,\ $(eval $(call gb_StaticLibrary_set_include,headless,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/solenv/inc \ )) diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index b816de6..24c811a 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -37,7 +37,6 @@ endif $(eval $(call gb_StaticLibrary_set_include,vclmain,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_StaticLibrary_use_api,vclmain,\
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits