diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-06-02 22:46:37 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-06-02 22:46:37 +0000 |
| commit | bb4c55c34791402a2d33bd302b6a0d6869beacb6 (patch) | |
| tree | 997295039e5ef0b6bfbb4a1cecabf131f061456d | |
| parent | 0760f4e70a890475186d4ad67e989fe017189d77 (diff) | |
try to fix some random chan_h323 compilation failures
After some debugging, the random chan_h323 build failures appear to be due
to complications introduced by some chan_h323 specific build stuff getting
triggered during a clean. Simplify this by moving the h323 clean commands
down into channels/makefile.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@267352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/Makefile | 2 | ||||
| -rw-r--r-- | channels/h323/Makefile.in | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/channels/Makefile b/channels/Makefile index c8f4d8041..f9591da0c 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -63,8 +63,8 @@ endif clean:: $(MAKE) -C misdn clean - if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi rm -f sip/*.o sip/*.i + rm -f h323/libchanh323.a h323/Makefile.ast h323/*.o h323/*.dep dist-clean:: rm -f h323/Makefile diff --git a/channels/h323/Makefile.in b/channels/h323/Makefile.in index 5f949ca7d..2d5f3a547 100644 --- a/channels/h323/Makefile.in +++ b/channels/h323/Makefile.in @@ -47,4 +47,3 @@ Makefile.ast: @if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi clean:: - rm -f $(TARGET) $(OBJS) Makefile.ast *.dep |