>From aa8369e4a2f1c27a68ff887160e75a23124096a8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 21:05:21 +0200 Subject: [PATCH 3/7] argp: Trim module dependencies. * lib/argp-namefrob.h: Include basename-lgpl.h instead of dirname.h. * modules/argp (Depends-on): Remove dirname-lgpl. Add basename-lgpl. --- ChangeLog | 6 ++++++ lib/argp-namefrob.h | 2 +- modules/argp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1396c94..5b31707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-07-05 Bruno Haible + argp: Trim module dependencies. + * lib/argp-namefrob.h: Include basename-lgpl.h instead of dirname.h. + * modules/argp (Depends-on): Remove dirname-lgpl. Add basename-lgpl. + +2020-07-05 Bruno Haible + basename-lgpl: New module. * lib/basename-lgpl.h: New file, based on lib/dirname.h and lib/basename-lgpl.c. diff --git a/lib/argp-namefrob.h b/lib/argp-namefrob.h index 022b880..50c62e9 100644 --- a/lib/argp-namefrob.h +++ b/lib/argp-namefrob.h @@ -146,7 +146,7 @@ #elif defined GNULIB_ARGP_EXTERN_BASENAME extern char *__argp_base_name (const char *arg); #else -# include "dirname.h" +# include "basename-lgpl.h" # define __argp_base_name last_component #endif diff --git a/modules/argp b/modules/argp index 125046a..50fde11 100644 --- a/modules/argp +++ b/modules/argp @@ -24,7 +24,7 @@ m4/argp.m4 Depends-on: alloca -dirname-lgpl +basename-lgpl extern-inline getopt-gnu strchrnul -- 2.7.4