[zaptel-commits] trunk r1200 - in /trunk: ./ xpp/
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Wed Jul 5 09:12:50 MST 2006
Author: kpfleming
Date: Wed Jul 5 11:12:50 2006
New Revision: 1200
URL: http://svn.digium.com/view/zaptel?rev=1200&view=rev
Log:
yet another header file installation location change... Zaptel headers are now installed into /usr/include/zaptel, not /usr/include
Modified:
trunk/Makefile
trunk/fxotune.c
trunk/fxsdump.c
trunk/hdlcstress.c
trunk/hdlctest.c
trunk/patgen.c
trunk/patlooptest.c
trunk/pattest.c
trunk/pciradio.c
trunk/timertest.c
trunk/tor2.c
trunk/torisa.c
trunk/wcfxo.c
trunk/wcfxsusb.c
trunk/wct1xxp.c
trunk/wct4xxp_base.c
trunk/wctdm.c
trunk/wctdm24xxp.c
trunk/wcte11xp.c
trunk/wcusb.c
trunk/xpp/xpp_zap.c
trunk/xpp/zap_debug.c
trunk/zaptel.c
trunk/ztcfg-dude.c
trunk/ztcfg.c
trunk/ztd-eth.c
trunk/ztd-loc.c
trunk/ztdiag.c
trunk/ztdummy.c
trunk/ztdynamic.c
trunk/ztmonitor.c
trunk/zttool.c
trunk/zttranscode.c
Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jul 5 11:12:50 2006
@@ -39,9 +39,9 @@
CFLAGS_PPC:=-fsigned-char
endif
ifneq (,$(findstring x86_64,$(UNAME_M)))
-CFLAGS_X86-64:=-m64
-endif
-CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
+CFLAGS_x86_64:=-m64
+endif
+CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
KFLAGS=-I$(KINCLUDES) -O6
KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
@@ -153,11 +153,15 @@
wct4xxp-objs:=wct4xxp_base.o vpm450m.o
# Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only
-# for i386. On other archs the module will probably build but panic.
-# This line is only meaningful when this Makefile is used as kconfig for
+# for i386 or x86_64. On other archs the module will probably build but panic.
+# These lines are only meaningful when this Makefile is used as kconfig for
# 2.6 build
ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
+obj-m+=xpp/
+endif
+
+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'x86_64' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
obj-m+=xpp/
endif
@@ -386,11 +390,13 @@
$(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/zaptel.h
+ $(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h
+ $(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/zaptel/tonezone.h
rm -f $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
rm -f $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+ rm -f $(INSTALL_PREFIX)/usr/include/zaptel.h
rm -f $(INSTALL_PREFIX)/usr/include/torisa.h
- $(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+ rm -f $(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) || :
Modified: trunk/fxotune.c
URL: http://svn.digium.com/view/zaptel/trunk/fxotune.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/fxotune.c (original)
+++ trunk/fxotune.c Wed Jul 5 11:12:50 2006
@@ -26,7 +26,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#include "wctdm.h"
#include "fxotune.h"
Modified: trunk/fxsdump.c
URL: http://svn.digium.com/view/zaptel/trunk/fxsdump.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/fxsdump.c (original)
+++ trunk/fxsdump.c Wed Jul 5 11:12:50 2006
@@ -11,7 +11,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#include "coeffs.h"
Modified: trunk/hdlcstress.c
URL: http://svn.digium.com/view/zaptel/trunk/hdlcstress.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/hdlcstress.c (original)
+++ trunk/hdlcstress.c Wed Jul 5 11:12:50 2006
@@ -2,7 +2,7 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <zaptel.h>
+#include "zaptel.h"
#include <stdio.h>
#include <linux/types.h>
#include <linux/ppp_defs.h>
Modified: trunk/hdlctest.c
URL: http://svn.digium.com/view/zaptel/trunk/hdlctest.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/hdlctest.c (original)
+++ trunk/hdlctest.c Wed Jul 5 11:12:50 2006
@@ -2,7 +2,7 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <zaptel.h>
+#include "zaptel.h"
#include <stdio.h>
#include <linux/types.h>
#include <linux/ppp_defs.h>
Modified: trunk/patgen.c
URL: http://svn.digium.com/view/zaptel/trunk/patgen.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/patgen.c (original)
+++ trunk/patgen.c Wed Jul 5 11:12:50 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
/* #define BLOCK_SIZE 2048 */
Modified: trunk/patlooptest.c
URL: http://svn.digium.com/view/zaptel/trunk/patlooptest.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/patlooptest.c (original)
+++ trunk/patlooptest.c Wed Jul 5 11:12:50 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#define BLOCK_SIZE 2039
Modified: trunk/pattest.c
URL: http://svn.digium.com/view/zaptel/trunk/pattest.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/pattest.c (original)
+++ trunk/pattest.c Wed Jul 5 11:12:50 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#define BLOCK_SIZE 2039
Modified: trunk/pciradio.c
URL: http://svn.digium.com/view/zaptel/trunk/pciradio.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/pciradio.c (original)
+++ trunk/pciradio.c Wed Jul 5 11:12:50 2006
@@ -56,7 +56,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#define RAD_MAX_IFACES 128
Modified: trunk/timertest.c
URL: http://svn.digium.com/view/zaptel/trunk/timertest.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/timertest.c (original)
+++ trunk/timertest.c Wed Jul 5 11:12:50 2006
@@ -11,7 +11,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
int main(int argc, char *argv[])
Modified: trunk/tor2.c
URL: http://svn.digium.com/view/zaptel/trunk/tor2.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/tor2.c (original)
+++ trunk/tor2.c Wed Jul 5 11:12:50 2006
@@ -37,7 +37,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/torisa.c
URL: http://svn.digium.com/view/zaptel/trunk/torisa.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/torisa.c (original)
+++ trunk/torisa.c Wed Jul 5 11:12:50 2006
@@ -32,7 +32,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wcfxo.c
URL: http://svn.digium.com/view/zaptel/trunk/wcfxo.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wcfxo.c (original)
+++ trunk/wcfxo.c Wed Jul 5 11:12:50 2006
@@ -35,7 +35,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wcfxsusb.c
URL: http://svn.digium.com/view/zaptel/trunk/wcfxsusb.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wcfxsusb.c (original)
+++ trunk/wcfxsusb.c Wed Jul 5 11:12:50 2006
@@ -45,10 +45,9 @@
#endif
#ifdef STANDALONE_ZAPATA
-
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif /* STANDALONE_ZAPATA */
#include "wcfxsusb.h"
Modified: trunk/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wct1xxp.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wct1xxp.c (original)
+++ trunk/wct1xxp.c Wed Jul 5 11:12:50 2006
@@ -37,7 +37,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wct4xxp_base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp_base.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wct4xxp_base.c (original)
+++ trunk/wct4xxp_base.c Wed Jul 5 11:12:50 2006
@@ -38,7 +38,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Wed Jul 5 11:12:50 2006
@@ -204,7 +204,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Wed Jul 5 11:12:50 2006
@@ -231,7 +231,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
Modified: trunk/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/trunk/wcte11xp.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wcte11xp.c (original)
+++ trunk/wcte11xp.c Wed Jul 5 11:12:50 2006
@@ -37,7 +37,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wcusb.c
URL: http://svn.digium.com/view/zaptel/trunk/wcusb.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/wcusb.c (original)
+++ trunk/wcusb.c Wed Jul 5 11:12:50 2006
@@ -45,10 +45,9 @@
#endif
#ifdef STANDALONE_ZAPATA
-
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif /* STANDALONE_ZAPATA */
#include "wcusb.h"
Modified: trunk/xpp/xpp_zap.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xpp_zap.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/xpp/xpp_zap.c (original)
+++ trunk/xpp/xpp_zap.c Wed Jul 5 11:12:50 2006
@@ -38,7 +38,13 @@
#include <linux/delay.h> /* for udelay */
#include <linux/workqueue.h>
#include <linux/proc_fs.h>
-#include <zaptel.h>
+
+#ifdef STANDALONE_ZAPATA
+#include "zaptel.h"
+#else
+#include <zaptel/zaptel.h>
+#endif
+
#include <version.h> /* For zaptel version */
#include "xbus-core.h"
#include "xproto.h"
Modified: trunk/xpp/zap_debug.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/zap_debug.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/xpp/zap_debug.c (original)
+++ trunk/xpp/zap_debug.c Wed Jul 5 11:12:50 2006
@@ -28,7 +28,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#include "zap_debug.h"
static const char rcsid[] = "$Id$";
Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Wed Jul 5 11:12:50 2006
@@ -82,7 +82,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
Modified: trunk/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/trunk/ztcfg-dude.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztcfg-dude.c (original)
+++ trunk/ztcfg-dude.c Wed Jul 5 11:12:50 2006
@@ -38,9 +38,12 @@
#include <fcntl.h>
#include <errno.h>
#include <math.h>
+#ifdef STANDALONE_ZAPATA
+#include "zaptel.h"
+#else
+#include <zaptel/zaptel.h>
+#endif
#include "ztcfg.h"
-#include "tonezone.h"
-#include "zaptel.h"
#define NUM_SPANS ZT_MAX_SPANS
Modified: trunk/ztcfg.c
URL: http://svn.digium.com/view/zaptel/trunk/ztcfg.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztcfg.c (original)
+++ trunk/ztcfg.c Wed Jul 5 11:12:50 2006
@@ -37,9 +37,14 @@
#include <sys/ioctl.h>
#include <fcntl.h>
#include <errno.h>
+#ifdef STANDALONE_ZAPATA
+#include "zaptel.h"
+#include "tonezone.h"
+#else
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
+#endif
#include "ztcfg.h"
-#include "tonezone.h"
-#include "zaptel.h"
#define NUM_SPANS ZT_MAX_SPANS
Modified: trunk/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/trunk/ztd-eth.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztd-eth.c (original)
+++ trunk/ztd-eth.c Wed Jul 5 11:12:50 2006
@@ -39,7 +39,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#define ETH_P_ZTDETH 0xd00d
Modified: trunk/ztd-loc.c
URL: http://svn.digium.com/view/zaptel/trunk/ztd-loc.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztd-loc.c (original)
+++ trunk/ztd-loc.c Wed Jul 5 11:12:50 2006
@@ -63,7 +63,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef DEFINE_SPINLOCK
Modified: trunk/ztdiag.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdiag.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztdiag.c (original)
+++ trunk/ztdiag.c Wed Jul 5 11:12:50 2006
@@ -7,7 +7,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
int main(int argc, char *argv[])
Modified: trunk/ztdummy.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdummy.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztdummy.c (original)
+++ trunk/ztdummy.c Wed Jul 5 11:12:50 2006
@@ -62,7 +62,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifndef LINUX26
#include <linux/usb.h>
Modified: trunk/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdynamic.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztdynamic.c (original)
+++ trunk/ztdynamic.c Wed Jul 5 11:12:50 2006
@@ -39,7 +39,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/trunk/ztmonitor.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/ztmonitor.c (original)
+++ trunk/ztmonitor.c Wed Jul 5 11:12:50 2006
@@ -42,8 +42,8 @@
#include "zaptel.h"
#include "tonezone.h"
#else
-#include <zaptel.h>
-#include <tonezone.h>
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
#endif
#include <linux/soundcard.h>
Modified: trunk/zttool.c
URL: http://svn.digium.com/view/zaptel/trunk/zttool.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/zttool.c (original)
+++ trunk/zttool.c Wed Jul 5 11:12:50 2006
@@ -42,8 +42,8 @@
#include "zaptel.h"
#include "tonezone.h"
#else
-#include <zaptel.h>
-#include <tonezone.h>
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
#endif
static int ctl = -1;
Modified: trunk/zttranscode.c
URL: http://svn.digium.com/view/zaptel/trunk/zttranscode.c?rev=1200&r1=1199&r2=1200&view=diff
==============================================================================
--- trunk/zttranscode.c (original)
+++ trunk/zttranscode.c Wed Jul 5 11:12:50 2006
@@ -40,7 +40,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
More information about the zaptel-commits
mailing list