Move all Gnulib files into gl/

1 files changed, 72 insertions, 71 deletions

diff --git a/Makefile.in b/Makefile.in
index 5ee13fd..38cb767 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,35 +65,35 @@ CONFIG_STATUS = config.status
 
 SHELL = /bin/sh
 
-LIBSRCS = src/error.c src/malloc.c src/memchr.c \
-	src/realloc.c src/strcasecmp.c src/strncasecmp.c
+LIBSRCS = gl/lib/error.c gl/lib/malloc.c gl/lib/memchr.c \
+	gl/lib/realloc.c gl/lib/strcasecmp.c gl/lib/strncasecmp.c
 SRCS = $(LIBSRCS) \
-	src/addext.c src/argmatch.c src/backupfile.c \
-	src/basename.c src/dirname.c src/exitfail.c \
-	src/getopt.c src/getopt1.c src/hash.c src/inp.c \
+	gl/lib/addext.c gl/lib/argmatch.c gl/lib/backupfile.c \
+	gl/lib/basename.c gl/lib/dirname.c gl/lib/exitfail.c \
+	gl/lib/getopt.c gl/lib/getopt1.c gl/lib/hash.c src/inp.c \
 	src/maketime.c src/merge.c src/partime.c \
 	src/patch.c src/pch.c \
-	src/quote.c src/quotearg.c src/quotesys.c \
-	src/util.c src/version.c src/xmalloc.c
+	gl/lib/quote.c gl/lib/quotearg.c src/quotesys.c \
+	src/util.c src/version.c gl/lib/xmalloc.c
 OBJS := $(LIBOBJS) \
-	src/addext.$(OBJEXT) src/argmatch.$(OBJEXT) src/backupfile.$(OBJEXT) \
-	src/basename.$(OBJEXT) src/dirname.$(OBJEXT) src/exitfail.$(OBJEXT) \
-	src/getopt.$(OBJEXT) src/getopt1.$(OBJEXT) src/hash.$(OBJEXT) src/inp.$(OBJEXT) \
+	gl/lib/addext.$(OBJEXT) gl/lib/argmatch.$(OBJEXT) gl/lib/backupfile.$(OBJEXT) \
+	gl/lib/basename.$(OBJEXT) gl/lib/dirname.$(OBJEXT) gl/lib/exitfail.$(OBJEXT) \
+	gl/lib/getopt.$(OBJEXT) gl/lib/getopt1.$(OBJEXT) gl/lib/hash.$(OBJEXT) src/inp.$(OBJEXT) \
 	src/maketime.$(OBJEXT) src/partime.$(OBJEXT) \
 	src/patch.$(OBJEXT) src/pch.$(OBJEXT) \
-	src/quote.$(OBJEXT) src/quotearg.$(OBJEXT) src/quotesys.$(OBJEXT) \
-	src/util.$(OBJEXT) src/version.$(OBJEXT) src/xmalloc.$(OBJEXT)
+	gl/lib/quote.$(OBJEXT) gl/lib/quotearg.$(OBJEXT) src/quotesys.$(OBJEXT) \
+	src/util.$(OBJEXT) src/version.$(OBJEXT) gl/lib/xmalloc.$(OBJEXT)
 ifeq ($(ENABLE_MERGE),1)
 OBJS += src/merge.$(OBJEXT)
 endif
-HDRS = src/argmatch.h src/backupfile.h src/bestmatch.h src/common.h src/diffseq.h src/dirname.h \
-	src/error.h src/exitfail.h src/getopt.h src/gettext.h src/hash.h \
-	src/inp.h src/maketime.h src/minmax.h src/partime.h src/pch.h \
-	src/quote.h src/quotearg.h src/quotesys.h \
-	src/unlocked-io.h src/util.h src/version.h src/xalloc.h
+HDRS = gl/lib/argmatch.h gl/lib/backupfile.h src/bestmatch.h src/common.h src/diffseq.h gl/lib/dirname.h \
+	gl/lib/error.h gl/lib/exitfail.h gl/lib/getopt.h gl/lib/gettext.h gl/lib/hash.h \
+	src/inp.h src/maketime.h gl/lib/minmax.h src/partime.h src/pch.h \
+	gl/lib/quote.h gl/lib/quotearg.h src/quotesys.h \
+	gl/lib/unlocked-io.h src/util.h src/version.h gl/lib/xalloc.h
 MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README VERSION \
 	aclocal.m4 config.hin configure configure.ac install-sh \
