From 179d4c3d78bb1d8c9d55a592af4304878aa03df6 Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Sat, 15 Aug 2009 19:17:02 +0000 Subject: [PATCH] Keep user CC and CFLAGS/LDFLAGS. Patch from Victor Ostorga --- src/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index fe15d93..e281142 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,3 @@ -CC = gcc COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o base64.o md5.o common.o CLIENTOBJS = iodine.o CLIENT = ../bin/iodine @@ -9,8 +8,8 @@ OS = `echo $(TARGETOS) | tr "a-z" "A-Z"` ARCH = `uname -m` LIBPATH = -L. -LDFLAGS = -lz `sh osflags $(TARGETOS) link` $(LIBPATH) -CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags` +LDFLAGS += -lz `sh osflags $(TARGETOS) link` $(LIBPATH) +CFLAGS += -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags` all: stateos $(CLIENT) $(SERVER)