From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 29 Mar 2009 05:41:19 +0000 (+0000)
Subject: Merged revisions 184838 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b870aa38a391c2316509d3706e6d05277374236;p=thirdparty%2Fasterisk.git

Merged revisions 184838 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r184838 | russell | 2009-03-29 00:32:04 -0500 (Sun, 29 Mar 2009) | 8 lines

Simplify chan_h323 build to not require a second run of "make".

(closes issue #14715)
Reported by: jthurman
Patches:
      h323-makefile-1.6.2.0-beta1.patch uploaded by jthurman (license 614)
Tested by: tzafrir, russell

........


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

diff --git a/channels/Makefile b/channels/Makefile
index 4ceec696dc..1036dc639b 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -57,25 +57,14 @@ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
   LIBS+= -lres_monitor.so -lres_features.so
 endif
 
-clean::
-	$(MAKE) -C misdn clean
-
 ifneq ($(wildcard h323/Makefile.ast),)
-  include h323/Makefile.ast
+include h323/Makefile.ast
+endif
 H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
+
 clean::
+	$(MAKE) -C misdn clean
 	if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi
-else
-h323/libchanh323.a h323/Makefile.ast:
-	$(CMD_PREFIX) $(MAKE) -C h323
-	$(CMD_PREFIX) rm -f ../main/asterisk
-	$(CMD_PREFIX) echo "***************************************************************"
-	$(CMD_PREFIX) echo
-	$(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********"
-	$(CMD_PREFIX) echo
-	$(CMD_PREFIX) echo "***************************************************************"
-	$(CMD_PREFIX) exit 1
-endif
 
 dist-clean::
 	rm -f h323/Makefile
@@ -106,4 +95,10 @@ chan_usbradio.o: ./xpmr/xpmr.c ./xpmr/xpmr.h ./xpmr/xpmr_coef.h
 
 chan_usbradio.so: LIBS+=-lusb -lasound
 
+h323/Makefile.ast:
+	$(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast
+
+h323/libchanh323.a:
+	$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a
+