From c6c7e33ac18f3a1e6e2efe89783cf24f98f5ca9e Mon Sep 17 00:00:00 2001 From: Dmitry Selyutin <ghostmansd@gmail.com> Date: Thu, 5 Jul 2018 22:25:36 +0300 Subject: [PATCH] generator: fix subdirs for gnulib_comp --- pygnulib.py | 1 - pygnulib/generator.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pygnulib.py b/pygnulib.py index 755fe50efa..48aa415fa6 100755 --- a/pygnulib.py +++ b/pygnulib.py @@ -560,7 +560,6 @@ def import_hook(script, gnulib, namespace, explicit, verbosity, options, *args, "config": config, "explicit": explicit, "database": database, - "subdirs": True, } for line in gnulib_comp(**arguments): print(line, file=tmp) diff --git a/pygnulib/generator.py b/pygnulib/generator.py index 03c6ed9276..20c3c73959 100644 --- a/pygnulib/generator.py +++ b/pygnulib/generator.py @@ -964,7 +964,7 @@ def gnulib_cache(config, explicit): -def gnulib_comp(config, explicit, database, subdirs, **override): +def gnulib_comp(config, explicit, database, **override): """gnulib-comp.m4 generator""" config = _BaseConfig(**config) for (key, value) in override.items(): @@ -973,6 +973,10 @@ def gnulib_comp(config, explicit, database, subdirs, **override): main_modules = database.main_modules test_modules = database.test_modules + subdirs = False + for module in database.main_modules: + subdirs |= any(__MAKEFILE_SUBDIRS.match(file) for file in module.files) + date = _datetime.now() ac_file = config.ac_file yield "# DO NOT EDIT! GENERATED AUTOMATICALLY!" -- 2.39.5