Makefile in "git status -s"
Regina Henschel
rb.henschel at t-online.de
Mon Jul 29 16:30:35 UTC 2019
Hi Michael,
Michael Stahl schrieb am 29-Jul-19 um 13:45:
> On 28.07.19 17:39, Regina Henschel wrote:
>> Hi all,
>>
>> With
>> git status -s
>> I get a lot of "Makefile" items. A diff for such item gives e.g
>>
>> $ git diff svl/Makefile
>> diff --git a/svl/Makefile b/svl/Makefile
>> index ccb1c85a04da..ab354ea6760e 100644
>> --- a/svl/Makefile
>> +++ b/svl/Makefile
>> @@ -1,7 +1,2 @@
>> -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
>> -
>> -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
>> -
>> +module_directory:=D:/Build_diverses/core/svl/
>> include $(module_directory)/../solenv/gbuild/partial_build.mk
>> -
>> -# vim: set noet sw=4 ts=4:
>>
>> How get I rid of these items? They are very annoying.
>
> this is not supposed to happen...
>
> the Makefile are created in autogen.sh, in the branch "if ($src_path ne
> $build_path)"
Yes indeed. If I clear it with 'git stash push', 'git stash clear' and
then run autogen.sh, afterward I see the Makefile items again.
>
> but that branch shouldn't be taken in your case because you're building
> inside the source directory.
>
> i'd try adding something like "print "$src_path $build_path "" to find
> out what the difference is.
I get no output from print?
I have added in #25.
my $src_path=dirname(realpath($0));
my $build_path=realpath(cwd());
print "$src_path $build_path";
I tried too to add it in #170.
if ($src_path ne $build_path)
{
print "$src_path $build_path";
print STDERR "$src_path $build_path";
print STDOUT "$src_path $build_path";
After autogen.sh has run, I find all these print statements were removed.
autogen.sh adds
--srcdir=$src_path
and from that I see
Running ./configure with '... --srcdir=/cygdrive/d/Build_forCommit/core
...'
But that is the same as in previous log from 2019-05-18.
In the very beginning, before 'Running ./configure with', I get the lines
ln: '/cygdrive/d/Build_forCommit/core/configure.ac' und 'configure.ac'
sind die gleiche Datei
ln: '/cygdrive/d/Build_forCommit/core/g' und 'g' sind die gleiche Datei
ln: '/cygdrive/d/Build_forCommit/core/external/Module_external.mk' und
'external/Module_external.mk' sind die gleiche Datei
That is not there in a previous log.
All tested with a repository in D:/Build_forCommit/core.
Kind regards
Regina
More information about the LibreOffice
mailing list