[libpri-commits] trunk r355 - in /trunk: Makefile pridump.c pritest.c testprilib.c

[libpri-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jul  5 11:17:05 2006
New Revision: 355

URL: http://svn.digium.com/view/libpri?rev=355&view=rev
Log:
prepare for new zaptel.h location

Modified:
    trunk/Makefile
    trunk/pridump.c
    trunk/pritest.c
    trunk/testprilib.c

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libpri/trunk/Makefile?rev=355&r1=354&r2=355&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jul  5 11:17:05 2006
@@ -32,8 +32,6 @@
 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 @@
 
 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
 

Modified: trunk/pridump.c
URL: http://svn.digium.com/view/libpri/trunk/pridump.c?rev=355&r1=354&r2=355&view=diff
==============================================================================
--- trunk/pridump.c (original)
+++ trunk/pridump.c Wed Jul  5 11:17:05 2006
@@ -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"

Modified: trunk/pritest.c
URL: http://svn.digium.com/view/libpri/trunk/pritest.c?rev=355&r1=354&r2=355&view=diff
==============================================================================
--- trunk/pritest.c (original)
+++ trunk/pritest.c Wed Jul  5 11:17:05 2006
@@ -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"
 

Modified: trunk/testprilib.c
URL: http://svn.digium.com/view/libpri/trunk/testprilib.c?rev=355&r1=354&r2=355&view=diff
==============================================================================
--- trunk/testprilib.c (original)
+++ trunk/testprilib.c Wed Jul  5 11:17:05 2006
@@ -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