Make sure that the test programs get rebuilt when a header

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0d4ab1e..9e61f4e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ VERSION=@VERSION@
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-GENFILES=configure.sh config.h.in proto.h rsync.1 rsyncd.conf.5
+GENFILES=configure.sh config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5
 HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h lib/pool_alloc.h
 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
        lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
@@ -59,7 +59,7 @@ CHECK_OBJS=getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
        $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@
 
-all: rsync$(EXEEXT) @MAKE_MAN@
+all: conf_stop rsync$(EXEEXT) @MAKE_MAN@
 
 install: all
        -mkdir -p ${DESTDIR}${bindir}
@@ -75,8 +75,6 @@ install-strip:
 rsync$(EXEEXT): $(OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(OBJS): $(HEADERS)
-
 flist.o: rounding.h
 
 rounding.h: mkrounding$(EXEEXT)
@@ -104,21 +102,32 @@ T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o
 t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
 
+$(OBJS) $(TLS_OBJ) $(TRIMSLASH_OBJ) $(T_UNSAFE_OBJ): $(HEADERS)
+
 gen: conf proto.h man
 
+gensend: gen
+       rsync -aivzc $(GENFILES) samba.org:/home/ftp/pub/rsync/generated-files/
+
 conf:
        cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
-gensend: gen
-       rsync -aivzc $(GENFILES) samba.org:/home/ftp/pub/rsync/generated-files/
+conf_stop: configure.sh config.h.in
+
+configure.sh config.h.in: configure.in aclocal.m4
+       autoconf -o configure.sh
+       autoheader && touch config.h.in
+       @echo 'Configure files changed -- perhaps run:'
+       @echo '  ./config.status --recheck; ./config.status'
+       @exit 1
 
 proto: proto.h-tstamp
 
 proto.h: proto.h-tstamp
+       @echo ' ' >/dev/null
 
 proto.h-tstamp: *.c lib/compat.c
        perl mkproto.pl *.c lib/compat.c
-       touch proto.h-tstamp
 
 man: rsync.1 rsyncd.conf.5
 
@@ -177,7 +186,7 @@ check: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
 check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
        rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29
 
-wildtest.o: wildtest.c lib/wildmatch.c rsync.h
+wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h
 wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ $(LIBS)