(LIBSRCS): Move error.c here from SRCS. (OBJS): Remove error.$(OBJEXT). (HDRS): Remove exitfail.h, patchlevel.h. (ACINCLUDE_INPUTS): Remove c-bs-a.m4, jm-glibc-io.m4, prereq.m4. Add backupfile.m4, dirname.m4, dos.m4, getopt.m4, memchr.m4, onceonly.m4, quote.m4, quotearg.m4, rmdir.m4, unlocked-io.m4, xalloc.m4. (patchlevel.h): Remove. All uses removed. (argmatch.$(OBJEXT), error.$(OBJEXT), quotesys.$(OBJEXT)), xmalloc.$(OBJEXT)): Depend on gettext.h. (dirname.$(OBJEXT), quote.$(OBJEXT), strncasecmp.$(OBJEXT)): New rules. (patch.$(OBJEXT), xmalloc.$(OBJEXT)): Remove exitfail.h. (rename.$(OBJEXT)): Remove. (version.$(OBJEXT)): Remove util.h. (xmalloc.$(OBJEXT)): Add error.h.

1 files changed, 36 insertions, 22 deletions

diff --git a/Makefile.in b/Makefile.in
index 684bf57..957dcb6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,12 +61,11 @@ CONFIG_STATUS = config.status
 
 SHELL = /bin/sh
 
-LIBSRCS = malloc.c memchr.c mkdir.c \
+LIBSRCS = error.c malloc.c memchr.c mkdir.c \
 	realloc.c rename.c rmdir.c strcasecmp.c strncasecmp.c
 SRCS = $(LIBSRCS) \
 	addext.c argmatch.c backupfile.c \
 	basename.c dirname.c \
-	error.c exitfail.c \
 	getopt.c getopt1.c inp.c \
 	maketime.c partime.c \
 	patch.c pch.c \
@@ -75,15 +74,14 @@ SRCS = $(LIBSRCS) \
 OBJS = $(LIBOBJS) \
 	addext.$(OBJEXT) argmatch.$(OBJEXT) backupfile.$(OBJEXT) \
 	basename.$(OBJEXT) dirname.$(OBJEXT) \
-	error.$(OBJEXT) exitfail.$(OBJEXT) \
 	getopt.$(OBJEXT) getopt1.$(OBJEXT) inp.$(OBJEXT) \
 	maketime.$(OBJEXT) partime.$(OBJEXT) \
 	patch.$(OBJEXT) pch.$(OBJEXT) \
 	quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \
 	util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT)
 HDRS = argmatch.h backupfile.h common.h dirname.h \
-	error.h exitfail.h getopt.h \
-	inp.h maketime.h partime.h patchlevel.h pch.h \
+	error.h getopt.h \
+	inp.h maketime.h partime.h pch.h \
 	quote.h quotearg.h quotesys.h \
 	unlocked-io.h util.h version.h xalloc.h
 MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \
@@ -137,20 +135,33 @@ config.hin: configure.ac $(srcdir)/aclocal.m4
 	cd $(srcdir) && rm -f config.hin && autoheader
 
 M4DIR = $(srcdir)/m4
