remove unused header and channel module

use auto-build for channels


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9569 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/Makefile

@@ -3,7 +3,7 @@
 # 
 # Makefile for channel drivers
 #
-# Copyright (C) 1999-2005, Mark Spencer
+# Copyright (C) 1999-2006, Digium, Inc.
 #
 # Mark Spencer <markster@digium.com>
 #
@@ -14,7 +14,7 @@
 # the GNU General Public License
 #
 
-CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
+MODS:=$(patsubst %.c,%.so,$(wildcard chan_*.c))
 
 ifeq (${OSARCH},OpenBSD)
   PTLIB=-lpt_OpenBSD_x86_r
@@ -28,9 +28,9 @@ ifeq (${OSARCH},Linux)
 endif
 
 ifeq (${OSARCH},CYGWIN)
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
+  CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
+  CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
-CYG_CHAN_AGENT=-lres_monitor.so
+  CYG_CHAN_AGENT=-lres_monitor.so
 endif
 
 ifeq ($(PROC),sparc64)
@@ -49,52 +49,51 @@ ifeq (${OSARCH},NetBSD)
   H323LIB=-lh323_NetBSD_x86_r
 endif
 
-ifneq (${OSARCH},Darwin)
+ifeq (${OSARCH},Darwin)
-  ifneq (${OSARCH},SunOS)
+  MODS:=$(filter-out chan_oss.so,$(MODS))
-    ifneq (${OSARCH},CYGWIN)
-       CHANNEL_LIBS+=chan_oss.so
-    endif
-  endif
 endif
 
 ifeq (${OSARCH},SunOS)
