[Libreoffice-commits] core.git: 2 commits - config_host.mk.in Makefile.in

[David Tardon]

 Makefile.in       |    5 ++++-
 config_host.mk.in |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 81e43176d838920743b5cb226f9ea9509eb1036c
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 26 09:22:30 2015 +0100

    fix build from module
    
    Change-Id: I044e6c82b4f3b492ed384e86dbe9e6955f8f792f

diff --git a/config_host.mk.in b/config_host.mk.in
index 40a1989..a75560c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -652,7 +652,7 @@ export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
 export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
 
 # lang-related stuff
-include config_$(gb_Side)_lang.mk
+include $(BUILDDIR)/config_$(gb_Side)_lang.mk
 
 # tarball names
 # does use some of the variables defined above
commit c8708f34d6ab4152ef74c01ed2210ec7aee83dbe
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 26 09:19:01 2015 +0100

    add Makefile deps and cleanup for config_host_lang.mk*
    
    Change-Id: I7fabd28ccdf66a4fa96838aafadbe6ceee8d9ee3

diff --git a/Makefile.in b/Makefile.in
index 36bcaf3..61b16ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,12 +32,13 @@ GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T)
 ifeq (,$(MAKE_RESTARTS)$(if $(GIT_BUILD),,T)$(if $(filter-out help showmodules clean distclean,$(MAKECMDGOALS)),,T))
 
 .PHONY : force-restart
-Makefile: $(BUILDDIR)/config_host.mk force-restart
+Makefile: $(BUILDDIR)/config_host.mk $(BUILDDIR)/config_host_lang.mk force-restart
 	@touch $@
 
 # run configure in an environment not polluted by config_host.mk
 $(BUILDDIR)/config_host.mk : $(wildcard \
 		$(SRCDIR)/config_host.mk.in \
+		$(SRCDIR)/config_host_lang.mk.in \
 		$(SRCDIR)/Makefile.in \
 		$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
 		$(SRCDIR)/configure.ac \
@@ -179,6 +180,8 @@ distclean : clean compilerplugins-clean
         $(BUILDDIR)/config_build.mk \
         $(BUILDDIR)/config_host.mk \
         $(BUILDDIR)/config_host.mk.stamp \
+        $(BUILDDIR)/config_host_lang.mk \
+        $(BUILDDIR)/config_host_lang.mk.stamp \
         $(BUILDDIR)/config_host/*.h \
         $(BUILDDIR)/configure \
         $(BUILDDIR)/instsetoo_native/util/openoffice.lst \