summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2020-07-05 21:05:21 +0200
committerBruno Haible <bruno@clisp.org>2020-07-05 21:05:21 +0200
commitaa8369e4a2f1c27a68ff887160e75a23124096a8 (patch)
treede2e3f5c7708e129e9174d33cee3a4ca5dc2285a
parentb32e203eee9c9259996310b6bcf55a13b102348a (diff)
downloadgnulib-aa8369e4a2f1c27a68ff887160e75a23124096a8.tar.gz
gnulib-aa8369e4a2f1c27a68ff887160e75a23124096a8.tar.bz2
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.
-rw-r--r--ChangeLog6
-rw-r--r--lib/argp-namefrob.h2
-rw-r--r--modules/argp2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1396c94f50..5b3170787e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2020-07-05 Bruno Haible <bruno@clisp.org>
+ 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 <bruno@clisp.org>
+
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 022b8800ec..50c62e9d8a 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 125046ad89..50fde11904 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

Return to:

Send suggestions and report system problems to the System administrator.