X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ef6122c6229001f8d0ba001824dce49ff6a05008..16edf86595a5a990a942fa045dfb523dae1fe6cb:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 87d0c8a9..0764c3f0 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,34 +26,29 @@ VERSION=@VERSION@ .SUFFIXES: .SUFFIXES: .c .o -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 +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.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 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 # Programs we must have to run the test cases -RSYNC_EXE=rsync$(EXEEXT) -TLS_EXE=tls$(EXEEXT) -GETGROUPS_EXE=getgroups$(EXEEXT) -TRIMSLASH_EXE=trimslash$(EXEEXT) -T_UNSAFE_EXE=t_unsafe$(EXEEXT) -CHECK_PROGS=$(RSYNC_EXE) $(TLS_EXE) $(GETGROUPS_EXE) \ - $(TRIMSLASH_EXE) $(T_UNSAFE_EXE) +CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \ + trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT) # Objects for CHECK_PROGS to clean -CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o +CHECK_OBJS=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: @@ -60,63 +56,63 @@ CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@ @OBJ_RESTORE@ -all: $(RSYNC_EXE) - -man: rsync.1 rsyncd.conf.5 +all: rsync$(EXEEXT) install: all -mkdir -p ${DESTDIR}${bindir} - ${INSTALLCMD} ${STRIP} -m 755 $(RSYNC_EXE) ${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 install-strip: - $(MAKE) STRIP='-s' install + $(MAKE) INSTALL_STRIP='-s' install -$(RSYNC_EXE): $(OBJS) +rsync$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -$(OBJS): config.h +$(OBJS): $(HEADERS) + +flist.o: rounding.h + +rounding.h: mkrounding$(EXEEXT) + ./mkrounding$(EXEEXT) >rounding.h -$(TLS_EXE): $(TLS_OBJ) +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 + +tls$(EXEEXT): $(TLS_OBJ) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) -$(GETGROUPS_EXE): getgroups.o +getgroups$(EXEEXT): getgroups.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS) -TRIMSLASH_OBJ = trimslash.o syscall.o -$(TRIMSLASH_EXE): $(TRIMSLASH_OBJ) +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_EXE): $(T_UNSAFE_OBJ) +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. - -#Makefile: Makefile.in configure config.status -# echo "WARNING: You need to run ./config.status --recheck" +gen: + cd $(srcdir) && $(MAKE) -f prepare-source.mak gen -# don't actually run autoconf, just issue a warning -#configure: configure.in -# echo "WARNING: you need to rerun autoconf" - -$(srcdir)/rsync.1: $(srcdir)/rsync.yo - yodl2man -o $(srcdir)/rsync.1 $(srcdir)/rsync.yo - -$(srcdir)/rsyncd.conf.5: $(srcdir)/rsyncd.conf.yo - yodl2man -o $(srcdir)/rsyncd.conf.5 $(srcdir)/rsyncd.conf.yo +man: + cd $(srcdir) && $(MAKE) -f prepare-source.mak man proto: - cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h + cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h clean: cleantests - rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) + rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) \ + mkrounding mkrounding.h rounding.h cleantests: rm -rf ./testtmp* @@ -150,9 +146,6 @@ 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. @@ -161,14 +154,21 @@ test: check # might lose in the future where POSIX diverges from old sh. check: all $(CHECK_PROGS) - POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/$(RSYNC_EXE) srcdir="$(srcdir)" $(srcdir)/runtests.sh + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh + +check29: all $(CHECK_PROGS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29 + +wildtest.o: wildtest.c lib/wildmatch.c rsync.h +wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ $(LIBS) # 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) - POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/$(RSYNC_EXE)" srcdir="$(srcdir)" $(srcdir)/runtests.sh + 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