Mercurial > gnulib
changeset 39097:c0437ab94bfb
generator: library Makefile generator fixes
| author | Dmitry Selyutin <ghostmansd@gmail.com> |
|---|---|
| date | Wed, 17 Jan 2018 21:31:03 +0300 |
| parents | ba23c0ff778e |
| children | 16281fd48d93 |
| files | pygnulib/generator.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pygnulib/generator.py Wed Jan 17 21:25:50 2018 +0300 +++ b/pygnulib/generator.py Wed Jan 17 21:31:03 2018 +0300 @@ -672,14 +672,14 @@ self.__database = database self.__path = path self.__mkedits = mkedits - self.testing = testing + self.__testing = testing def __iter__(self): date = _datetime.now() config = self.__config explicit = self.__explicit - testing = self.testing + testing = self.__testing database = self.__database gnumake = config.gnumake @@ -719,7 +719,7 @@ def _common_conditional(module, conditional, unconditional): yield "" - yield "if {}".format(module.conditional_name) + yield "if {}".format(module.conditional_name(config.macro_prefix)) yield conditional yield "endif" yield unconditional @@ -732,7 +732,7 @@ def _gnumake_conditional(module, conditional, unconditional): yield "ifeq (,$(OMIT_GNULIB_MODULE_{}))".format(module.name) yield "" - yield "ifneq (,$({}))".format(module.conditional_name) + yield "ifneq (,$({}))".format(module.conditional_name(config.macro_prefix)) yield LibMakefileGenerator._GNUMAKE.sub("ifneq (,$(\\1))", conditional) yield "endif" yield "endif" @@ -1006,7 +1006,7 @@ yield "# other built files." yield "" yield "" - yield "# This macro should be invoked from $configure_ac, in the section" + yield "# This macro should be invoked from {}, in the section".format(config.ac_file) yield "# \"Checks for programs\", right after AC_PROG_CC, and certainly before" yield "# any checks for libraries, header files, types and library functions." yield "AC_DEFUN([{}_EARLY],".format(config.macro_prefix) @@ -1030,7 +1030,7 @@ yield " {}".format(line) yield "])" yield "" - yield "# This macro should be invoked from $configure_ac, in the section" + yield "# This macro should be invoked from {}, in the section".format(config.ac_file) yield "# \"Check for header files, types and library functions\"." yield "AC_DEFUN([{}_INIT],".format(macro_prefix) yield "["