Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b91b50c
)
Trying out Paul Green's IRIX patch to see if it fixes the syntax
author
Wayne Davison
<wayned@samba.org>
Sat, 18 Jan 2003 18:52:50 +0000
(18:52 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 18 Jan 2003 18:52:50 +0000
(18:52 +0000)
error in the Makefile.
Makefile.in
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.in
b/Makefile.in
index
6e91248
..
e124936
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-43,8
+43,13
@@
OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
TLS_OBJ = tls.o syscall.o lib/permstring.o
# Programs we must have to run the test cases
TLS_OBJ = tls.o syscall.o lib/permstring.o
# Programs we must have to run the test cases
-CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) \
- trimslash$(EXEEXT) t_unsafe$(EXEEXT)
+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)
# Objects for CHECK_PROGS to clean
CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o
# Objects for CHECK_PROGS to clean
CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o
@@
-55,13
+60,13
@@
CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o
$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
@OBJ_RESTORE@
$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
@OBJ_RESTORE@
-all:
rsync$(EXEEXT
)
+all:
$(RSYNC_EXE
)
man: rsync.1 rsyncd.conf.5
install: all
-mkdir -p ${DESTDIR}${bindir}
man: rsync.1 rsyncd.conf.5
install: all
-mkdir -p ${DESTDIR}${bindir}
- ${INSTALLCMD} ${STRIP} -m 755
rsync$(EXEEXT
) ${DESTDIR}${bindir}
+ ${INSTALLCMD} ${STRIP} -m 755
$(RSYNC_EXE
) ${DESTDIR}${bindir}
-mkdir -p ${DESTDIR}${mandir}/man1
-mkdir -p ${DESTDIR}${mandir}/man5
${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
-mkdir -p ${DESTDIR}${mandir}/man1
-mkdir -p ${DESTDIR}${mandir}/man5
${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
@@
-70,24
+75,24
@@
install: all
install-strip:
$(MAKE) STRIP='-s' install
install-strip:
$(MAKE) STRIP='-s' install
-
rsync$(EXEEXT
): $(OBJS)
+
$(RSYNC_EXE
): $(OBJS)
@echo "Please ignore warnings below about mktemp -- it is used in a safe way"
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(OBJS): config.h
@echo "Please ignore warnings below about mktemp -- it is used in a safe way"
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(OBJS): config.h
-
tls$(EXEEXT
): $(TLS_OBJ)
+
$(TLS_EXE
): $(TLS_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
-
getgroups$(EXEEXT
): getgroups.o
+
$(GETGROUPS_EXE
): getgroups.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)
TRIMSLASH_OBJ = trimslash.o syscall.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)
TRIMSLASH_OBJ = trimslash.o syscall.o
-
trimslash$(EXEEXT
): $(TRIMSLASH_OBJ)
+
$(TRIMSLASH_EXE
): $(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
$(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$(EXEEXT
): $(T_UNSAFE_OBJ)
+
$(T_UNSAFE_EXE
): $(T_UNSAFE_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
# I don't like these rules because CVS can skew the timestamps and
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
# I don't like these rules because CVS can skew the timestamps and
@@
-157,14
+162,14
@@
test: check
# might lose in the future where POSIX diverges from old sh.
check: all $(CHECK_PROGS)
# 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
+ POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/
$(RSYNC_EXE
) srcdir="$(srcdir)" $(srcdir)/runtests.sh
# 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)
# 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$(EXEEXT
)" srcdir="$(srcdir)" $(srcdir)/runtests.sh
+ POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/
$(RSYNC_EXE
)" srcdir="$(srcdir)" $(srcdir)/runtests.sh
# TODO: Add 'dist' target; need to know which files will be included
# TODO: Add 'dist' target; need to know which files will be included