[Mesa-dev] [PATCH 6/7] glapi: automake: ensure that we (can) clean the generated files

Emil Velikov emil.l.velikov at gmail.com
Wed Jun 1 13:11:54 UTC 2016


On 31 May 2016 at 21:42, Matt Turner <mattst88 at gmail.com> wrote:
> On Tue, May 31, 2016 at 12:03 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> On 31 May 2016 at 18:54, Matt Turner <mattst88 at gmail.com> wrote:
>>> On Tue, May 31, 2016 at 9:26 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>>>> From: Emil Velikov <emil.velikov at collabora.com>
>>>>
>>>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>>>> ---
>>>>  src/mapi/glapi/gen/Makefile.am | 1 +
>>>>  1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
>>>> index c511de9..ab0dcab 100644
>>>> --- a/src/mapi/glapi/gen/Makefile.am
>>>> +++ b/src/mapi/glapi/gen/Makefile.am
>>>> @@ -58,6 +58,7 @@ BUILT_SOURCES = \
>>>>         $(MESA_GLX_DIR)/indirect_init.c \
>>>>         $(MESA_GLX_DIR)/indirect_size.h \
>>>>         $(MESA_GLX_DIR)/indirect_size.c
>>>> +CLEANFILE = $(BUILT_SOURCES)
>>>>  EXTRA_DIST= \
>>>>         $(BUILT_SOURCES) \
>>>>         $(MESA_GLAPI_DIR)/glapi_gentable.c \
>>>> --
>>>
>>> Again doesn't this prevent you from rebuilding from a tarball after a
>>> make clean?
>> Can you please elaborate ? I believe that my argument for git_sha1.h
>> makes sense. Are you saying that the same/similar case applies here ?
>
> From a tarball, if you run make clean it will delete files generated
> from python scripts. Since we don't require python to build from
> tarballs, there will be no way to regenerate them. Isn't that a
> problem?
>
> I don't think we should put these in CLEANFILES.
Hmm seems like I got the clean <> distclean <>maintclean relation the
wrong way around. So yes, we shouldn't really use CLEANFILES in here.

There are some violations in the existing build though:
 - Change the current CLEANFILES (the ones that require
python/lex/etc.) to MAINTAINERCLEANFILES
 - Add all the .pc files to DISTCLEANFILES, if they aren't nuked by
`make distcheck'.

Thanks
Emil


More information about the mesa-dev mailing list