From 8192b42674348b0ceb5b1ec42d149febe020e1a9 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 5 Jul 2006 16:17:05 +0000
Subject: [PATCH] prepare for new zaptel.h location

git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@355 2fbb986a-6c06-0410-b554-c9c1f0a7f128
---
 Makefile     | 4 +---
 pridump.c    | 6 +-----
 pritest.c    | 6 +-----
 testprilib.c | 6 +-----
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index d46fb50..adf8401 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,6 @@ CC=gcc
 OSARCH=$(shell uname -s)
 PROC?=$(shell uname -m)
 
-TOBJS=testpri.o
-T2OBJS=testprilib.o
 STATIC_LIBRARY=libpri.a
 DYNAMIC_LIBRARY=libpri.so.1.0
 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
@@ -135,7 +133,7 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
 
 clean:
 	rm -f *.o *.so *.lo *.so.1 *.so.1.0
-	rm -f testpri testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+	rm -f testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 	rm -f pritest pridump
 	rm -f .depend
 
diff --git a/pridump.c b/pridump.c
index 747be16..5e3c6bc 100644
--- a/pridump.c
+++ b/pridump.c
@@ -37,11 +37,7 @@
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/types.h>
-#if defined(__linux__)
-#include <linux/zaptel.h>
-#elif defined(__FreeBSD__)
-#include <zaptel.h>
-#endif
+#include <zaptel/zaptel.h>
 #include "libpri.h"
 #include "pri_q921.h"
 #include "pri_q931.h"
diff --git a/pritest.c b/pritest.c
index 7f7d32e..2abaf86 100644
--- a/pritest.c
+++ b/pritest.c
@@ -40,11 +40,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/time.h>
-#if defined(__linux__)
-#include <linux/zaptel.h>
-#elif defined(__FreeBSD__)
-#include <zaptel.h>
-#endif
+#include <zaptel/zaptel.h>
 #include <zap.h>
 #include "libpri.h"
 
diff --git a/testprilib.c b/testprilib.c
index 1f3c052..e7560de 100644
--- a/testprilib.c
+++ b/testprilib.c
@@ -42,11 +42,7 @@
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#if defined(__linux__)
-#include <linux/zaptel.h>
-#elif defined(__FreeBSD__) || defined(SOLARIS)
-#include <zaptel.h>
-#endif
+#include <zaptel/zaptel.h>
 #ifndef SOLARIS
 #include <zap.h>
 #endif