]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Explicitly specify source files for regress tools.
authorDarren Tucker <dtucker@zip.com.au>
Mon, 18 Jul 2016 07:22:49 +0000 (17:22 +1000)
committerDarren Tucker <dtucker@zip.com.au>
Mon, 18 Jul 2016 07:22:49 +0000 (17:22 +1000)
Since adding $(REGRESSLIBS), $? is wrong because it includes only the
changed source files.  $< seems like it'd be right however it doesn't
seem to work on some non-GNU makes, so do what works everywhere.

Makefile.in

index e324f6538cce603fa4ea7fc8d562c405a49916e7..12991cd9f7135a2851551e12fe70858a0ce63291 100644 (file)
@@ -430,19 +430,19 @@ regress-prep:
 REGRESSLIBS=libssh.a $(LIBCOMPAT)
 
 regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS)
-       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \
        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
 regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c $(REGRESSLIBS)
-       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/setuid-allowed.c \
        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
 regress/netcat$(EXEEXT): $(srcdir)/regress/netcat.c $(REGRESSLIBS)
-       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/netcat.c \
        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
 regress/check-perm$(EXEEXT): $(srcdir)/regress/check-perm.c $(REGRESSLIBS)
-       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/check-perm.c \
        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
 UNITTESTS_TEST_HELPER_OBJS=\