[svn-commits] branch group/menuselect r1174 -
/team/group/menuselect/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Jun 24 15:22:10 MST 2006
Author: russell
Date: Sat Jun 24 17:22:09 2006
New Revision: 1174
URL: http://svn.digium.com/view/zaptel?rev=1174&view=rev
Log:
Merged revisions 1172 via svnmerge from
https://origsvn.digium.com/svn/zaptel/trunk
........
r1172 | kpfleming | 2006-06-24 15:35:33 -0400 (Sat, 24 Jun 2006) | 4 lines
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
........
Removed:
team/group/menuselect/README.udev
Modified:
team/group/menuselect/ (props changed)
team/group/menuselect/Makefile
team/group/menuselect/fxotune.c
team/group/menuselect/fxsdump.c
team/group/menuselect/hdlcstress.c
team/group/menuselect/hdlctest.c
team/group/menuselect/patgen.c
team/group/menuselect/patlooptest.c
team/group/menuselect/pattest.c
team/group/menuselect/pciradio.c
team/group/menuselect/timertest.c
team/group/menuselect/tonezone.h
team/group/menuselect/tor2.c
team/group/menuselect/torisa.c
team/group/menuselect/usbfxstest.c
team/group/menuselect/wcfxo.c
team/group/menuselect/wcfxsusb.c
team/group/menuselect/wct1xxp.c
team/group/menuselect/wct4xxp_base.c
team/group/menuselect/wctdm.c
team/group/menuselect/wctdm24xxp.c
team/group/menuselect/wcte11xp.c
team/group/menuselect/wcusb.c
team/group/menuselect/zaptel.c
team/group/menuselect/ztd-eth.c
team/group/menuselect/ztd-loc.c
team/group/menuselect/ztdiag.c
team/group/menuselect/ztdummy.c
team/group/menuselect/ztdynamic.c
team/group/menuselect/ztmonitor.c
team/group/menuselect/zttool.c
team/group/menuselect/zttranscode.c
Propchange: team/group/menuselect/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/menuselect/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Jun 24 17:22:09 2006
@@ -1,1 +1,1 @@
-/trunk:1-1163
+/trunk:1-1173
Modified: team/group/menuselect/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/Makefile?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/Makefile (original)
+++ team/group/menuselect/Makefile Sat Jun 24 17:22:09 2006
@@ -391,12 +391,14 @@
$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
$(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 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
+ 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/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
[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
[ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
Modified: team/group/menuselect/fxotune.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/fxotune.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/fxotune.c (original)
+++ team/group/menuselect/fxotune.c Sat Jun 24 17:22:09 2006
@@ -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"
Modified: team/group/menuselect/fxsdump.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/fxsdump.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/fxsdump.c (original)
+++ team/group/menuselect/fxsdump.c Sat Jun 24 17:22:09 2006
@@ -11,7 +11,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#include "coeffs.h"
Modified: team/group/menuselect/hdlcstress.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/hdlcstress.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/hdlcstress.c (original)
+++ team/group/menuselect/hdlcstress.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/hdlctest.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/hdlctest.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/hdlctest.c (original)
+++ team/group/menuselect/hdlctest.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/patgen.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/patgen.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/patgen.c (original)
+++ team/group/menuselect/patgen.c Sat Jun 24 17:22:09 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
/* #define BLOCK_SIZE 2048 */
Modified: team/group/menuselect/patlooptest.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/patlooptest.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/patlooptest.c (original)
+++ team/group/menuselect/patlooptest.c Sat Jun 24 17:22:09 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define BLOCK_SIZE 2039
Modified: team/group/menuselect/pattest.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/pattest.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/pattest.c (original)
+++ team/group/menuselect/pattest.c Sat Jun 24 17:22:09 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define BLOCK_SIZE 2039
Modified: team/group/menuselect/pciradio.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/pciradio.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/pciradio.c (original)
+++ team/group/menuselect/pciradio.c Sat Jun 24 17:22:09 2006
@@ -56,7 +56,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define RAD_MAX_IFACES 128
Modified: team/group/menuselect/timertest.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/timertest.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/timertest.c (original)
+++ team/group/menuselect/timertest.c Sat Jun 24 17:22:09 2006
@@ -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[])
Modified: team/group/menuselect/tonezone.h
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/tonezone.h?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/tonezone.h (original)
+++ team/group/menuselect/tonezone.h Sat Jun 24 17:22:09 2006
@@ -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;
Modified: team/group/menuselect/tor2.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/tor2.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/tor2.c (original)
+++ team/group/menuselect/tor2.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/torisa.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/torisa.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/torisa.c (original)
+++ team/group/menuselect/torisa.c Sat Jun 24 17:22:09 2006
@@ -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
Modified: team/group/menuselect/usbfxstest.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/usbfxstest.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/usbfxstest.c (original)
+++ team/group/menuselect/usbfxstest.c Sat Jun 24 17:22:09 2006
@@ -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[])
{
Modified: team/group/menuselect/wcfxo.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wcfxo.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wcfxo.c (original)
+++ team/group/menuselect/wcfxo.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/wcfxsusb.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wcfxsusb.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wcfxsusb.c (original)
+++ team/group/menuselect/wcfxsusb.c Sat Jun 24 17:22:09 2006
@@ -48,7 +48,7 @@
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif /* STANDALONE_ZAPATA */
#include "wcfxsusb.h"
Modified: team/group/menuselect/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wct1xxp.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wct1xxp.c (original)
+++ team/group/menuselect/wct1xxp.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/wct4xxp_base.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wct4xxp_base.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wct4xxp_base.c (original)
+++ team/group/menuselect/wct4xxp_base.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/wctdm.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wctdm.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wctdm.c (original)
+++ team/group/menuselect/wctdm.c Sat Jun 24 17:22:09 2006
@@ -204,7 +204,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
Modified: team/group/menuselect/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wctdm24xxp.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wctdm24xxp.c (original)
+++ team/group/menuselect/wctdm24xxp.c Sat Jun 24 17:22:09 2006
@@ -231,7 +231,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
Modified: team/group/menuselect/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wcte11xp.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wcte11xp.c (original)
+++ team/group/menuselect/wcte11xp.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/wcusb.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/wcusb.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/wcusb.c (original)
+++ team/group/menuselect/wcusb.c Sat Jun 24 17:22:09 2006
@@ -48,7 +48,7 @@
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif /* STANDALONE_ZAPATA */
#include "wcusb.h"
Modified: team/group/menuselect/zaptel.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/zaptel.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/zaptel.c (original)
+++ team/group/menuselect/zaptel.c Sat Jun 24 17:22:09 2006
@@ -82,7 +82,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
Modified: team/group/menuselect/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/ztd-eth.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/ztd-eth.c (original)
+++ team/group/menuselect/ztd-eth.c Sat Jun 24 17:22:09 2006
@@ -39,7 +39,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define ETH_P_ZTDETH 0xd00d
Modified: team/group/menuselect/ztd-loc.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/ztd-loc.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/ztd-loc.c (original)
+++ team/group/menuselect/ztd-loc.c Sat Jun 24 17:22:09 2006
@@ -63,7 +63,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef DEFINE_SPINLOCK
Modified: team/group/menuselect/ztdiag.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/ztdiag.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/ztdiag.c (original)
+++ team/group/menuselect/ztdiag.c Sat Jun 24 17:22:09 2006
@@ -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[])
Modified: team/group/menuselect/ztdummy.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/ztdummy.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/ztdummy.c (original)
+++ team/group/menuselect/ztdummy.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/ztdynamic.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/ztdynamic.c (original)
+++ team/group/menuselect/ztdynamic.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/ztmonitor.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/ztmonitor.c (original)
+++ team/group/menuselect/ztmonitor.c Sat Jun 24 17:22:09 2006
@@ -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>
Modified: team/group/menuselect/zttool.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/zttool.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/zttool.c (original)
+++ team/group/menuselect/zttool.c Sat Jun 24 17:22:09 2006
@@ -42,7 +42,7 @@
#include "zaptel.h"
#include "tonezone.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#include <tonezone.h>
#endif
Modified: team/group/menuselect/zttranscode.c
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/zttranscode.c?rev=1174&r1=1173&r2=1174&view=diff
==============================================================================
--- team/group/menuselect/zttranscode.c (original)
+++ team/group/menuselect/zttranscode.c Sat Jun 24 17:22:09 2006
@@ -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>
More information about the svn-commits
mailing list