Fixed the way rsync handles iconv-conversion problems in the file-list:

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5323654..b91b3e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest
        $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@
 
-all: conf_stop rsync$(EXEEXT) @MAKE_MAN@
+all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@
 
 install: all
        -mkdir -p ${DESTDIR}${bindir}
@@ -80,9 +80,9 @@ $(CHECK_OBJS): $(HEADERS)
 
 flist.o: rounding.h
 
-rounding.h: mkrounding.c rsync.h
+rounding.h: rounding.c rsync.h
        @for r in 0 1 3; do \
-           if $(CC) $(CFLAGS) $(LDFLAGS) -o mkrounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/mkrounding.c >/dev/null 2>&1; then \
+           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; \
@@ -90,11 +90,13 @@ rounding.h: mkrounding.c rsync.h
                break; \
            fi; \
        done
-       @rm -f mkrounding
+       @rm -f rounding
        @if test -f rounding.h; then : ; else \
-           echo "Failed to create rounding.h!"; \
+           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)
@@ -109,7 +111,7 @@ 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)
 
@@ -130,10 +132,17 @@ configure.sh config.h.in: configure.in aclocal.m4
        @echo '  make reconfigure'
        @exit 1
 
-reconfigure:
+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
@@ -154,7 +163,7 @@ rsyncd.conf.5: rsyncd.conf.yo
 
 clean: cleantests
        rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
-               mkrounding rounding.h
+               rounding rounding.h
 
 cleantests:
        rm -rf ./testtmp*
@@ -164,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 $(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