diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-29 18:54:21 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-29 18:54:21 +0000 |
| commit | 89050169c8547cc6564741f0541583377d9a93d7 (patch) | |
| tree | 90d8fe328a1e6371e95020100dad8cd49eb55be0 /channels/Makefile | |
| parent | ee4141c375981e803098f0831d6b7a6213e5835a (diff) | |
Merged revisions 43996-43997,44008,44011-44012 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines
another cross-compile fix
........
r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines
support --without-curl in configure script
........
r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines
don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead
........
r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines
missed one conversion to ASTCFLAGS
........
r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines
yet another place where we were not using the correct CFLAGS by default
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/Makefile b/channels/Makefile index b5f55a368..6c10010a9 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -65,7 +65,7 @@ clean:: ifneq ($(wildcard h323/Makefile.ast),) include h323/Makefile.ast -H323LDFLAGS += -Wl,--version-script=h323/noexport.map +H323LDFLAGS+=-Wl,--version-script=h323/noexport.map clean:: $(MAKE) -C h323 clean else @@ -105,8 +105,8 @@ chan_h323.so: chan_h323.o h323/libchanh323.a $(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 +chan_misdn.o: ASTCFLAGS+=-Imisdn -misdn_config.o: CFLAGS+=-Imisdn +misdn_config.o: ASTCFLAGS+=-Imisdn $(chan_misdn): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o |