mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	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: https://origsvn.digium.com/svn/asterisk/trunk@44056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -32,7 +32,7 @@ include $(ASTTOPDIR)/Makefile.moddir_rules | ||||
|  | ||||
| ifneq ($(GSM_INTERNAL),) | ||||
| GSM_INCLUDE:=-Igsm/inc | ||||
| $(codec_gsm): gsm/lib/libgsm.a | ||||
| $(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): gsm/lib/libgsm.a | ||||
| endif | ||||
|  | ||||
| clean:: | ||||
| @@ -47,9 +47,9 @@ gsm/lib/libgsm.a: | ||||
| $(LIBLPC10): | ||||
| 	@$(MAKE) -C lpc10 all | ||||
|  | ||||
| $(codec_lpc10): $(LIBLPC10) | ||||
| $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10) | ||||
|  | ||||
| $(LIBILBC): | ||||
| 	@$(MAKE) -C ilbc all | ||||
|  | ||||
| $(codec_ilbc): $(LIBILBC) | ||||
| $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC) | ||||
|   | ||||
| @@ -347,7 +347,11 @@ $(LIBGSMSO):	$(LIB) $(GSM_OBJECTS) | ||||
| 		ln -fs libgsm.so.1.0.10 lib/libgsm.so.1 | ||||
| 		ln -fs libgsm.so.1.0.10 lib/libgsm.so | ||||
|  | ||||
| $(eval $(call ast_make_a_o,$(LIBGSM),$(GSM_OBJECTS))) | ||||
| $(LIBGSM): $(GSM_OBJECTS) | ||||
| 	$(ECHO_PREFIX) echo "   [AR] $^ -> $@" | ||||
| 	$(CMD_PREFIX) $(AR) cr $@ $^ | ||||
| 	$(CMD_PREFIX) $(RANLIB) $@ | ||||
|  | ||||
|  | ||||
| # Toast, Untoast and Tcat -- the compress-like frontends to gsm. | ||||
|  | ||||
|   | ||||
| @@ -11,7 +11,10 @@ include $(ASTTOPDIR)/Makefile.rules | ||||
|  | ||||
| all: $(LIB) | ||||
|  | ||||
| $(eval $(call ast_make_a_o,$(LIB),$(OBJS))) | ||||
| $(LIB): $(OBJS) | ||||
| 	$(ECHO_PREFIX) echo "   [AR] $^ -> $@" | ||||
| 	$(CMD_PREFIX) $(AR) cr $@ $^ | ||||
| 	$(CMD_PREFIX) $(RANLIB) $@ | ||||
|  | ||||
| clean: | ||||
| 	rm -f $(LIB) *.o | ||||
|   | ||||
| @@ -64,7 +64,10 @@ OBJ=f2clib.o analys.o bsynz.o chanwr.o dcbias.o decode.o \ | ||||
|     placea.o placev.o preemp.o prepro.o random.o rcchk.o \ | ||||
|     synths.o tbdm.o voicin.o vparms.o | ||||
|  | ||||
| $(eval $(call ast_make_a_o,$(LIB),$(OBJ))) | ||||
| $(LIB): $(OBJ) | ||||
| 	$(ECHO_PREFIX) echo "   [AR] $^ -> $@" | ||||
| 	$(CMD_PREFIX) $(AR) cr $@ $^ | ||||
| 	$(CMD_PREFIX) $(RANLIB) $@ | ||||
|  | ||||
| clean: | ||||
| 	rm -f *.o $(LIB) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user