install zaptel.h and tonezone.h into /usr/include, not /usr/include/linux, sinc e they are used much more by userspace apps than by kernel modules

remove any old copies of those headers
remove README.udev, since it no longer applies


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1172 5390a7c7-147a-4af0-8ec9-7488f05a26cb

32 files changed, 35 insertions, 81 deletions

diff --git a/Makefile b/Makefile
index 7537bd6..b5ed3af 100644
--- a/Makefile
+++ b/Makefile
@@ -370,8 +370,10 @@ endif
 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
 	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
-	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
-	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel.h
+	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/torisa.h
+	rm -f $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
+	rm -f $(INSTALL_PREFIX)/usr/include/linux/torisa.h
 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
 	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
 	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
diff --git a/README.udev b/README.udev
deleted file mode 100644
index bf4216f..0000000
--- a/README.udev
+++ /dev/null
@@ -1,45 +0,0 @@
-UDEV -- What the heck is udev OR why did I get a message to read this?
-
-This is the new mechanism of doing a dyamic /dev.  What does
-that mean?  Basically, before the days of linux-2.3/linux-2.4 your /dev
-had to have ~18000 files in it for all the possible device that your
-kernel could possibly have, most of which you will NEVER use.  This, for
-obvious reasons, is somewhat undesirable.  So then came devfs.  Devfs
-solved a lot of these problems by dynamically populating /dev with only
-the device nodes of the devices that existed on your system.  Now, in
-linux-2.6, udev+sysfs has become the mechanism of choice for populating
-your dynamic /dev with device nodes.
-
-You got this message because you are probably running udev on your system.
-
-If you are not, or you feel that you have reached this message in error you
-can send me an email (look to bottom of file for address).
-
-If you're running udev on your system, you were probably directed
-to read this file during build.  For udevd (the daemon responsible
-for creation/deletion of device nodes), you will need to add the following
-lines to your udev rules (ie, /etc/udev/rules.d/50-udev.rules):.
-
-# Section for zaptel device
-KERNEL="zapctl",     NAME="zap/ctl"
-KERNEL="zaptimer",   NAME="zap/timer"
-KERNEL="zapchannel", NAME="zap/channel"
-KERNEL="zappseudo",  NAME="zap/pseudo"
-KERNEL="zap[0-9]*",  NAME="zap/%n"
-
-This will take care of making all the automagic occur that needs to be
-done so that udevd will make the right files for zaptel.
-
-And, You may wish to add these permissions to your permissions file
-(ie /etc/udev/permissions.d/50-udev.permissions), as some have found
-that the ctl device is inaccessible without the following:
-
-# zaptel devices -- for running asterisk as root
-zap/*:root:root:05700
-
-# zaptel devices -- if you want to run asterisk as a different user
-# (asterisk in this case)
-zap/*:asterisk:asterisk:660
-
-Matthew Fredrickson
-creslin@NOSPAMdigium.com
diff --git a/fxotune.c b/fxotune.c
index 7d8c508..9664ea5 100644
--- a/fxotune.c
+++ b/fxotune.c
@@ -26,7 +26,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #include "wctdm.h"
 #include "fxotune.h"
diff --git a/fxsdump.c b/fxsdump.c
index c3c247e..1b51d36 100644
--- a/fxsdump.c
+++ b/fxsdump.c
@@ -11,7 +11,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #include "coeffs.h"
diff --git a/hdlcstress.c b/hdlcstress.c
index 87b03fc..4a3ebf5 100644
--- a/hdlcstress.c
+++ b/hdlcstress.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #include <stdio.h>
 #include <linux/types.h>
 #include <linux/ppp_defs.h> 
diff --git a/hdlctest.c b/hdlctest.c
index d69aaae..65305dd 100644
--- a/hdlctest.c
+++ b/hdlctest.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #include <stdio.h>
 #include <linux/types.h>
 #include <linux/ppp_defs.h> 
diff --git a/patgen.c b/patgen.c
index a137a2a..78e4b9f 100644
--- a/patgen.c
+++ b/patgen.c
@@ -13,7 +13,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 /* #define BLOCK_SIZE 2048 */
diff --git a/patlooptest.c b/patlooptest.c
index fd1a054..d938a07 100644
--- a/patlooptest.c
+++ b/patlooptest.c
@@ -13,7 +13,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #define BLOCK_SIZE 2039
diff --git a/pattest.c b/pattest.c
index e95cc48..a7df5f8 100644
--- a/pattest.c
+++ b/pattest.c
@@ -13,7 +13,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #define BLOCK_SIZE 2039
diff --git a/pciradio.c b/pciradio.c
index 8bdd53a..f84ca8b 100644
--- a/pciradio.c
+++ b/pciradio.c
@@ -56,7 +56,7 @@ With driver:	303826  (1.5 %)
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #define RAD_MAX_IFACES 128
diff --git a/timertest.c b/timertest.c
index df224b2..6e2f78c 100644
--- a/timertest.c
+++ b/timertest.c
@@ -11,7 +11,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 int main(int argc, char *argv[])
diff --git a/tonezone.h b/tonezone.h
index cc3a248..5cea04e 100644
--- a/tonezone.h
+++ b/tonezone.h
@@ -23,11 +23,8 @@
 
 #ifndef _TONEZONE_H
 #define _TONEZONE_H
