Add missing compat bits

diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
index f60364e1a43b9892fd5ca14e9b7b5a1a5315a17b..136b54faefde388cf462f7eb1fec4c5d0b6d3767 100644 (file)
--- a/plugins/sample/Makefile.in
+++ b/plugins/sample/Makefile.in
@@ -24,6 +24,7 @@ devdir = @devdir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 incdir = $(top_srcdir)/include
+compat = $(top_srcdir)/compat
 
 # Compiler & tools to use
 CC = @CC@
@@ -86,38 +87,42 @@ sample_plugin.la: sample_plugin.lo $(LTLIBOBJS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sample_plugin.lo $(LTLIBOBJS) -module -avoid-version -rpath $(plugindir)
 
 # Compat dependencies
-$(LIBOBJDIR)closefrom.lo: $(top_srcdir)/compat/closefrom.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/closefrom.c
-$(LIBOBJDIR)getcwd.lo: $(top_srcdir)/compat/getcwd.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/getcwd.c
-$(LIBOBJDIR)getline.lo: $(top_srcdir)/compat/getline.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/getline.c
-$(LIBOBJDIR)getprogname.lo: $(top_srcdir)/compat/getprogname.c  $(incdir)/compat.h$(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/getprogname.c
-$(LIBOBJDIR)isblank.lo: $(top_srcdir)/compat/isblank.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/isblank.c
-$(LIBOBJDIR)memrchr.lo: $(top_srcdir)/compat/memrchr.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/memrchr.c
-$(LIBOBJDIR)mkstemp.lo: $(top_srcdir)/compat/mkstemp.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/mkstemp.c
-$(LIBOBJDIR)nanosleep.lo: $(top_srcdir)/compat/nanosleep.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/nanosleep.c
-$(LIBOBJDIR)sigaction.lo: $(top_srcdir)/compat/sigaction.c $(incdir)/compat.h $(incdir)/compat.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/sigaction.c
-$(LIBOBJDIR)snprintf.lo: $(top_srcdir)/compat/snprintf.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/snprintf.c
-$(LIBOBJDIR)strcasecmp.lo: $(top_srcdir)/compat/strcasecmp.c $(incdir)/compat.h  $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strcasecmp.c
-$(LIBOBJDIR)strerror.lo: $(top_srcdir)/compat/strerror.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strerror.c
-$(LIBOBJDIR)strlcat.lo: $(top_srcdir)/compat/strlcat.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strlcat.c
-$(LIBOBJDIR)strlcpy.lo: $(top_srcdir)/compat/strlcpy.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strlcpy.c
-$(LIBOBJDIR)strsignal.lo: $(top_srcdir)/compat/strsignal.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strsignal.c
-$(LIBOBJDIR)utimes.lo: $(top_srcdir)/compat/utimes.c $(incdir)/compat.h $(top_srcdir)/compat/compat/utime.h $(top_builddir)/config.h
-       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/utimes.c
+$(LIBOBJDIR)closefrom.lo: $(compat)/closefrom.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/closefrom.c
+$(LIBOBJDIR)fnmatch.lo: $(compat)/fnmatch.c $(compat)/fnmatch.h $(compat)/charclass.h $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/fnmatch.c
+$(LIBOBJDIR)getcwd.lo: $(compat)/getcwd.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/getcwd.c
+$(LIBOBJDIR)getline.lo: $(compat)/getline.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/getline.c
+$(LIBOBJDIR)getprogname.lo: $(compat)/getprogname.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/getprogname.c
+$(LIBOBJDIR)glob.lo: $(compat)/glob.c $(compat)/glob.h $(compat)/charclass.h $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/glob.c
+$(LIBOBJDIR)isblank.lo: $(compat)/isblank.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/isblank.c
+$(LIBOBJDIR)memrchr.lo: $(compat)/memrchr.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/memrchr.c
+$(LIBOBJDIR)mkstemp.lo: $(compat)/mkstemp.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/mkstemp.c
+$(LIBOBJDIR)nanosleep.lo: $(compat)/nanosleep.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/nanosleep.c
+$(LIBOBJDIR)sigaction.lo: $(compat)/sigaction.c $(incdir)/compat.h $(incdir)/compat.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/sigaction.c
+$(LIBOBJDIR)snprintf.lo: $(compat)/snprintf.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/snprintf.c
+$(LIBOBJDIR)strcasecmp.lo: $(compat)/strcasecmp.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strcasecmp.c
+$(LIBOBJDIR)strerror.lo: $(compat)/strerror.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strerror.c
+$(LIBOBJDIR)strlcat.lo: $(compat)/strlcat.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strlcat.c
+$(LIBOBJDIR)strlcpy.lo: $(compat)/strlcpy.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strlcpy.c
+$(LIBOBJDIR)strsignal.lo: $(compat)/strsignal.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strsignal.c
+$(LIBOBJDIR)utimes.lo: $(compat)/utimes.c $(incdir)/compat.h $(compat)/utime.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/utimes.c
 
 install: install-dirs install-plugin
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 26dbeb926fdae09e90ac3105450c5d7032b696b9..aa9936d969eaa85b4874ddbc50f21ff465b4be8e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -24,6 +24,7 @@ devdir = @devdir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 incdir = $(top_srcdir)/include
+compat = $(top_srcdir)/compat
 
 # Compiler & tools to use
 CC = @CC@
@@ -152,38 +153,42 @@ zero_bytes.o: $(srcdir)/zero_bytes.c $(incdir)/compat.h $(top_builddir)/config.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/zero_bytes.c
 
 # Compat dependencies
-$(LIBOBJDIR)closefrom.o: $(top_srcdir)/compat/closefrom.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/closefrom.c
-$(LIBOBJDIR)getcwd.o: $(top_srcdir)/compat/getcwd.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/getcwd.c
-$(LIBOBJDIR)getline.o: $(top_srcdir)/compat/getline.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/getline.c
-$(LIBOBJDIR)getprogname.o: $(top_srcdir)/compat/getprogname.c  $(incdir)/compat.h$(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/getprogname.c
-$(LIBOBJDIR)isblank.o: $(top_srcdir)/compat/isblank.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/isblank.c
-$(LIBOBJDIR)memrchr.o: $(top_srcdir)/compat/memrchr.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/memrchr.c
-$(LIBOBJDIR)mkstemp.o: $(top_srcdir)/compat/mkstemp.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/mkstemp.c
-$(LIBOBJDIR)nanosleep.o: $(top_srcdir)/compat/nanosleep.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/nanosleep.c
-$(LIBOBJDIR)sigaction.o: $(top_srcdir)/compat/sigaction.c $(incdir)/compat.h $(incdir)/compat.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/sigaction.c
-$(LIBOBJDIR)snprintf.o: $(top_srcdir)/compat/snprintf.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/snprintf.c
-$(LIBOBJDIR)strcasecmp.o: $(top_srcdir)/compat/strcasecmp.c $(incdir)/compat.h  $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strcasecmp.c
-$(LIBOBJDIR)strerror.o: $(top_srcdir)/compat/strerror.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strerror.c
-$(LIBOBJDIR)strlcat.o: $(top_srcdir)/compat/strlcat.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strlcat.c
-$(LIBOBJDIR)strlcpy.o: $(top_srcdir)/compat/strlcpy.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strlcpy.c
-$(LIBOBJDIR)strsignal.o: $(top_srcdir)/compat/strsignal.c $(incdir)/compat.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/strsignal.c
-$(LIBOBJDIR)utimes.o: $(top_srcdir)/compat/utimes.c $(incdir)/compat.h $(top_srcdir)/compat/compat/utime.h $(top_builddir)/config.h
-       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(top_srcdir)/compat/utimes.c
+$(LIBOBJDIR)closefrom.o: $(compat)/closefrom.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/closefrom.c
+$(LIBOBJDIR)fnmatch.o: $(compat)/fnmatch.c $(compat)/fnmatch.h $(compat)/charclass.h $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/fnmatch.c
+$(LIBOBJDIR)getcwd.o: $(compat)/getcwd.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/getcwd.c
+$(LIBOBJDIR)getline.o: $(compat)/getline.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/getline.c
+$(LIBOBJDIR)getprogname.o: $(compat)/getprogname.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/getprogname.c
+$(LIBOBJDIR)glob.o: $(compat)/glob.c $(compat)/glob.h $(compat)/charclass.h $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/glob.c
+$(LIBOBJDIR)isblank.o: $(compat)/isblank.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/isblank.c
+$(LIBOBJDIR)memrchr.o: $(compat)/memrchr.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/memrchr.c
+$(LIBOBJDIR)mkstemp.o: $(compat)/mkstemp.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/mkstemp.c
+$(LIBOBJDIR)nanosleep.o: $(compat)/nanosleep.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/nanosleep.c
+$(LIBOBJDIR)sigaction.o: $(compat)/sigaction.c $(incdir)/compat.h $(incdir)/compat.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/sigaction.c
+$(LIBOBJDIR)snprintf.o: $(compat)/snprintf.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/snprintf.c
+$(LIBOBJDIR)strcasecmp.o: $(compat)/strcasecmp.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strcasecmp.c
+$(LIBOBJDIR)strerror.o: $(compat)/strerror.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strerror.c
+$(LIBOBJDIR)strlcat.o: $(compat)/strlcat.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strlcat.c
+$(LIBOBJDIR)strlcpy.o: $(compat)/strlcpy.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strlcpy.c
+$(LIBOBJDIR)strsignal.o: $(compat)/strsignal.c $(incdir)/compat.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/strsignal.c
+$(LIBOBJDIR)utimes.o: $(compat)/utimes.c $(incdir)/compat.h $(compat)/utime.h $(top_builddir)/config.h
+       $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(compat)/utimes.c
 
 install: install-dirs install-binaries @INSTALL_NOEXEC@