[asterisk-commits] branch group/autoconf_and_menuselect r21770 - /team/group/autoconf_and_menuse...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Apr 20 14:05:40 2006
New Revision: 21770

URL: http://svn.digium.com/view/asterisk?rev=21770&view=rev
Log:
- use $(...) everywhere instead of ${...} in some places
- remove the chan_sip.so because %.so is the same thing
- remove $(LIBS) from the %.so target
- use ZAPTEL_LIB and ZAPTEL_INCLUDE for building chan_zap
- fix a typo, ASOUND_LIBS was supposed to be ASOUND_LIB
- use NBS_LIB and NBS_INCLUDE for building chan_nbs

Modified:
    team/group/autoconf_and_menuselect/channels/Makefile

Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=21770&r1=21769&r2=21770&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Thu Apr 20 14:05:40 2006
@@ -13,18 +13,18 @@
 
 MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%.so,$(wildcard chan_*.c)))
 
-ifeq (${OSARCH},OpenBSD)
+ifeq ($(OSARCH),OpenBSD)
   PTLIB=-lpt_OpenBSD_x86_r
   H323LIB=-lh323_OpenBSD_x86_r
 endif
 
-ifeq (${OSARCH},Linux)
+ifeq ($(OSARCH),Linux)
   PTLIB=-lpt_linux_x86_r
   H323LIB=-lh323_linux_x86_r
   CHANH323LIB=-ldl
 endif
 
-ifeq (${OSARCH},CYGWIN)
+ifeq ($(OSARCH),CYGWIN)
   CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
   CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
   CYG_CHAN_AGENT=-lres_monitor.so
@@ -35,22 +35,22 @@
   CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
-ifeq (${OSARCH},FreeBSD)
+ifeq ($(OSARCH),FreeBSD)
   PTLIB=-lpt_FreeBSD_x86_r
   H323LIB=-lh323_FreeBSD_x86_r
   CHANH323LIB=-pthread
 endif
 
-ifeq (${OSARCH},NetBSD)
+ifeq ($(OSARCH),NetBSD)
   PTLIB=-lpt_NetBSD_x86_r
   H323LIB=-lh323_NetBSD_x86_r
 endif
 
-ifeq (${OSARCH},SunOS)
+ifeq ($(OSARCH),SunOS)
   SOLINK+=-lrt
 endif
 
-ifeq (${WITH_SMDI},1)
+ifeq ($(WITH_SMDI),1)
   CFLAGS+=-DWITH_SMDI
 endif
 
@@ -92,7 +92,7 @@
 	rm -f busy.h ringtone.h gentone gentone-ulaw
 
 %.so : %.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB)
 
 ifneq ($(wildcard .depend),)
   include .depend
@@ -120,38 +120,38 @@
 
 chan_oss.o: chan_oss.c busy.h ringtone.h
 
-ifeq (${OSARCH},OpenBSD)
+ifeq ($(OSARCH),OpenBSD)
 chan_oss.so: chan_oss.o
 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
 endif
-ifeq (${OSARCH},NetBSD)
+ifeq ($(OSARCH),NetBSD)
 chan_oss.so: chan_oss.o
 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
 endif
 
 chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_iax2.o iax2-parser.o iax2-provision.o ${CYGSOLIB}
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) chan_iax2.o iax2-parser.o iax2-provision.o $(CYGSOLIB)
+
+chan_zap.so: chan_zap.o
+	$(CC) $(SOLINK) -o $@ $< $(PRI_LIB) $(MFCR2_LIB) $(ZAPTEL_LIB)
 
 chan_zap.o: chan_zap.c
-	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
-
-chan_zap.so: chan_zap.o
-	$(CC) $(SOLINK) -o $@ $<  $(PRI_LIB) $(MFCR2_LIB) -ltonezone
-
-chan_sip.so: chan_sip.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_sip.o ${CYGSOLIB}
+	$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
 
 chan_agent.so: chan_agent.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_agent.o ${CYGSOLIB} ${CYG_CHAN_AGENT}
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) chan_agent.o $(CYGSOLIB) $(CYG_CHAN_AGENT)
 
 chan_alsa.so: chan_alsa.o
-	$(CC) $(SOLINK) -o $@ $< $(ASOUND_LIBS)
+	$(CC) $(SOLINK) -o $@ $< $(ASOUND_LIB)
 
 chan_alsa.o: chan_alsa.c busy.h ringtone.h
 	$(CC) -c -o $@ $(CFLAGS) $(ASOUND_INCLUDE) $<
 
 chan_nbs.so: chan_nbs.o
-	$(CC) $(SOLINK) -o $@ $< -lnbs
+	$(CC) $(SOLINK) -o $@ $< $(NBS_LIB)
+
+chan_nbs.o: chan_nbs.c
+	$(CC) -c -o $@ $(CFLAGS) $(NBS_INCLUDE) $<
 
 chan_vpb.o: chan_vpb.c
 	$(CXX) -c $(CFLAGS:-Werror=) -o $@ chan_vpb.c
@@ -159,7 +159,7 @@
 chan_vpb.so: chan_vpb.o
 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
 
-ifeq (${OSARCH},Linux)
+ifeq ($(OSARCH),Linux)
 chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
 	$(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
 else