X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/37f3ce61bbc464d6c95978590469e9c71f7b535f..60a986f504a2aa5ba95a760248a2e0b357d2e15c:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 4d1fdcc0..8a021d1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,6 +2,7 @@ # Makefile prefix=@prefix@ +datarootdir=@datarootdir@ exec_prefix=@exec_prefix@ bindir=@bindir@ mandir=@mandir@ @@ -25,30 +26,32 @@ VERSION=@VERSION@ .SUFFIXES: .SUFFIXES: .c .o -HEADERS=byteorder.h config.h errcode.h proto.h rsync.h -LIBOBJ=lib/fnmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \ - lib/permstring.o @LIBOBJS@ -ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \ - zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \ - zlib/zutil.o zlib/adler32.o -OBJS1=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 flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ - fileio.o batch.o clientname.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@ +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 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/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) \ +CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \ trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT) +CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test + # Objects for CHECK_PROGS to clean -CHECK_OBJS=getgroups.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: @@ -56,25 +59,44 @@ CHECK_OBJS=getgroups.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) - -man: rsync.1 rsyncd.conf.5 +all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@ install: all -mkdir -p ${DESTDIR}${bindir} - ${INSTALLCMD} ${STRIP} -m 755 rsync$(EXEEXT) ${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 $(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 install-strip: - $(MAKE) STRIP='-s' install + $(MAKE) INSTALL_STRIP='-s' install rsync$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(OBJS): $(HEADERS) +$(CHECK_OBJS): $(HEADERS) + +flist.o: rounding.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) @@ -82,37 +104,66 @@ tls$(EXEEXT): $(TLS_OBJ) getgroups$(EXEEXT): getgroups.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS) -TRIMSLASH_OBJ = trimslash.o syscall.o +getfsdev$(EXEEXT): getfsdev.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS) + +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) -# I don't like these rules because CVS can skew the timestamps and -# produce spurious warnings, and also make "make install" fail if the -# source directory can no longer be found. Since we don't rebuild -# automatically they're kind of lame anyhow. +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 + +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 configure config.status -# echo "WARNING: You need to run ./config.status --recheck" +Makefile: Makefile.in config.status + @./config.status + @echo "Makefile updated -- rerun your make command." + @exit 1 -# don't actually run autoconf, just issue a warning -#configure: configure.in -# echo "WARNING: you need to rerun autoconf" +proto: proto.h-tstamp -$(srcdir)/rsync.1: $(srcdir)/rsync.yo - yodl2man -o $(srcdir)/rsync.1 $(srcdir)/rsync.yo +proto.h: proto.h-tstamp + @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi -$(srcdir)/rsyncd.conf.5: $(srcdir)/rsyncd.conf.yo - yodl2man -o $(srcdir)/rsyncd.conf.5 $(srcdir)/rsyncd.conf.yo +proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c + perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c -proto: - cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h +man: rsync.1 rsyncd.conf.5 + +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) + rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \ + rounding rounding.h cleantests: rm -rf ./testtmp* @@ -122,12 +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 @@ -142,13 +195,9 @@ 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. -# TODO: Tests that depend on built test aide programs like tls need to -# know where the build directory is. - # This depends on building rsync; if we need any helper programs it # should depend on them too. @@ -156,17 +205,27 @@ 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) - POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/rsync$(EXEEXT) srcdir="$(srcdir)" $(srcdir)/runtests.sh +check: all $(CHECK_PROGS) $(CHECK_SYMLINKS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh + +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 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 -wildtest$(EXEEXT): wildtest.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o $(LIBS) +testsuite/devices-fake.test: + ln -s devices.test $(srcdir)/testsuite/devices-fake.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