X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/403dbc1377e985b515c803651d526761fac74163..e3bc529de9b7d0e98c492677f73a8127a1d74d35:/Makefile.in diff --git a/Makefile.in b/Makefile.in index ed3b0c62..e3ee747c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,29 +26,33 @@ VERSION=@VERSION@ .SUFFIXES: .SUFFIXES: .c .o -HEADERS=byteorder.h config.h errcode.h proto.h rsync.h lib/pool_alloc.h -LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \ - lib/permstring.o lib/pool_alloc.o @LIBOBJS@ +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 itypes.h inums.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@ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ - util.o main.o checksum.o match.o syscall.o log.o backup.o -OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \ - fileio.o batch.o clientname.o chmod.o + util.o main.o checksum.o match.o syscall.o log.o backup.o delete.o +OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \ + fileio.o batch.o clientname.o chmod.o acls.o xattrs.o OBJS3=progress.o pipe.o DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ -TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o +TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ # Programs we must have to run the test cases CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \ - trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT) + testrun$(EXEEXT) trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT) + +CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test testsuite/xattrs-hlink.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 testrun.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: @@ -56,15 +60,15 @@ 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: 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 - ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1 - ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5 + 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 @@ -73,20 +77,34 @@ 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 - @sed '1,/^struct file_struct/d; /^}/,$$d' mkrounding.h - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ 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) +testrun$(EXEEXT): testrun.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ testrun.o + getgroups$(EXEEXT): getgroups.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS) @@ -97,22 +115,89 @@ 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 - -man: - cd $(srcdir) && $(MAKE) -f prepare-source.mak man - -proto: - cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h +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 + +configure.sh config.h.in: configure.ac 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 + @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 + @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi + +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 man-copy + +man-copy: + @-if test -f rsync.1; then :; else echo 'Copying srcdir rsync.1'; cp -p $(srcdir)/rsync.1 .; fi + @-if test -f rsyncd.conf.5; then :; else echo 'Copying srcdir rsyncd.conf.5'; cp -p $(srcdir)/rsyncd.conf.5 .; fi + +rsync.1: rsync.yo + yodl2man -o rsync.1 $(srcdir)/rsync.yo + -$(srcdir)/tweak_manpage rsync.1 + +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) \ - mkrounding mkrounding.h rounding.h + rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \ + rounding rounding.h *.old cleantests: rm -rf ./testtmp* @@ -122,12 +207,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 @@ -142,7 +229,6 @@ finddead: test: check - # There seems to be no standard way to specify some variables as # exported from a Makefile apart from listing them like this. @@ -153,18 +239,33 @@ test: check # catch Bash-isms earlier even if we're running on GNU. Of course, we # might lose in the future where POSIX diverges from old sh. -check: all $(CHECK_PROGS) +check: all $(CHECK_PROGS) $(CHECK_SYMLINKS) rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh -wildtest.o: wildtest.c lib/wildmatch.c rsync.h -wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o +check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29 + +check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=30 + +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) +testsuite/chown-fake.test: + ln -s chown.test $(srcdir)/testsuite/chown-fake.test + +testsuite/devices-fake.test: + ln -s devices.test $(srcdir)/testsuite/devices-fake.test + +testsuite/xattrs-hlink.test: + ln -s xattrs.test $(srcdir)/testsuite/xattrs-hlink.test + # This does *not* depend on building or installing: you can use it to # check a version installed from a binary or some other source tree, # if you want. -installcheck: $(CHECK_PROGS) +installcheck: $(CHECK_PROGS) $(CHECK_SYMLINKS) POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/rsync$(EXEEXT)" srcdir="$(srcdir)" $(srcdir)/runtests.sh # TODO: Add 'dist' target; need to know which files will be included