-	mkinstalldirs patch.man src/stdbool_.h tests/test-lib.sh \
+	mkinstalldirs patch.man gl/lib/stdbool_.h tests/test-lib.sh \
 	update-version.sh
 DISTFILES = $(MISC) $(SRCS) $(HDRS) $(M4FILES) \
 	pc/chdirsaf.c pc/djgpp/config.sed pc/djgpp/configure.bat \
@@ -141,7 +141,7 @@ ifeq ($(ENABLE_MERGE),1)
 DEFINE_ENABLE_MERGE := -DENABLE_MERGE
 endif
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
-	$(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src $(CFLAGS)
+	$(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src -I$(srcdir)/gl/lib $(CFLAGS)
 
 .c.$(OBJEXT):
 	$(COMPILE) -o $@ $<
@@ -176,42 +176,41 @@ stdbool.h: stdbool_.h
 	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
 	mv $@-t $@
 
-M4DIR = $(srcdir)/m4
 M4FILES = \
-  $(M4DIR)/backupfile.m4 \
-  $(M4DIR)/d-ino.m4 \
-  $(M4DIR)/dirname.m4 \
-  $(M4DIR)/dos.m4 \
-  $(M4DIR)/error.m4 \
-  $(M4DIR)/exitfail.m4 \
-  $(M4DIR)/extensions.m4 \
-  $(M4DIR)/getopt.m4 \
-  $(M4DIR)/hash.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)/setmode.m4 \
-  $(M4DIR)/st_mtim.m4 \
-  $(M4DIR)/stdbool.m4 \
-  $(M4DIR)/strcase.m4 \
-  $(M4DIR)/unlocked-io.m4 \
-  $(M4DIR)/utimbuf.m4 \
-  $(M4DIR)/xalloc.m4
+	gl/m4/backupfile.m4 \
+	gl/m4/d-ino.m4 \
+	gl/m4/dirname.m4 \
+	gl/m4/dos.m4 \
+	gl/m4/error.m4 \
+	gl/m4/exitfail.m4 \
+	gl/m4/extensions.m4 \
+	gl/m4/getopt.m4 \
+	gl/m4/hash.m4 \
+	gl/m4/malloc.m4 \
+	gl/m4/mbrtowc.m4 \
+	gl/m4/mbstate_t.m4 \
+	gl/m4/memchr.m4 \
+	m4/mkdir.m4 \
+	gl/m4/onceonly.m4 \
+	gl/m4/quote.m4 \
+	gl/m4/quotearg.m4 \
+	gl/m4/realloc.m4 \
+	m4/setmode.m4 \
+	m4/st_mtim.m4 \
+	gl/m4/stdbool.m4 \
+	gl/m4/strcase.m4 \
+	gl/m4/unlocked-io.m4 \
+	gl/m4/utimbuf.m4 \
+	gl/m4/xalloc.m4
 
 $(srcdir)/aclocal.m4: $(M4FILES)
-	aclocal -I m4
+	aclocal -I m4 -I gl/m4
 
 TAGS: $(HDRS) $(SRCS)
 	etags $(HDRS) $(SRCS)
 
 mostlyclean::
-	rm -f core* *core src/*.$(OBJEXT) src/*_.c src/stdbool.h src/stdbool.h-t
+	rm -f core* *core src/*.$(OBJEXT) gl/lib/*.$(OBJEXT) gl/lib/*_.c gl/lib/stdbool.h gl/lib/stdbool.h-t
 
 clean:: mostlyclean
 	rm -f src/patch$(EXEEXT)
@@ -246,31 +245,33 @@ dist:: $(DISTFILES)
 
 $(OBJS): config.h
 COMMON = src/common.h $(STDBOOL_H)
-src/addext.$(OBJEXT): src/backupfile.h src/dirname.h
-src/argmatch.$(OBJEXT): src/argmatch.h src/gettext.h src/error.h \
-	src/quote.h src/quotearg.h src/unlocked-io.h
-src/backupfile.$(OBJEXT): src/argmatch.h src/backupfile.h src/dirname.h
-src/basename.$(OBJEXT): src/dirname.h
-src/dirname.$(OBJEXT): src/dirname.h src/xalloc.h
-src/error.$(OBJEXT): src/error.h src/gettext.h src/unlocked-io.h
-src/exitfail.$(OBJEXT): src/exitfail.h
-src/getopt.$(OBJEXT) getopt1.$(OBJEXT): src/getopt.h
-src/hash.$(OBJEXT): $(STDBOOL_H) src/hash.h
-src/inp.$(OBJEXT): src/backupfile.h $(COMMON) src/inp.h src/pch.h \
-	src/quotearg.h src/util.h src/xalloc.h
+gl/lib/addext.$(OBJEXT): gl/lib/backupfile.h gl/lib/dirname.h
+gl/lib/argmatch.$(OBJEXT): gl/lib/argmatch.h gl/lib/gettext.h gl/lib/error.h \
+	gl/lib/quote.h gl/lib/quotearg.h gl/lib/unlocked-io.h
+gl/lib/backupfile.$(OBJEXT): gl/lib/argmatch.h gl/lib/backupfile.h \
+	gl/lib/dirname.h
+gl/lib/basename.$(OBJEXT): gl/lib/dirname.h
+gl/lib/dirname.$(OBJEXT): gl/lib/dirname.h gl/lib/xalloc.h
+gl/lib/error.$(OBJEXT): gl/lib/error.h gl/lib/gettext.h gl/lib/unlocked-io.h
+gl/lib/exitfail.$(OBJEXT): gl/lib/exitfail.h
+gl/lib/getopt.$(OBJEXT) gl/lib/getopt1.$(OBJEXT): gl/lib/getopt.h
+gl/lib/hash.$(OBJEXT): $(STDBOOL_H) gl/lib/hash.h
+src/inp.$(OBJEXT): gl/lib/backupfile.h $(COMMON) src/inp.h src/pch.h \
+	gl/lib/quotearg.h src/util.h gl/lib/xalloc.h
 src/maketime.$(OBJEXT): src/maketime.h src/partime.h
 src/partime.$(OBJEXT): src/partime.h
-src/patch.$(OBJEXT): src/argmatch.h src/backupfile.h $(COMMON) src/exitfail.h \
-	src/getopt.h src/inp.h src/pch.h src/quotearg.h src/util.h \
-	src/version.h src/xalloc.h
-src/pch.$(OBJEXT): src/backupfile.h $(COMMON) src/dirname.h src/inp.h \
-	src/pch.h src/quotearg.h src/util.h
-src/quote.$(OBJECT): src/quote.h src/quotearg.h
-src/quotearg.$(OBJEXT): src/gettext.h src/quotearg.h src/xalloc.h
+src/patch.$(OBJEXT): gl/lib/argmatch.h gl/lib/backupfile.h $(COMMON) \
+	gl/lib/exitfail.h gl/lib/getopt.h src/inp.h src/pch.h \
+	gl/lib/quotearg.h src/util.h src/version.h gl/lib/xalloc.h
+src/pch.$(OBJEXT): gl/lib/backupfile.h $(COMMON) gl/lib/dirname.h src/inp.h \
+	src/pch.h gl/lib/quotearg.h src/util.h
+gl/lib/quote.$(OBJECT): gl/lib/quote.h gl/lib/quotearg.h
+gl/lib/quotearg.$(OBJEXT): gl/lib/gettext.h gl/lib/quotearg.h gl/lib/xalloc.h
 src/quotesys.$(OBJEXT): src/quotesys.h
-src/strncasecmp.$(OBJEXT): src/strcasecmp.c
-src/util.$(OBJEXT): src/backupfile.h $(COMMON) src/dirname.h src/hash.h \
-	src/maketime.h src/partime.h src/quotearg.h src/quotesys.h src/util.h \
-	src/version.h src/xalloc.h
+gl/lib/strncasecmp.$(OBJEXT): gl/lib/strcasecmp.c
+src/util.$(OBJEXT): gl/lib/backupfile.h $(COMMON) gl/lib/dirname.h \
+	gl/lib/hash.h src/maketime.h src/partime.h gl/lib/quotearg.h \
+	src/quotesys.h src/util.h src/version.h gl/lib/xalloc.h
 src/version.$(OBJEXT): $(COMMON) src/version.h
-src/xmalloc.$(OBJEXT): src/error.h src/exitfail.h src/gettext.h src/xalloc.h
+gl/lib/xmalloc.$(OBJEXT): gl/lib/error.h gl/lib/exitfail.h gl/lib/gettext.h \
+	gl/lib/xalloc.h