Index: channels/h323/Makefile =================================================================== --- channels/h323/Makefile (revision 63330) +++ channels/h323/Makefile (working copy) @@ -4,6 +4,9 @@ # Make file for OpenH323 support layer # +TARGET= +OBJS= + # Verify those options with main Makefile STDCCFLAGS += -DNDEBUG STDCCFLAGS += $(shell grep ^DEBUG_THREADS ../../Makefile | sed -e "s/^DEBUG_THREADS[ ]*=//" -e "s/\([^\#]*\)\#.*/\1/") @@ -18,11 +21,10 @@ OBJDIR = . ifndef OPENH323DIR -OPENH323DIR=$(HOME)/openh323 +OPENH323DIR=/xtd/cafes/asterisk.trunk/openh323 endif -clean: - rm -f *.so *.o .depend +include $(OPENH323DIR)/openh323u.mak $(SOURCES):: $(SOURCES:.cxx=.cpp) ln -f $< $@ @@ -31,7 +33,6 @@ touch $(SOURCES) libchanh323.a: $(OBJS) - include $(OPENH323DIR)/openh323u.mak ar crv $@ $(OBJS) Makefile.ast: FORCE Index: channels/Makefile =================================================================== --- channels/Makefile (revision 63330) +++ channels/Makefile (working copy) @@ -14,7 +14,7 @@ # the GNU General Public License # -CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so +CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so chan_h323.so SUBDIRS=misdn h323 @@ -149,10 +149,12 @@ ifndef OPENH323DIR OPENH323DIR=$(HOME)/openh323 + OPENH323DIR=/xtd/cafes/asterisk.trunk/openh323 endif ifndef PWLIBDIR PWLIBDIR=$(HOME)/pwlib + PWLIBDIR=/xtd/cafes/asterisk.trunk/pwlib endif #CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")