Patched to build for Ubuntu 14.04

Thanks to Sheng-Li PAN <[email protected]> for the code.
capveg · Oct 20, 2014 · 7d9ccd0 · 7d9ccd0
1 parent df4cddd
commit 7d9ccd0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/Make.include b/Make.include
@@ -3,7 +3,7 @@ CTAGS=ctags
 CFLAGS+=-Wall -Wpointer-arith -Wshadow 
 
 ifneq ($(shell uname -m),x86_64)
-CFLAGS+=-Werror
+#CFLAGS+=-Werror
 endif
 
 CFLAGS+=-g

diff --git a/Makefile b/Makefile
@@ -8,13 +8,13 @@ CFLAGS+=-I/usr/include/pcap
 SWIG=sidecar
 SWIGOBJ=$(SWIG)_wrap.o
 SWIGSRC=$(SWIG)_wrap.cxx
-SWIGCFLAGS=-D_GNU_SOURCE -I/usr/lib/perl5/5.8.5/i386-linux-thread-multi/CORE
+#SWIGCFLAGS=-D_GNU_SOURCE -I/usr/lib/perl5/5.8.5/i386-linux-thread-multi/CORE
 
 SRC=$(wildcard $(VPATH)/*.c) 
 SRC+=$(wildcard $(VPATH)/*.cxx)
 HDRS=$(wildcard include/*.h)
 OBJS=$(subst $(VPATH)/,,$(subst .c,.o,$(SRC)))
-#LIBS+=-lm
+LIBS+=-lm
 #LIBS+=-lpthread 
 LIBS+=-lpcap
 
@@ -94,7 +94,7 @@ install: all
 	cp scripts/cvtimeout.rb $(PREFIX)
 	cp random_prober/informed_probe.sru random_prober/*.rb $(PREFIX)
 	cp random_prober/HOSTS.ip.stoplist $(PREFIX)
-	cp random_prober/stoplist.24.gz $(PREFIX)
+	cp random_prober/stoplist.22.gz $(PREFIX)
 	cp `ldd ./passenger/passenger | grep libpcap | awk '{print $$3}'` $(PREFIX)
 	ldd ./passenger/passenger | grep -q efence && cp `ldd ./passenger/passenger | grep efence | awk '{print $$3}'` $(PREFIX) || true
 	cp -p tar_install/* $(PREFIX)/

diff --git a/artrat/Makefile b/artrat/Makefile
@@ -6,11 +6,13 @@ CFLAGS+=-I..
 SRC=$(wildcard $(VPATH)/*.c)
 HDRS=$(wildcard include/*.h)
 OBJS=$(subst $(VPATH)/,,$(subst .c,.o,$(SRC)))
+
 #LIBS+=-lpthread 
+LIBS+=../libsidecar.a
 LIBS+=-lm
 LIBS+=-lpcap
 #LIBS+=-lsidecar
-LIBS+=../libsidecar.a
+
 LDFLAGS+=-Wl,-rpath=.. -Wl,-rpath=. -L..
 
 

diff --git a/passenger/Makefile b/passenger/Makefile
@@ -6,11 +6,13 @@ CFLAGS+=-I..
 SRC=$(wildcard $(VPATH)/*.c)
 HDRS=$(wildcard include/*.h)
 OBJS=$(subst $(VPATH)/,,$(subst .c,.o,$(SRC)))
+
 #LIBS+=-lpthread 
+LIBS+=../libsidecar.a
 LIBS+=-lm
 LIBS+=-lpcap
 #LIBS+=-lsidecar
-LIBS+=../libsidecar.a
+
 LDFLAGS+=-Wl,-rpath=.. -Wl,-rpath=. -L..
 
 

diff --git a/timesanity/Makefile b/timesanity/Makefile
@@ -5,10 +5,12 @@ CFLAGS+=-I..
 SRC=$(wildcard $(VPATH)/*.c)
 HDRS=$(wildcard include/*.h)
 OBJS=$(subst $(VPATH)/,,$(subst .c,.o,$(SRC)))
+
 #LIBS+=-lpthread 
+LIBS+=../libsidecar.a
 LIBS+=-lm
 #LIBS+=-lsidecar
-LIBS+=../libsidecar.a
+
 LDFLAGS+=-Wl,-rpath=.. -Wl,-rpath=. -L..