From 4fafb3d376d5bdc8f79e13f3daa3a5b58fc714b7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 17 Sep 2013 00:17:23 -0400 Subject: [PATCH] Makefile: fix LDFLAGS handling We need these flags to come before all the objects, not after. Otherwise, flags that impact handling of input objects do not show up in time. This also matches standard build system behavior (e.g. autotools). Signed-off-by: Mike Frysinger --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 32a2b56..b381378 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ endif CC ?= gcc CFLAGS ?=-Wall -g $(CFLAGS_COV) -LIBS=$(LDFLAGS) +LIBS= OBJS=common.o sslh-main.o probe.o ifneq ($(strip $(USELIBWRAP)),) @@ -42,15 +42,15 @@ version.h: sslh: $(OBJS) sslh-fork sslh-select sslh-fork: $(OBJS) sslh-fork.o Makefile common.h version.h - $(CC) $(CFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) #strip sslh-fork sslh-select: $(OBJS) sslh-select.o Makefile common.h version.h - $(CC) $(CFLAGS) -o sslh-select sslh-select.o $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-select sslh-select.o $(OBJS) $(LIBS) #strip sslh-select echosrv: $(OBJS) echosrv.o - $(CC) $(CFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS) $(MAN): sslh.pod Makefile pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip -9 - > $(MAN)