Index: channels/Makefile =================================================================== --- channels/Makefile (revision 168542) +++ channels/Makefile (working copy) @@ -59,14 +59,18 @@ clean:: $(MAKE) -C misdn clean + if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi +dist-clean:: + rm -f h323/Makefile + 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: +h323/libchanh323.a: $(CMD_PREFIX) $(MAKE) -C h323 $(CMD_PREFIX) rm -f ../main/asterisk $(CMD_PREFIX) echo "***************************************************************" @@ -77,16 +81,17 @@ $(CMD_PREFIX) exit 1 endif -dist-clean:: - rm -f h323/Makefile - $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o ifeq ($(OSARCH),linux-gnu) -chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast +ifeq ($(filter chan_h323,$(EMBEDDED_MODS)),) +chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) else +modules.link: h323/libchanh323.a +endif +else chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat