[svn-commits] russell: branch 1.6.0 r184841 - in /branches/1.6.0: ./ channels/Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Sun Mar 29 00:43:28 2009
New Revision: 184841

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184841
Log:
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.0.7-rc2.patch uploaded by jthurman (license 614)
      h323-makefile-1.6.1.0-rc3.patch uploaded by jthurman (license 614)
      h323-makefile-1.6.2.0-beta1.patch uploaded by jthurman (license 614)
Tested by: tzafrir, russell

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/Makefile?view=diff&rev=184841&r1=184840&r2=184841
==============================================================================
--- branches/1.6.0/channels/Makefile (original)
+++ branches/1.6.0/channels/Makefile Sun Mar 29 00:43:28 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
@@ -101,3 +90,9 @@
 $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
 
 $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o
+
+h323/Makefile.ast:
+	$(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast
+ 
+h323/libchanh323.a:
+	$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a