diff options
-rw-r--r-- | Makefile | 18 | ||||
-rw-r--r-- | fxotune.c | 2 | ||||
-rw-r--r-- | fxsdump.c | 2 | ||||
-rw-r--r-- | hdlcstress.c | 2 | ||||
-rw-r--r-- | hdlctest.c | 2 | ||||
-rw-r--r-- | patgen.c | 2 | ||||
-rw-r--r-- | patlooptest.c | 2 | ||||
-rw-r--r-- | pattest.c | 2 | ||||
-rw-r--r-- | pciradio.c | 2 | ||||
-rw-r--r-- | timertest.c | 2 | ||||
-rw-r--r-- | tor2.c | 2 | ||||
-rw-r--r-- | torisa.c | 2 | ||||
-rw-r--r-- | wcfxo.c | 2 | ||||
-rw-r--r-- | wcfxsusb.c | 3 | ||||
-rw-r--r-- | wct1xxp.c | 2 | ||||
-rw-r--r-- | wct4xxp_base.c | 2 | ||||
-rw-r--r-- | wctdm.c | 2 | ||||
-rw-r--r-- | wctdm24xxp.c | 2 | ||||
-rw-r--r-- | wcte11xp.c | 2 | ||||
-rw-r--r-- | wcusb.c | 3 | ||||
-rw-r--r-- | xpp/xpp_zap.c | 8 | ||||
-rw-r--r-- | xpp/zap_debug.c | 2 | ||||
-rw-r--r-- | zaptel.c | 2 | ||||
-rw-r--r-- | ztcfg-dude.c | 7 | ||||
-rw-r--r-- | ztcfg.c | 9 | ||||
-rw-r--r-- | ztd-eth.c | 2 | ||||
-rw-r--r-- | ztd-loc.c | 2 | ||||
-rw-r--r-- | ztdiag.c | 2 | ||||
-rw-r--r-- | ztdummy.c | 2 | ||||
-rw-r--r-- | ztdynamic.c | 2 | ||||
-rw-r--r-- | ztmonitor.c | 4 | ||||
-rw-r--r-- | zttool.c | 4 | ||||
-rw-r--r-- | zttranscode.c | 2 |
33 files changed, 62 insertions, 44 deletions
@@ -39,9 +39,9 @@ ifneq (,$(findstring ppc,$(UNAME_M))) CFLAGS_PPC:=-fsigned-char endif ifneq (,$(findstring x86_64,$(UNAME_M))) -CFLAGS_X86-64:=-m64 +CFLAGS_x86_64:=-m64 endif -CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64) +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,14 +153,18 @@ obj-m:=$(MODULESO) 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 + BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool UTILS:=$(filter-out zttool fxstest ztcfg,$(BINS)) UTILSO:=$(UTILS:%=%.o) @@ -386,11 +390,13 @@ 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/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) || : @@ -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" @@ -11,7 +11,7 @@ #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #include "coeffs.h" diff --git a/hdlcstress.c b/hdlcstress.c index 4a3ebf5..b27e7dc 100644 --- a/hdlcstress.c +++ b/hdlcstress.c @@ -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> @@ -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> @@ -13,7 +13,7 @@ #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif /* #define BLOCK_SIZE 2048 */ diff --git a/patlooptest.c b/patlooptest.c index d938a07..655d387 100644 --- a/patlooptest.c +++ b/patlooptest.c @@ -13,7 +13,7 @@ #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #define BLOCK_SIZE 2039 @@ -13,7 +13,7 @@ #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #define BLOCK_SIZE 2039 @@ -56,7 +56,7 @@ With driver: 303826 (1.5 %) #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #define RAD_MAX_IFACES 128 diff --git a/timertest.c b/timertest.c index 6e2f78c..10d9d66 100644 --- a/timertest.c +++ b/timertest.c @@ -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[]) @@ -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> @@ -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> @@ -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> @@ -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" @@ -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> diff --git a/wct4xxp_base.c b/wct4xxp_base.c index 5015754..18be765 100644 --- a/wct4xxp_base.c +++ b/wct4xxp_base.c @@ -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> @@ -204,7 +204,7 @@ static struct fxo_mode { #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #ifdef LINUX26 diff --git a/wctdm24xxp.c b/wctdm24xxp.c index 358e84c..0d01117 100644 --- a/wctdm24xxp.c +++ b/wctdm24xxp.c @@ -231,7 +231,7 @@ static struct fxo_mode { #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #ifdef LINUX26 @@ -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> @@ -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" diff --git a/xpp/xpp_zap.c b/xpp/xpp_zap.c index 9a9ab0a..4c8d3e9 100644 --- a/xpp/xpp_zap.c +++ b/xpp/xpp_zap.c @@ -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" diff --git a/xpp/zap_debug.c b/xpp/zap_debug.c index 59eb0a8..8134e8f 100644 --- a/xpp/zap_debug.c +++ b/xpp/zap_debug.c @@ -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$"; @@ -82,7 +82,7 @@ #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #ifdef LINUX26 diff --git a/ztcfg-dude.c b/ztcfg-dude.c index decbe2b..d96dd88 100644 --- a/ztcfg-dude.c +++ b/ztcfg-dude.c @@ -38,9 +38,12 @@ #include <fcntl.h> #include <errno.h> #include <math.h> -#include "ztcfg.h" -#include "tonezone.h" +#ifdef STANDALONE_ZAPATA #include "zaptel.h" +#else +#include <zaptel/zaptel.h> +#endif +#include "ztcfg.h" #define NUM_SPANS ZT_MAX_SPANS @@ -37,9 +37,14 @@ #include <sys/ioctl.h> #include <fcntl.h> #include <errno.h> -#include "ztcfg.h" -#include "tonezone.h" +#ifdef STANDALONE_ZAPATA #include "zaptel.h" +#include "tonezone.h" +#else +#include <zaptel/zaptel.h> +#include <zaptel/tonezone.h> +#endif +#include "ztcfg.h" #define NUM_SPANS ZT_MAX_SPANS @@ -39,7 +39,7 @@ #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #define ETH_P_ZTDETH 0xd00d @@ -63,7 +63,7 @@ #ifdef STANDALONE_ZAPATA #include "zaptel.h" #else -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #ifdef DEFINE_SPINLOCK @@ -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[]) @@ -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> diff --git a/ztdynamic.c b/ztdynamic.c index 3a2fd90..8950f9c 100644 --- a/ztdynamic.c +++ b/ztdynamic.c @@ -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> diff --git a/ztmonitor.c b/ztmonitor.c index 05581d7..4e519e8 100644 --- a/ztmonitor.c +++ b/ztmonitor.c @@ -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> @@ -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; diff --git a/zttranscode.c b/zttranscode.c index ba7cba0..08fac66 100644 --- a/zttranscode.c +++ b/zttranscode.c @@ -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> |