[svn-commits] russell: trunk r184838 - /trunk/channels/Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Sun Mar 29 00:32:04 2009
New Revision: 184838

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184838
Log:
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

Modified:
    trunk/channels/Makefile

Modified: trunk/channels/Makefile
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/Makefile?view=diff&rev=184838&r1=184837&r2=184838
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Sun Mar 29 00:32:04 2009
@@ -57,25 +57,14 @@
   LIBS+= -lres_monitor.so -lres_features.so
 endif
 
+ifneq ($(wildcard h323/Makefile.ast),)
+include h323/Makefile.ast
+endif
+H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
+
 clean::
 	$(MAKE) -C misdn clean
-
-ifneq ($(wildcard h323/Makefile.ast),)
-  include h323/Makefile.ast
-H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
-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
@@ -107,4 +96,10 @@
 chan_usbradio.so: LIBS+=-lusb -lasound
 chan_usbradio.so: ASTCFLAGS+=-DNDEBUG
 
+h323/Makefile.ast:
+	$(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast
 
+h323/libchanh323.a:
+	$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a
+
+