aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-02 22:46:37 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-02 22:46:37 +0000
commit81798282f23fba2ff59d22774022543ebceb0f00 (patch)
tree997295039e5ef0b6bfbb4a1cecabf131f061456d
parente3c619b555ca0b461e53d3b4ba7acbf14d1c5bff (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: http://svn.digium.com/svn/asterisk/trunk@267352 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/Makefile2
-rw-r--r--channels/h323/Makefile.in1
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