diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-06-06 05:12:35 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-06 05:12:35 +1000 |
commit | dc62edbf121c41e8b5270904091039450206d98a (patch) | |
tree | 91398b93b49b6aab1af677f11b3ad8cf2b419815 | |
parent | 2a22873cd869679415104bc9f6bb154811ee604c (diff) |
- (dtucker) [Makefile.in] append $CFLAGS to compiler options when building
modpipe in case there's anything in there we need.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -7,6 +7,8 @@ | |||
7 | forwarding test is extremely slow copying data on some machines so switch | 7 | forwarding test is extremely slow copying data on some machines so switch |
8 | back to copying the much smaller ls binary until we can figure out why | 8 | back to copying the much smaller ls binary until we can figure out why |
9 | this is. | 9 | this is. |
10 | - (dtucker) [Makefile.in] append $CFLAGS to compiler options when building | ||
11 | modpipe in case there's anything in there we need. | ||
10 | 12 | ||
11 | 20130602 | 13 | 20130602 |
12 | - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy | 14 | - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy |
diff --git a/Makefile.in b/Makefile.in index 438baaca6..d6f6a7924 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.338 2013/06/02 01:38:23 tim Exp $ | 1 | # $Id: Makefile.in,v 1.339 2013/06/05 19:12:35 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -385,7 +385,7 @@ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c | |||
385 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress | 385 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress |
386 | [ -f `pwd`/regress/Makefile ] || \ | 386 | [ -f `pwd`/regress/Makefile ] || \ |
387 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile | 387 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile |
388 | $(CC) $(CPPFLAGS) -o $@ $? \ | 388 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ |
389 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 389 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
390 | 390 | ||
391 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | 391 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) |