Makefile.top | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a212733b19f0a58d729cc9ce5f55bf1b1a6a0453
Author: Bjoern Michaelsen <[email protected]>
Date: Thu Nov 29 12:58:35 2012 +0100
sigh, demote to a warn again, as otherwise we might run into caching issues
diff --git a/Makefile.top b/Makefile.top
index 96eab1c..4ecb435 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -37,7 +37,7 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard
*/prj/dmake) $(SRCDI
include $(WORKDIR)/modules.mk
include $(SRCDIR)/solenv/gbuild/Output.mk
-$(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call
gb_Output_error,The following modules claim to be both dmake and gbuild:
$(filter $(gbuild_modules),$(dmake_modules)))))
+$(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call
gb_Output_warn,The following modules claim to be both dmake and gbuild:
$(filter $(gbuild_modules),$(dmake_modules)))))
export gb_TAILBUILDTARGET=all slowcheck
commit 6e6b3f3f1d001fc8cad16039585878b6d27c26a4
Author: Bjoern Michaelsen <[email protected]>
Date: Thu Nov 29 12:48:39 2012 +0100
rebuild modules.mk when rerunning autogen
diff --git a/Makefile.top b/Makefile.top
index c479207..96eab1c 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -27,7 +27,7 @@ endif
# This list tells which modules are gbuild ones. It does *not* tell which
modules to build. That is directed
# by the module being mentioned in packimages/prj/build.lst, etc, recursively.
-$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake)
+$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake)
$(SRCDIR)/config_host.mk
echo -n "gbuild_modules:=" > $@
for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
echo >> $@
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
