[Libreoffice-commits] .: Makefile

Stephan Bergmann sbergman at redhat.com
Mon Feb 27 02:00:21 PST 2012


On 02/27/2012 09:28 AM, Norbert Thiebaud wrote:
> On 2/26/12 13:00 , Peter Foley wrote:
>>   Makefile |    7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> New commits:
>> commit a75873dea15719b5216cfd0476d30003ffc76e80
>> Author: Peter Foley<pefoley2 at verizon.net>
>> Date:   Sun Feb 26 13:53:09 2012 -0500
>>
>>      allow autogen.sh to be run automatically
>>
>> diff --git a/Makefile b/Makefile
>> index a37bca3..68bea91 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -342,12 +342,15 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
>>   # restart since autogen can have changed
>>   # config_host.k which is included in this
>>   # Makefile
>> -Makefile: config_host.mk
>> +Makefile: $(SRCDIR)/config_host.mk
>
> why did you have to add $SRCDIR here ?
> Makefile has to be run in the top dir... and if not the dependencies below would not be found (config_host.mk.in for
> instance)
>
> Norbert
>
>>   	touch $@
>>
>> -config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun
>> +$(SRCDIR)/config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun
>>   	./autogen.sh

I think one problem is

   include $(SRCDIR)/config_$(gb_Side).mk

near the top of Makefile.  If there is no config_host.mk already, there 
would be no rule to make it.

Stephan


More information about the LibreOffice mailing list