Switch the checking of preserve_[ug]id var to checking [ug]id_ndx var

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0764c3f..383a509 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ VERSION=@VERSION@
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
+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/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 \
@@ -41,12 +41,14 @@ 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)
 
+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
 
@@ -111,7 +113,7 @@ proto:
        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) $(CHECK_SYMLINKS) \
                mkrounding mkrounding.h rounding.h
 
 cleantests:
@@ -142,7 +144,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,21 +154,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)
+check: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
        rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh
 
-check29: all $(CHECK_PROGS)
+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$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o
+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
+
 # 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