diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 17:07:22 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 17:07:22 +0000 |
| commit | 42a59d0531531eaf829c6b4e5daaf98aeed4d38d (patch) | |
| tree | d60c1d44680a2468dac728d9ab7d40f2aa0d323f /channels/Makefile | |
| parent | e61c86f66aa05d8897a3ce99836770a75bb6edf7 (diff) | |
Mergeing in Paul Cadach's chan_h323 changes *holds breath*
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43281 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/channels/Makefile b/channels/Makefile index 13c6b1646..b0c2bf72b 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -63,7 +63,20 @@ clean:: rm -f busy.h ringtone.h gentone $(MAKE) -C misdn clean --include $(PWD)/Makefile.ast +ifneq ($(wildcard h323/Makefile.ast),) + include h323/Makefile.ast +H323LDFLAGS += -Wl,--version-script=h323/noexport.map +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 $(eval $(call ast_make_final_host,gentone,gentone.c)) gentone: LIBS+=-lm @@ -81,11 +94,13 @@ $(chan_iax2): iax2-parser.o iax2-provision.o chan_alsa.o: busy.h ringtone.h ifeq ($(OSARCH),linux-gnu) -chan_h323.so: chan_h323.o h323_module_interface.so h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $^ h323/libchanh323.a $(H323LDLIBS) -lstdc++ +chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + $(CMD_PREFIX) $(CXX) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) else -chan_h323.so: chan_h323.o h323_module_interface.so h323/libchanh323.a - $(CC) $(SOLINK) -o $@ $^ h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat +chan_h323.so: chan_h323.o h323/libchanh323.a + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + $(CMD_PREFIX) $(CXX) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif chan_misdn.o: CFLAGS+=-Imisdn -DCHAN_MISDN_VERSION=\"0.3.0\" |