diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:48:43 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:48:43 +0000 |
commit | a8442c9b22767096823aa7a169bc1496a8dd2c42 (patch) | |
tree | 88f2aec2951b6ce52b91c03ed0bd4a697b1642c9 /channels/Makefile | |
parent | fcfda97ed2478ac34b65ba502ad183583c446476 (diff) |
Merged revisions 44055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44055 | kpfleming | 2006-09-29 17:47:40 -0500 (Fri, 29 Sep 2006) | 2 lines
fix a few build system bugs, and convert Makefiles to be compatible with GNU make 3.80
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44056 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/Makefile')
-rw-r--r-- | channels/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/Makefile b/channels/Makefile index 6c10010a9..3d36793d4 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -80,7 +80,9 @@ h323/libchanh323.a h323/Makefile.ast: $(CMD_PREFIX) exit 1 endif -$(eval $(call ast_make_final_host,gentone,gentone.c)) +gentone: gentone.c + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + $(CMD_PREFIX) $(HOST_CC) $(STATIC_BUILD) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $^ $(LIBS) gentone: LIBS+=-lm busy.h: gentone @@ -91,7 +93,7 @@ ringtone.h: gentone chan_oss.o: busy.h ringtone.h -$(chan_iax2): iax2-parser.o iax2-provision.o +$(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o chan_alsa.o: busy.h ringtone.h @@ -109,4 +111,4 @@ chan_misdn.o: ASTCFLAGS+=-Imisdn misdn_config.o: ASTCFLAGS+=-Imisdn -$(chan_misdn): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o +$(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o |