Merge branch 'master' into probe-v2

2013-08-20 00:34:27 -04:00
parent b4f8698cb0 0b6494a3fb
commit 1ae210f330
3 changed files with 9 additions and 6 deletions
--- a/src/Makefile
+++ b/src/Makefile
@ -1,8 +1,6 @@
-CC=gcc
-
-CFLAGS=-Wall -pedantic -Wextra -std=gnu99 -I../lib -I./ -Ioutput_modules -O2 -g
-LDFLAGS=-g -pthread
-LDLIBS= -lpcap -lgmp -lm
+CFLAGS+=-Wall -pedantic -Wextra -std=gnu99 -I../lib -I./ -Ioutput_modules -O2 -g
+LDFLAGS+=-g -pthread
+LDLIBS+= -lpcap -lgmp -lm
 TARGETS=zmap
 VPATH=../lib:output_modules:probe_modules
 PREFIX=/usr/local