-ACINCLUDE_INPUTS = $(M4DIR)/c-bs-a.m4 $(M4DIR)/d-ino.m4 $(M4DIR)/error.m4 \
-  $(M4DIR)/jm-glibc-io.m4 $(M4DIR)/malloc.m4 $(M4DIR)/mbstate_t.m4 \
-  $(M4DIR)/mkdir.m4 $(M4DIR)/mbrtowc.m4 \
-  $(M4DIR)/prereq.m4 $(M4DIR)/realloc.m4 \
-  $(M4DIR)/setmode.m4 $(M4DIR)/utimbuf.m4
+ACINCLUDE_INPUTS = \
+  $(M4DIR)/backupfile.m4 \
+  $(M4DIR)/d-ino.m4 \
+  $(M4DIR)/dirname.m4 \
+  $(M4DIR)/dos.m4 \
+  $(M4DIR)/error.m4 \
+  $(M4DIR)/getopt.m4 \
+  $(M4DIR)/malloc.m4 \
+  $(M4DIR)/mbrtowc.m4 \
+  $(M4DIR)/mbstate_t.m4 \
+  $(M4DIR)/memchr.m4 \
+  $(M4DIR)/mkdir.m4 \
+  $(M4DIR)/onceonly.m4 \
+  $(M4DIR)/quote.m4 \
+  $(M4DIR)/quotearg.m4 \
+  $(M4DIR)/realloc.m4 \
+  $(M4DIR)/rmdir.m4 \
+  $(M4DIR)/setmode.m4 \
+  $(M4DIR)/unlocked-io.m4 \
+  $(M4DIR)/utimbuf.m4 \
+  $(M4DIR)/xalloc.m4
 
 $(srcdir)/aclocal.m4: $(ACINCLUDE_INPUTS)
 	cat $(ACINCLUDE_INPUTS) >$(srcdir)/aclocal.m4
 
-patchlevel.h: configure
-	echo '#define PATCH_VERSION "$(PACKAGE_VERSION)"' >patchlevel.h
-
-TAGS: $(HDRS) patchlevel.h $(SRCS)
-	etags $(HDRS) patchlevel.h $(SRCS)
+TAGS: $(HDRS) $(SRCS)
+	etags $(HDRS) $(SRCS)
 
 mostlyclean::
 	rm -f core* *core *.$(OBJEXT) *_.c
@@ -181,22 +192,25 @@ dist:: $(DISTFILES) $(DISTFILES_M4) $(DISTFILES_PC) $(DISTFILES_PC_DJGPP)
 
 $(OBJS): config.h
 addext.$(OBJEXT): backupfile.h dirname.h
-argmatch.$(OBJEXT): argmatch.h error.h quote.h quotearg.h unlocked-io.h
+argmatch.$(OBJEXT): argmatch.h gettext.h error.h \
+	quote.h quotearg.h unlocked-io.h
 backupfile.$(OBJEXT): argmatch.h backupfile.h dirname.h
 basename.$(OBJEXT): dirname.h
-error.$(OBJEXT): error.h unlocked-io.h
+dirname.$(OBJEXT): dirname.h xalloc.h
+error.$(OBJEXT): error.h gettext.h unlocked-io.h
 getopt.$(OBJEXT) getopt1.$(OBJEXT): getopt.h
 inp.$(OBJEXT): backupfile.h common.h inp.h pch.h quotearg.h util.h xalloc.h
 maketime.$(OBJEXT): maketime.h partime.h
 mkdir.$(OBJEXT): dirname.h xalloc.h
 partime.$(OBJEXT): partime.h
-patch.$(OBJEXT): argmatch.h backupfile.h common.h exitfail.h getopt.h inp.h \
+patch.$(OBJEXT): argmatch.h backupfile.h common.h getopt.h inp.h \
 	pch.h quotearg.h util.h version.h xalloc.h
 pch.$(OBJEXT): backupfile.h common.h dirname.h inp.h pch.h quotearg.h util.h
-quotearg.$(OBJEXT): quotearg.h xalloc.h
+quote.$(OBJECT): quote.h quotearg.h
+quotearg.$(OBJEXT): gettext.h quotearg.h xalloc.h
 quotesys.$(OBJEXT): quotesys.h
-rename.$(OBJEXT): dirname.h xalloc.h
+strncasecmp.$(OBJEXT): strcasecmp.c
 util.$(OBJEXT): backupfile.h common.h dirname.h maketime.h \
 	partime.h quotearg.h quotesys.h util.h version.h xalloc.h
-version.$(OBJEXT): common.h patchlevel.h util.h version.h
-xmalloc.$(OBJEXT): exitfail.h xalloc.h
+version.$(OBJEXT): common.h version.h
+xmalloc.$(OBJEXT): error.h gettext.h xalloc.h