X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/37adeae73e9e590082d1247eeb8f216db18b24dc..a5fd4b6e6e3d4649f0f65cd4a0385283fe69154c:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e2c2ed12..8594a9de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,13 +80,21 @@ $(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) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >/dev/null 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 \
+	    echo "Failed to create rounding.h!"; \
+	    exit 1; \
+	fi
 
 tls$(EXEEXT): $(TLS_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
@@ -119,9 +127,13 @@ 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'
+	@echo '  make reconfigure'
 	@exit 1
 
+reconfigure:
+	./config.status --recheck
+	./config.status
+
 proto: proto.h-tstamp
 
 proto.h: proto.h-tstamp
@@ -142,7 +154,7 @@ rsyncd.conf.5: rsyncd.conf.yo
 
 clean: cleantests
 	rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
-		mkrounding mkrounding.h rounding.h
+		rounding rounding.h
 
 cleantests:
 	rm -rf ./testtmp*