Temporarily reorder the OBJS line so that the IBM code checker

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 62ecdb7..2959bc3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,6 +2,7 @@
 # Makefile
 
 prefix=@prefix@
+datarootdir=@datarootdir@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 mandir=@mandir@
@@ -38,7 +39,7 @@ 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@
+OBJS=$(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(OBJS1) $(ZLIBOBJ) @BUILD_POPT@
 
 TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
 
@@ -91,13 +92,13 @@ t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
 
 gen:
-       $(MAKE) -C $(srcdir) -f prepare-source.mak gen
+       cd $(srcdir) && $(MAKE) -f prepare-source.mak gen
 
 man:
-       $(MAKE) -C $(srcdir) -f prepare-source.mak man
+       cd $(srcdir) && $(MAKE) -f prepare-source.mak man
 
 proto:
-       $(MAKE) -C $(srcdir) -f prepare-source.mak proto.h
+       cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h
 
 clean: cleantests
        rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
@@ -142,7 +143,7 @@ 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$(EXEEXT) srcdir="$(srcdir)" $(srcdir)/runtests.sh
+       rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh
 
 wildtest.o: wildtest.c lib/wildmatch.c rsync.h
 wildtest$(EXEEXT): wildtest.o lib/compat.o