Improved the proto.h target so that a build in a different dir from the

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d398ef0..8a021d1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ VERSION=@VERSION@
 .SUFFIXES:
 .SUFFIXES: .c .o
 
+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@
@@ -50,7 +51,7 @@ CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
 CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test
 
 # Objects for CHECK_PROGS to clean
-CHECK_OBJS=getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
+CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
 
 # note that the -I. is needed to handle config.h when using VPATH
 .c.o:
@@ -58,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)
+all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@
 
 install: all
        -mkdir -p ${DESTDIR}${bindir}
@@ -75,16 +76,27 @@ rsync$(EXEEXT): $(OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 $(OBJS): $(HEADERS)
+$(CHECK_OBJS): $(HEADERS)
 
 flist.o: rounding.h
 
-rounding.h: mkrounding$(EXEEXT)
-       ./mkrounding$(EXEEXT) >rounding.h
-
-mkrounding$(EXEEXT): mkrounding.c rsync.h
-       @sed '1,/^struct file_struct/d; /^}/,$$d' <$(srcdir)/rsync.h >mkrounding.h
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -I. $(srcdir)/mkrounding.c
-       @rm mkrounding.h
+rounding.h: rounding.c rsync.h
+       @for r in 0 1 3; do \
+           if $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >rounding.out 2>&1; then \
+               echo "#define EXTRA_ROUNDING $$r" >rounding.h; \
+               if test -f "$$HOME/build_farm/build_test.fns"; then \
+                   echo "EXTRA_ROUNDING is $$r" >&2; \
+               fi; \
+               break; \
+           fi; \
+       done
+       @rm -f rounding
+       @if test -f rounding.h; then : ; else \
+           cat rounding.out 1>&2; \
+           echo "Failed to create rounding.h!" 1>&2; \
+           exit 1; \
+       fi
+       @rm -f rounding.out
 
 tls$(EXEEXT): $(TLS_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
@@ -99,25 +111,59 @@ TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib/snprintf.o
 trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
 
-T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o
+T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o
 t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
 
-gen:
-       cd $(srcdir) && $(MAKE) -f prepare-source.mak gen
+gen: conf proto.h man
 
 gensend: gen
-       rsync -aivzc configure.sh config.h.in proto.h samba.org:/home/ftp/pub/rsync/generated-files/
+       rsync -aivzc $(GENFILES) samba.org:/home/ftp/pub/rsync/generated-files/
+
+conf:
+       cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
+
+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 '  make reconfigure'
+       @exit 1
+
+reconfigure: configure.sh
+       ./config.status --recheck
+       ./config.status
+
+make_stop: Makefile
+
+Makefile: Makefile.in config.status
+       @./config.status
+       @echo "Makefile updated -- rerun your make command."
+       @exit 1
+
+proto: proto.h-tstamp
+
+proto.h: proto.h-tstamp
+       @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi
+
+proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
+       perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
+
+man: rsync.1 rsyncd.conf.5
 
-man:
-       cd $(srcdir) && $(MAKE) -f prepare-source.mak man
+rsync.1: rsync.yo
+       yodl2man -o rsync.1 $(srcdir)/rsync.yo
+       -$(srcdir)/tweak_manpage rsync.1
 
-proto:
-       cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h
+rsyncd.conf.5: rsyncd.conf.yo
+       yodl2man -o rsyncd.conf.5 $(srcdir)/rsyncd.conf.yo
+       -$(srcdir)/tweak_manpage rsyncd.conf.5
 
 clean: cleantests
-       rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
-               mkrounding mkrounding.h rounding.h
+       rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
+               rounding rounding.h
 
 cleantests:
        rm -rf ./testtmp*
@@ -127,11 +173,14 @@ cleantests:
 # the source directory.
 distclean: clean
        rm -f Makefile config.h config.status
+       rm -f lib/dummy popt/dummy zlib/dummy
        rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status
+       rm -f $(srcdir)/lib/dummy $(srcdir)/popt/dummy $(srcdir)/zlib/dummy
        rm -f config.cache config.log
        rm -f $(srcdir)/config.cache $(srcdir)/config.log
        rm -f shconfig $(srcdir)/shconfig
-       rm -f configure.sh config.h.in proto.h rsync.1 rsyncd.conf.5
+       rm -f $(GENFILES)
+       rm -rf autom4te.cache
 
 # this target is really just for my use. It only works on a limited
 # range of machines and is used to produce a list of potentially
@@ -162,7 +211,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)