@@ -65,13 +65,53 @@ CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test testsuite
6565
6666# Objects for CHECK_PROGS to clean
6767CHECK_OBJS =tls.o testrun.o getgroups.o getfsdev.o t_stub.o t_unsafe.o t_chmod_secure.o t_rename_secure.o t_symlink_secure.o t_secure_relpath.o t_acl.o trimslash.o wildtest.o
68+ CHECK_COMPILE_OBJS =syscall-no-o-directory.o authenticate-no-o-cloexec.o \
69+ rsync-no-o-cloexec.o clientserver-no-o-directory.o \
70+ flist-no-o-directory.o generator-no-o-directory.o \
71+ sender-no-o-directory.o lib/acl-no-o-directory.o access-no-inet6.o
6872
6973# note that the -I. is needed to handle config.h when using VPATH
7074.c.o :
7175@OBJ_SAVE@
7276 $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
7377@OBJ_RESTORE@
7478
79+ syscall-no-o-directory.o : syscall.c $(HEADERS )
80+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
81+ -DRSYNC_TEST_NO_O_DIRECTORY -c $(srcdir ) /syscall.c -o $@
82+
83+ authenticate-no-o-cloexec.o : authenticate.c $(HEADERS )
84+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
85+ -DRSYNC_TEST_NO_O_CLOEXEC -c $(srcdir ) /authenticate.c -o $@
86+
87+ rsync-no-o-cloexec.o : rsync.c $(HEADERS )
88+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
89+ -DRSYNC_TEST_NO_O_CLOEXEC -c $(srcdir ) /rsync.c -o $@
90+
91+ clientserver-no-o-directory.o : clientserver.c $(HEADERS )
92+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
93+ -DRSYNC_TEST_NO_O_DIRECTORY -c $(srcdir ) /clientserver.c -o $@
94+
95+ flist-no-o-directory.o : flist.c $(HEADERS )
96+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
97+ -DRSYNC_TEST_NO_O_DIRECTORY -c $(srcdir ) /flist.c -o $@
98+
99+ generator-no-o-directory.o : generator.c $(HEADERS )
100+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
101+ -DRSYNC_TEST_NO_O_DIRECTORY -c $(srcdir ) /generator.c -o $@
102+
103+ sender-no-o-directory.o : sender.c $(HEADERS )
104+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
105+ -DRSYNC_TEST_NO_O_DIRECTORY -c $(srcdir ) /sender.c -o $@
106+
107+ lib/acl-no-o-directory.o : lib/acl.c $(HEADERS )
108+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
109+ -DRSYNC_TEST_NO_O_DIRECTORY -c $(srcdir ) /lib/acl.c -o $@
110+
111+ access-no-inet6.o : access.c $(HEADERS )
112+ $(CC ) -I. -I$(srcdir ) $(CFLAGS ) $(CPPFLAGS ) \
113+ -DRSYNC_TEST_NO_INET6 -c $(srcdir ) /access.c -o $@
114+
75115# NOTE: consider running "packaging/smart-make" instead of "make" to auto-handle
76116# any changes to configure.sh and the main Makefile prior to a "make all".
77117all : Makefile rsync$(EXEEXT ) stunnel-rsyncd.conf @MAKE_RRSYNC@ @MAKE_MAN@
@@ -300,7 +340,7 @@ rrsync.1: support/rrsync.1.md md-convert Makefile
300340
301341.PHONY : clean
302342clean : cleantests
303- rm -f * ~ $(OBJS ) $(CHECK_PROGS ) $(CHECK_OBJS ) $(CHECK_SYMLINKS ) @MAKE_RRSYNC@ \
343+ rm -f * ~ $(OBJS ) $(CHECK_PROGS ) $(CHECK_OBJS ) $(CHECK_COMPILE_OBJS ) $( CHECK_SYMLINKS ) @MAKE_RRSYNC@ \
304344 git-version.h rounding rounding.h * .old rsync* .1 rsync* .5 @MAKE_RRSYNC_1@ \
305345 * .html daemon-parm.h help-* .h default-* .h proto.h proto.h-tstamp
306346
@@ -347,18 +387,18 @@ test: check
347387# an external harness (e.g. fleettest.py) can invoke runtests.py with its own
348388# options.
349389.PHONY : check-progs
350- check-progs : all $(CHECK_PROGS ) $(CHECK_SYMLINKS )
390+ check-progs : all $(CHECK_PROGS ) $(CHECK_COMPILE_OBJS ) $( CHECK_SYMLINKS )
351391
352392.PHONY : check
353- check : all $(CHECK_PROGS ) $(CHECK_SYMLINKS )
393+ check : all $(CHECK_PROGS ) $(CHECK_COMPILE_OBJS ) $( CHECK_SYMLINKS )
354394 rsync_bin=` pwd` /rsync$(EXEEXT ) $(srcdir ) /runtests.sh
355395
356396.PHONY : check29
357- check29 : all $(CHECK_PROGS ) $(CHECK_SYMLINKS )
397+ check29 : all $(CHECK_PROGS ) $(CHECK_COMPILE_OBJS ) $( CHECK_SYMLINKS )
358398 rsync_bin=` pwd` /rsync$(EXEEXT ) $(srcdir ) /runtests.sh --protocol=29
359399
360400.PHONY : check30
361- check30 : all $(CHECK_PROGS ) $(CHECK_SYMLINKS )
401+ check30 : all $(CHECK_PROGS ) $(CHECK_COMPILE_OBJS ) $( CHECK_SYMLINKS )
362402 rsync_bin=` pwd` /rsync$(EXEEXT ) $(srcdir ) /runtests.sh --protocol=30
363403
364404wildtest.o : wildtest.c t_stub.o lib/wildmatch.c rsync.h config.h
0 commit comments