-#ifdef BUILDING_TONEZONE
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
+
+#include <zaptel.h>
 
 struct tone_zone_sound {
 	int toneid;
diff --git a/tor2.c b/tor2.c
index 02aba05..ef7c504 100644
--- a/tor2.c
+++ b/tor2.c
@@ -37,7 +37,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/torisa.c b/torisa.c
index 5bee0ed..2ca605c 100644
--- a/torisa.c
+++ b/torisa.c
@@ -33,7 +33,7 @@
 #include "zaptel.h"
 #include "torisa.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #include <linux/torisa.h>
 #endif
 #ifdef LINUX26
diff --git a/usbfxstest.c b/usbfxstest.c
index 23cd680..ac3095e 100644
--- a/usbfxstest.c
+++ b/usbfxstest.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include "zap.h"
-#include <linux/zaptel.h>
+#include <zaptel.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/wcfxo.c b/wcfxo.c
index 3c6edce..0b95fa3 100644
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -35,7 +35,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wcfxsusb.c b/wcfxsusb.c
index 0e783ea..68e9fda 100644
--- a/wcfxsusb.c
+++ b/wcfxsusb.c
@@ -48,7 +48,7 @@
 
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif /* STANDALONE_ZAPATA */
 
 #include "wcfxsusb.h"
diff --git a/wct1xxp.c b/wct1xxp.c
index 3c163dd..e4cd5d4 100644
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -37,7 +37,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wct4xxp_base.c b/wct4xxp_base.c
index 17f76be..5921e89 100644
--- a/wct4xxp_base.c
+++ b/wct4xxp_base.c
@@ -38,7 +38,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wctdm.c b/wctdm.c
index 0403e3a..5f5b90c 100644
--- a/wctdm.c
+++ b/wctdm.c
@@ -204,7 +204,7 @@ static struct fxo_mode {
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #ifdef LINUX26
diff --git a/wctdm24xxp.c b/wctdm24xxp.c
index 80c9e97..358e84c 100644
--- a/wctdm24xxp.c
+++ b/wctdm24xxp.c
@@ -231,7 +231,7 @@ static struct fxo_mode {
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #ifdef LINUX26
diff --git a/wcte11xp.c b/wcte11xp.c
index d0f4034..b1fac74 100644
--- a/wcte11xp.c
+++ b/wcte11xp.c
@@ -37,7 +37,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wcusb.c b/wcusb.c
index 38c844c..6d1443e 100644
--- a/wcusb.c
+++ b/wcusb.c
@@ -48,7 +48,7 @@
 
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif /* STANDALONE_ZAPATA */
 
 #include "wcusb.h"
diff --git a/zaptel.c b/zaptel.c
index 8e22356..1a0c479 100644
--- a/zaptel.c
+++ b/zaptel.c
@@ -82,7 +82,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #ifdef LINUX26
diff --git a/ztd-eth.c b/ztd-eth.c
index 88d21da..132ae3b 100644
--- a/ztd-eth.c
+++ b/ztd-eth.c
@@ -39,7 +39,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #define ETH_P_ZTDETH	0xd00d
diff --git a/ztd-loc.c b/ztd-loc.c
index fa72496..2d720f0 100644
--- a/ztd-loc.c
+++ b/ztd-loc.c
@@ -63,7 +63,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 #ifdef DEFINE_SPINLOCK
diff --git a/ztdiag.c b/ztdiag.c
index e2be5f3..f09cfb1 100644
--- a/ztdiag.c
+++ b/ztdiag.c
@@ -7,7 +7,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 
 int main(int argc, char *argv[])
diff --git a/ztdummy.c b/ztdummy.c
index b2dd353..ea6794b 100644
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -62,7 +62,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifndef LINUX26
 #include <linux/usb.h>
diff --git a/ztdynamic.c b/ztdynamic.c
index c2c86ad..3a2fd90 100644
--- a/ztdynamic.c
+++ b/ztdynamic.c
@@ -39,7 +39,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/ztmonitor.c b/ztmonitor.c
index 2f9a39b..05581d7 100644
--- a/ztmonitor.c
+++ b/ztmonitor.c
@@ -42,7 +42,7 @@
 #include "zaptel.h"
 #include "tonezone.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #include <tonezone.h>
 #endif
 #include <linux/soundcard.h>
diff --git a/zttool.c b/zttool.c
index c2f3bc1..3ec8b41 100644
--- a/zttool.c
+++ b/zttool.c
@@ -42,7 +42,7 @@
 #include "zaptel.h"
 #include "tonezone.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #include <tonezone.h>
 #endif
 
diff --git a/zttranscode.c b/zttranscode.c
index 14edb3b..ba7cba0 100644
--- a/zttranscode.c
+++ b/zttranscode.c
@@ -40,7 +40,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <linux/zaptel.h>
+#include <zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>