From 7d9ccd0cf94238774c9f5dc4de9c58999287eda2 Mon Sep 17 00:00:00 2001
From: Rob Sherwood <rob.sherwood@bigswitch.com>
Date: Mon, 20 Oct 2014 12:41:00 -0700
Subject: [PATCH] Patched to build for Ubuntu 14.04

Thanks to Sheng-Li PAN <psl@uestc.edu.cn> for the code.
---
 Make.include        | 2 +-
 Makefile            | 6 +++---
 artrat/Makefile     | 4 +++-
 passenger/Makefile  | 4 +++-
 timesanity/Makefile | 4 +++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Make.include b/Make.include
index 267aa7d..47a67c6 100644
--- 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
index b818d82..c43fda5 100644
--- 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
index 33e04e6..384a9f8 100644
--- 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
index 80142f6..c037997 100644
--- 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
index 7508766..9005583 100644
--- 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..