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:
$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
@OBJ_RESTORE@
-all: conf_stop rsync$(EXEEXT) @MAKE_MAN@
+all: Makefile rsync$(EXEEXT) @MAKE_MAN@
install: all
-mkdir -p ${DESTDIR}${bindir}
${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
-mkdir -p ${DESTDIR}${mandir}/man1
-mkdir -p ${DESTDIR}${mandir}/man5
- if test -f $(srcdir)/rsync.1; then ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi
- if test -f $(srcdir)/rsyncd.conf.5; then ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
+ if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
+ if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
install-strip:
$(MAKE) INSTALL_STRIP='-s' install
$(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)
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)
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
+ @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
+ @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
autoconf -o configure.sh
autoheader && touch config.h.in
- @echo 'Configure files changed -- perhaps run:'
- @echo ' ./config.status --recheck; ./config.status'
- @exit 1
+ @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
+ echo "configure.sh is unchanged."; \
+ rm configure.sh.old; \
+ else \
+ echo "configure.sh has CHANGED."; \
+ fi
+ @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
+ echo "config.h.in is unchanged."; \
+ rm config.h.in.old; \
+ else \
+ echo "config.h.in has CHANGED."; \
+ fi
+ @if test -f configure.sh.old -o -f config.h.in.old; then \
+ if test "$(MAKECMDGOALS)" = reconfigure; then \
+ echo 'Continuing with "make reconfigure".'; \
+ else \
+ echo 'You may need to run:'; \
+ echo ' make reconfigure'; \
+ exit 1; \
+ fi \
+ fi
+
+reconfigure: configure.sh
+ ./config.status --recheck
+ ./config.status
+
+Makefile: Makefile.in config.status configure.sh config.h.in
+ @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
+ @./config.status
+ @if diff Makefile Makefile.old >/dev/null 2>&1; then \
+ echo "Makefile is unchanged."; \
+ rm Makefile.old; \
+ else \
+ if test "$(MAKECMDGOALS)" = reconfigure; then \
+ echo 'Continuing with "make reconfigure".'; \
+ else \
+ echo "Makefile updated -- rerun your make command."; \
+ exit 1; \
+ fi \
+ fi
proto: proto.h-tstamp
proto.h: proto.h-tstamp
- @ls -l proto.h
+ @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi
-proto.h-tstamp: *.c lib/compat.c
- perl mkproto.pl *.c lib/compat.c
+proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
+ perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
man: rsync.1 rsyncd.conf.5
+ @if test -f rsync.1; then :; else cp -p $(srcdir)/rsync.1 .; fi
+ @if test -f rsyncd.conf.5; then :; else cp -p $(srcdir)/rsyncd.conf.5 .; fi
rsync.1: rsync.yo
- yodl2man -o rsync.1 rsync.yo
- -./tweak_manpage rsync.1
+ yodl2man -o rsync.1 $(srcdir)/rsync.yo
+ -$(srcdir)/tweak_manpage rsync.1
rsyncd.conf.5: rsyncd.conf.yo
- yodl2man -o rsyncd.conf.5 rsyncd.conf.yo
- -./tweak_manpage rsyncd.conf.5
+ 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 *.old
cleantests:
rm -rf ./testtmp*
# 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
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)
git.samba.org / rsync.git / blobdiff