Move all source and header files into src/

1 files changed, 59 insertions, 56 deletions

diff --git a/Makefile.in b/Makefile.in
index b2c57aa..5ee13fd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,35 +65,35 @@ CONFIG_STATUS = config.status
 
 SHELL = /bin/sh
 
-LIBSRCS = error.c malloc.c memchr.c \
-	realloc.c strcasecmp.c strncasecmp.c
+LIBSRCS = src/error.c src/malloc.c src/memchr.c \
+	src/realloc.c src/strcasecmp.c src/strncasecmp.c
 SRCS = $(LIBSRCS) \
-	addext.c argmatch.c backupfile.c \
-	basename.c dirname.c exitfail.c \
-	getopt.c getopt1.c hash.c inp.c \
-	maketime.c merge.c partime.c \
-	patch.c pch.c \
-	quote.c quotearg.c quotesys.c \
-	util.c version.c xmalloc.c
+	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 \
+	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
 OBJS := $(LIBOBJS) \
-	addext.$(OBJEXT) argmatch.$(OBJEXT) backupfile.$(OBJEXT) \
-	basename.$(OBJEXT) dirname.$(OBJEXT) exitfail.$(OBJEXT) \
-	getopt.$(OBJEXT) getopt1.$(OBJEXT) hash.$(OBJEXT) inp.$(OBJEXT) \
-	maketime.$(OBJEXT) partime.$(OBJEXT) \
-	patch.$(OBJEXT) pch.$(OBJEXT) \
-	quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \
-	util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT)
+	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) \
+	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)
 ifeq ($(ENABLE_MERGE),1)
-OBJS += merge.$(OBJEXT)
+OBJS += src/merge.$(OBJEXT)
 endif
-HDRS = argmatch.h backupfile.h bestmatch.h common.h diffseq.h dirname.h \
-	error.h exitfail.h getopt.h gettext.h hash.h \
-	inp.h maketime.h minmax.h partime.h pch.h \
-	quote.h quotearg.h quotesys.h \
-	unlocked-io.h util.h version.h xalloc.h
+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
 MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README VERSION \
 	aclocal.m4 config.hin configure configure.ac install-sh \
-	mkinstalldirs patch.man stdbool_.h tests/test-lib.sh \
+	mkinstalldirs patch.man src/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 \
@@ -102,7 +102,7 @@ MORE_DISTFILES = $(TESTS) $(BROKEN_TESTS)
 
 patch_name = `echo patch | sed '$(transform)'`
 
-all:: patch$(EXEEXT)
+all:: src/patch$(EXEEXT)
 
 info::
 installcheck::
@@ -141,17 +141,17 @@ 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) $(CFLAGS)
+	$(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src $(CFLAGS)
 
 .c.$(OBJEXT):
-	$(COMPILE) $<
+	$(COMPILE) -o $@ $<
 
-patch$(EXEEXT): $(OBJS)
+src/patch$(EXEEXT): $(OBJS)
 	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
 
 install:: all
 	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
-	$(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)$(bindir)/$(patch_name)$(EXEEXT)
+	$(INSTALL_PROGRAM) src/patch$(EXEEXT) $(DESTDIR)$(bindir)/$(patch_name)$(EXEEXT)
 	$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)$(man1dir)/$(patch_name)$(man1ext)
 
 install-strip::
@@ -211,10 +211,10 @@ TAGS: $(HDRS) $(SRCS)
 	etags $(HDRS) $(SRCS)
 
 mostlyclean::
-	rm -f core* *core *.$(OBJEXT) *_.c stdbool.h stdbool.h-t
+	rm -f core* *core src/*.$(OBJEXT) src/*_.c src/stdbool.h src/stdbool.h-t
 
 clean:: mostlyclean
-	rm -f patch$(EXEEXT)
+	rm -f src/patch$(EXEEXT)
 
 distclean:: clean
 	rm -f Makefile config.cache config.hin~ config.log config.status \
@@ -245,29 +245,32 @@ dist:: $(DISTFILES)
 	echo -e "\n# gnupload --to $$whereto.gnu.org:patch $(PV).tar.gz\n"
 
 $(OBJS): config.h
-COMMON = common.h $(STDBOOL_H)
-addext.$(OBJEXT): backupfile.h dirname.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
-dirname.$(OBJEXT): dirname.h xalloc.h
-error.$(OBJEXT): error.h gettext.h unlocked-io.h
-exitfail.$(OBJEXT): exitfail.h
-getopt.$(OBJEXT) getopt1.$(OBJEXT): getopt.h
-hash.$(OBJEXT): $(STDBOOL_H) hash.h
-inp.$(OBJEXT): backupfile.h $(COMMON) inp.h pch.h quotearg.h util.h xalloc.h
-maketime.$(OBJEXT): maketime.h partime.h
-partime.$(OBJEXT): partime.h
-patch.$(OBJEXT): argmatch.h backupfile.h $(COMMON) exitfail.h getopt.h inp.h \
-	pch.h quotearg.h util.h version.h xalloc.h
-pch.$(OBJEXT): backupfile.h $(COMMON) dirname.h inp.h pch.h quotearg.h util.h
-quote.$(OBJECT): quote.h quotearg.h
-quotearg.$(OBJEXT): gettext.h quotearg.h xalloc.h
-quotesys.$(OBJEXT): quotesys.h
-strncasecmp.$(OBJEXT): strcasecmp.c
-util.$(OBJEXT): backupfile.h $(COMMON) dirname.h hash.h maketime.h \
-	partime.h quotearg.h quotesys.h util.h version.h xalloc.h
-
-version.$(OBJEXT): $(COMMON) version.h
-xmalloc.$(OBJEXT): error.h exitfail.h gettext.h xalloc.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
+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/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
+src/version.$(OBJEXT): $(COMMON) src/version.h
+src/xmalloc.$(OBJEXT): src/error.h src/exitfail.h src/gettext.h src/xalloc.h