$NetBSD: patch-ad,v 1.7 2007/07/19 09:39:57 mjl Exp $ --- channels/Makefile.orig 2007-07-11 19:15:11.000000000 +0200 +++ channels/Makefile 2007-07-19 11:17:12.000000000 +0200 @@ -24,12 +24,13 @@ endif ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib + CFLAGS+=-I${PREFIX}/include -L${PREFIX}/lib endif ifeq (${OSARCH},OpenBSD) PTLIB=-lpt_OpenBSD_x86_r H323LIB=-lh323_OpenBSD_x86_r + CHANH323LIB=-L${PREFIX}/lib endif ifeq (${OSARCH},Linux) @@ -76,7 +77,7 @@ endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so +# CHANNEL_LIBS+=chan_phone.so endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/compiler.h),) @@ -84,39 +85,39 @@ endif ifneq ($(wildcard h323/libchanh323.a),) - CHANNEL_LIBS+=chan_h323.so +# CHANNEL_LIBS+=chan_h323.so endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),) - CHANNEL_LIBS+=chan_misdn.so - CFLAGS+=-Imisdn +# CHANNEL_LIBS+=chan_misdn.so +# CFLAGS+=-Imisdn endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/mISDNdsp.h),) - CFLAGS+=-DMISDN_1_2 +# CFLAGS+=-DMISDN_1_2 endif CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) - CHANNEL_LIBS+=chan_alsa.so +# CHANNEL_LIBS+=chan_alsa.so endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri +# CFLAGS+=-DZAPATA_PRI +# ZAPPRI=-lpri endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 +# CFLAGS+=-DZAPATA_R2 +# ZAPR2=-lmfcr2 endif ALSA_SRC=chan_alsa.c ifneq ($(wildcard alsa-monitor.h),) - CFLAGS+=-DALSA_MONITOR - ALSA_SRC+=alsa-monitor.h +# CFLAGS+=-DALSA_MONITOR +# ALSA_SRC+=alsa-monitor.h endif ifndef WITHOUT_ZAPTEL @@ -132,10 +133,10 @@ endif endif # WITHOUT_ZAPTEL -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) - CHANNEL_LIBS+=chan_vpb.so - CFLAGS+=-DLINUX -endif +# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) +# CHANNEL_LIBS+=chan_vpb.so +# CFLAGS+=-DLINUX +# endif CFLAGS+=-DCRYPTO @@ -147,9 +148,9 @@ ZAPDIR=/usr/lib -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) - CHANNEL_LIBS+=chan_nbs.so -endif +# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) +# CHANNEL_LIBS+=chan_nbs.so +# endif ifndef OPENH323DIR OPENH323DIR=$(HOME)/openh323 @@ -175,13 +176,13 @@ include .depend endif -ifneq ($(wildcard h323/Makefile.ast),) - include h323/Makefile.ast -endif - -ifneq ($(wildcard misdn/Makefile.ast),) - include misdn/Makefile.ast -endif +# ifneq ($(wildcard h323/Makefile.ast),) +# include h323/Makefile.ast +# endif + +# ifneq ($(wildcard misdn/Makefile.ast),) +# include misdn/Makefile.ast +# endif gentone: gentone.c $(HOST_CC) -o gentone gentone.c -lm