+  MODS:=$(filter-out chan_oss.so,$(MODS))
   SOLINK+=-lrt
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
+ifeq (${OSARCH},CYGWIN)
-  CHANNEL_LIBS+=chan_phone.so
+  MODS:=$(filter-out chan_oss.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
+  MODS:=$(filter-out chan_phone.so,$(MODS))
 endif
 
-#
-# Asterisk SMDI integration
-#
 ifeq (${WITH_SMDI},1)
 CFLAGS+=-DWITH_SMDI
 endif
 
-ifneq ($(wildcard h323/libchanh323.a),)
+ifeq ($(wildcard h323/libchanh323.a),)
-  CHANNEL_LIBS+=chan_h323.so
+  MODS:=$(filter-out chan_h323.so,$(MODS))
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
-  CHANNEL_LIBS+=chan_misdn.so
+  MODS:=$(filter-out chan_misdn.so,$(MODS))
+else
   CFLAGS+=-Imisdn 
 endif
 
 CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
-  CHANNEL_LIBS+=chan_alsa.so
+  MODS:=$(filter-out chan_alsa.so,$(MODS))
 endif
 
 ifndef WITHOUT_PRI
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1 $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
   CFLAGS+=-DZAPATA_PRI
   ZAPPRI=-lpri
 endif
 endif # WITHOUT_PRI
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1 $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
   CFLAGS+=-DZAPATA_R2
   ZAPR2=-lmfcr2
 endif
@@ -107,7 +106,12 @@ ifneq ($(wildcard alsa-monitor.h),)
 endif
 
 ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
+endif
+
+ifeq (${ZAPAVAIL},)
+  MODS:=$(filter-out chan_zap.so,$(MODS))
+else
   ifeq (${OSARCH},NetBSD)
     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
   endif
@@ -115,27 +119,26 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard
     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
   endif
   CFLAGS+=-DIAX_TRUNKING
-  CHANNEL_LIBS+=chan_zap.so
 endif
-endif # WITHOUT_ZAPTEL
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
-  CHANNEL_LIBS+=chan_vpb.so
+  MODS:=$(filter-out chan_vpb.so,$(MODS))
+else
   CFLAGS+=-DLINUX
 endif
 
 CFLAGS+=-DCRYPTO
 
 ifneq ($(OSARCH),CYGWIN)
-CFLAGS+=-fPIC
+  CFLAGS+=-fPIC
 endif
 
 CFLAGS+=#-DVOFRDUMPER
 
 ZAPDIR=/usr/lib
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
-  CHANNEL_LIBS+=chan_nbs.so
+  MODS:=$(filter-out chan_nbs.so,$(MODS))
 endif
 
 ifndef OPENH323DIR
@@ -146,9 +149,7 @@ ifndef PWLIBDIR
   PWLIBDIR=$(HOME)/pwlib
 endif
 
-#CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
+all: depend $(MODS) 
-
-all: depend $(CHANNEL_LIBS) 
 
 clean:
 	rm -f *.so *.o .depend
@@ -245,8 +246,7 @@ chan_misdn_config.o: chan_misdn_config.c misdn/chan_misdn_config.h
 
 
 install: all
-	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 
 uninstall:
 

channels/adtranvofr.h

@@ -1,105 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * Implementation of Voice over Frame Relay, Adtran Style
- * 
- * Copyright (C) 1999, Mark Spencer
- *
- * Mark Spencer <markster@linux-support.net>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- */
-
-#ifndef _ADTRANVOFR_H
-#define _ADTRANVOFR_H
-
-#define VOFR_CONTROL_ADTRAN		0x0
-#define VOFR_CONTROL_VOICE   		0x1
-#define VOFR_CONTROL_RFC1490		0x3
-
-#define VOFR_TYPE_SIGNAL		0x0
-#define VOFR_TYPE_VOICE			0x1
-#define VOFR_TYPE_ANSWER		0x2
-#define VOFR_TYPE_FAX			0x3
-#define VOFR_TYPE_DTMF			0x4
-
-#define VOFR_CARD_TYPE_UNSPEC		0x0
-#define VOFR_CARD_TYPE_FXS		0x1
-#define VOFR_CARD_TYPE_FXO		0x2
-#define VOFR_CARD_TYPE_ENM		0x3
-#define VOFR_CARD_TYPE_VCOM		0x4
-#define VOFR_CARD_TYPE_ASTERISK		0xf
-
-#define VOFR_MODULATION_SINGLE		0x0
-#define VOFR_MODULATION_V21		0x1
-#define VOFR_MODULATION_V27ter_2	0x2
-#define VOFR_MODULATION_V27ter_4	0x3
-#define VOFR_MODULATION_V29_7		0x4
-#define VOFR_MODULATION_V29_9		0x5
-#define VOFR_MODULATION_V33_12		0x6
-#define VOFR_MODULATION_V33_14		0x7
-
-#define VOFR_ROUTE_NONE			0x0
-#define VOFR_ROUTE_LOCAL		0x1
-#define VOFR_ROUTE_VOICE		0x2
-#define VOFR_ROUTE_DTE1			0x4
-#define VOFR_ROUTE_DTE2			0x8
-#define VOFR_ROUTE_DTE			0xC
-
-#define VOFR_MASK_EI			0x80
-#define VOFR_MASK_LI			0x40
-#define VOFR_MASK_CONTROL		0x3F
-
-#define VOFR_SIGNAL_ON_HOOK		0x00
-#define VOFR_SIGNAL_OFF_HOOK		0x01
-#define VOFR_SIGNAL_RING		0x40
-#define VOFR_SIGNAL_SWITCHED_DIAL	0x08
-#define VOFR_SIGNAL_BUSY		0x02
-#define VOFR_SIGNAL_TRUNK_BUSY		0x04
-#define VOFR_SIGNAL_UNKNOWN		0x10
-#define VOFR_SIGNAL_OFFHOOK		0x81
-
-#define VOFR_TRACE_SIGNAL		1 << 0
-#define VOFR_TRACE_VOICE		1 << 1
-
-#define VOFR_MAX_PKT_SIZE		1500
-
-/*
- * Wire level protocol 
- */
-
-struct vofr_hdr {
-	u_int8_t control;		/* Also contains unused EI and LI bits */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	u_int8_t dtype:4;		/* Data type */
-	u_int8_t ctag:4;		/* Connect tag */
-	u_int8_t dlcih:4;		/* Hi 2 bits of DLCI x-ref */
-	u_int8_t vflags:4;		/* Voice Routing Flags */
-	u_int8_t dlcil;			/* Lo 8 bits of DLCI x-ref */
-	u_int8_t cid;			/* Channel ID */
-	u_int8_t mod:4;			/* Modulation */
-	u_int8_t remid:4;		/* Remote ID */
-#elif __BYTE_ORDER == __BIG_ENDIAN
-	u_int8_t ctag:4;		/* Connect tag */
-	u_int8_t dtype:4;		/* Data type */
-	u_int8_t vflags:4;		/* Voice Routing Flags */
-	u_int8_t dlcih:4;		/* Hi 2 bits of DLCI x-ref */
-	u_int8_t dlcil;			/* Lo 8 bits of DLCI x-ref */
-	u_int8_t cid;			/* Channel ID */
-	u_int8_t remid:4;		/* Remote ID or Relay CMD*/
-	u_int8_t mod:4;			/* Modulation */
-#else
-#error	"Please fix <bytesex.h>"
-#endif
-#ifdef __GNUC__
-	u_int8_t data[0];		/* Data */
-#endif
-};
-
-#define VOFR_HDR_SIZE 6
-
-/* Number of milliseconds to fudge -- experimentally derived */
-#define VOFR_FUDGE 2
-
-#endif