diff options
| author | Russell Bryant <russell@russellbryant.com> | 2009-03-29 05:32:04 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2009-03-29 05:32:04 +0000 |
| commit | 39c95555af88172b7cbb1c3c506d86c1a03f27cf (patch) | |
| tree | c4666ef43d350d96f66ed0453dc0149a5a9e00a1 /channels/Makefile | |
| parent | 383d4fa05b9ceccd9fee61767f5d9bf12fd3274f (diff) | |
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/trunk@184838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/channels/Makefile b/channels/Makefile index 9081e0cf0..ecdf96e40 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 @@ -107,4 +96,10 @@ chan_usbradio.o: ./xpmr/xpmr.c ./xpmr/xpmr.h ./xpmr/xpmr_coef.h 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 + |