From: Eric Blake <ebb9@byu.net>
Date: Thu, 29 Oct 2009 17:44:12 +0000 (-0600)
Subject: dirname-lgpl: adjust clients that don't need full dirname
X-Git-Tag: v0.1~5274
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=90cff1db2d712f9be51a68bae04fec75e7c23b8a;p=gnulib.git

dirname-lgpl: adjust clients that don't need full dirname

Some of these modules still use xalloc_die from other paths, but
mkdir and rename are definitely reduced in complexity.

* modules/backupfile (Depends-on): Use dirname-lgpl, not dirname.
* modules/filenamecat (Depends-on): Likewise.
* modules/linkat (Depends-on): Likewise.
* modules/mkancesdirs (Depends-on): Likewise.
* modules/mkdir (Depends-on): Likewise.
* modules/openat (Depends-on): Likewise.
* modules/savewd (Depends-on): Likewise.
* modules/rename (Depends-on): Likewise.
(License): Relax license.
* modules/mkdir-tests (Depends-on): Drop progname.
(Makefile.am): Delete unneeded LDADD.
* modules/rename-tests (Depends-on, Makefile.am): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 26a0abf57..73d4a061e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2009-10-29  Eric Blake  <ebb9@byu.net>
 
+	dirname-lgpl: adjust clients that don't need full dirname
+	* modules/backupfile (Depends-on): Use dirname-lgpl, not dirname.
+	* modules/filenamecat (Depends-on): Likewise.
+	* modules/linkat (Depends-on): Likewise.
+	* modules/mkancesdirs (Depends-on): Likewise.
+	* modules/mkdir (Depends-on): Likewise.
+	* modules/openat (Depends-on): Likewise.
+	* modules/savewd (Depends-on): Likewise.
+	* modules/rename (Depends-on): Likewise.
+	(License): Relax license.
+	* modules/mkdir-tests (Depends-on): Drop progname.
+	(Makefile.am): Delete unneeded LDADD.
+	* modules/rename-tests (Depends-on, Makefile.am): Likewise.
+
 	dirname: split into dirname-lgpl
 	* modules/dirname-lgpl: New module.
 	* modules/dirname (Files): Move library-safe files into
diff --git a/modules/backupfile b/modules/backupfile
index aaf20f3b1..fcfcce621 100644
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -12,7 +12,7 @@ Depends-on:
 argmatch
 d-ino
 dirent-safer
-dirname
+dirname-lgpl
 memcmp
 stdbool
 
diff --git a/modules/filenamecat b/modules/filenamecat
index fb1786b84..3008f3590 100644
--- a/modules/filenamecat
+++ b/modules/filenamecat
@@ -9,7 +9,7 @@ m4/filenamecat.m4
 
 Depends-on:
 xalloc
-dirname
+dirname-lgpl
 
 configure.ac:
 gl_FILE_NAME_CONCAT
diff --git a/modules/linkat b/modules/linkat
index 0c94227dc..7affdbfc4 100644
--- a/modules/linkat
+++ b/modules/linkat
@@ -9,7 +9,7 @@ m4/linkat.m4
 Depends-on:
 areadlink
 areadlinkat
-dirname
+dirname-lgpl
 errno
 extensions
 fcntl-h
diff --git a/modules/mkancesdirs b/modules/mkancesdirs
index 5a5c66a3f..bff63e1f9 100644
--- a/modules/mkancesdirs
+++ b/modules/mkancesdirs
@@ -7,7 +7,7 @@ lib/mkancesdirs.h
 m4/mkancesdirs.m4
 
 Depends-on:
-dirname
+dirname-lgpl
 fcntl-h
 savewd
 stat-macros
diff --git a/modules/mkdir b/modules/mkdir
index fa0931d27..08089d008 100644
--- a/modules/mkdir
+++ b/modules/mkdir
@@ -6,8 +6,8 @@ lib/mkdir.c
 m4/mkdir.m4
 
 Depends-on:
+dirname-lgpl
 sys_stat
-dirname
 
 configure.ac:
 gl_FUNC_MKDIR
diff --git a/modules/mkdir-tests b/modules/mkdir-tests
index cff0a5bb8..4d5a9c2d5 100644
--- a/modules/mkdir-tests
+++ b/modules/mkdir-tests
@@ -3,7 +3,6 @@ tests/test-mkdir.h
 tests/test-mkdir.c
 
 Depends-on:
-progname
 stdbool
 symlink
 
@@ -12,4 +11,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-mkdir
 check_PROGRAMS += test-mkdir
-test_mkdir_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/openat b/modules/openat
index 77a7870ef..fc21367a4 100644
--- a/modules/openat
+++ b/modules/openat
@@ -16,7 +16,7 @@ m4/openat.m4
 m4/mode_t.m4
 
 Depends-on:
-dirname
+dirname-lgpl
 errno
 extensions
 fchdir
diff --git a/modules/rename b/modules/rename
index fbd081c4f..e553a12a9 100644
--- a/modules/rename
+++ b/modules/rename
@@ -7,7 +7,7 @@ m4/rename.m4
 
 Depends-on:
 canonicalize-lgpl
-dirname
+dirname-lgpl
 lstat
 rmdir
 same-inode
@@ -25,7 +25,7 @@ Include:
 <stdio.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Jim Meyering
diff --git a/modules/rename-tests b/modules/rename-tests
index 9929faf58..be1b42386 100644
--- a/modules/rename-tests
+++ b/modules/rename-tests
@@ -5,7 +5,6 @@ tests/test-rename.c
 Depends-on:
 errno
 link
-progname
 stdbool
 symlink
 sys_stat
@@ -15,4 +14,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-rename
 check_PROGRAMS += test-rename
-test_rename_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/savewd b/modules/savewd
index 6d655c17e..41f51e31d 100644
--- a/modules/savewd
+++ b/modules/savewd
@@ -7,7 +7,7 @@ lib/savewd.c
 m4/savewd.m4
 
 Depends-on:
-dirname
+dirname-lgpl
 errno
 exit
 fchdir