diff options
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/Makefile | 7 | ||||
-rw-r--r-- | codecs/gsm/Makefile | 11 | ||||
-rw-r--r-- | codecs/ilbc/Makefile | 24 | ||||
-rw-r--r-- | codecs/lpc10/Makefile | 25 |
4 files changed, 27 insertions, 40 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 37aef4345..2e856a52b 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -38,14 +38,15 @@ clean:: $(MAKE) -C ilbc clean gsm/lib/libgsm.a: - CFLAGS="$(ASTCFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a + @mkdir -p gsm/lib + @CFLAGS="$(ASTCFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a $(LIBLPC10): - CFLAGS="$(ASTCFLAGS)" $(MAKE) -C lpc10 all + @CFLAGS="$(ASTCFLAGS)" $(MAKE) -C lpc10 all codec_lpc10.so: $(LIBLPC10) $(LIBILBC): - CFLAGS="$(ASTCFLAGS)" $(MAKE) -C ilbc all + @CFLAGS="$(ASTCFLAGS)" $(MAKE) -C ilbc all codec_ilbc.so: $(LIBILBC) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 7be253e84..49d2ad372 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -71,12 +71,9 @@ PG = # CC = /usr/lang/acc # CCFLAGS = -c -O -CC ?= gcc CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops $(OPTIMIZE) CCFLAGS += -fPIC -LD = $(CC) - # LD = gcc # LDFLAGS = @@ -326,6 +323,8 @@ TOAST_INSTALL_TARGETS = \ $(CC) $(CFLAGS:-Werror=) $? @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 +include $(ASTTOPDIR)/Makefile.rules + # Target rules all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) @@ -353,11 +352,7 @@ $(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 -$(LIBGSM): $(LIB) $(GSM_OBJECTS) - -rm $(RMFLAGS) $(LIBGSM) - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) - $(RANLIB) $(LIBGSM) - +$(eval $(call ast_make_a_o,$(LIBGSM),$(GSM_OBJECTS))) # Toast, Untoast and Tcat -- the compress-like frontends to gsm. diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile index c916ff3dd..1060579ab 100644 --- a/codecs/ilbc/Makefile +++ b/codecs/ilbc/Makefile @@ -1,23 +1,17 @@ -ARCH=$(PROC) -CFLAGS+=-Wall -O3 -funroll-loops -CFLAGS += -fPIC LIB=libilbc.a +CFLAGS+=-fPIC -OBJS= anaFilter.o iCBSearch.o packing.o \ - constants.o gainquant.o iLBC_decode.o StateConstructW.o \ - createCB.o getCBvec.o iLBC_encode.o StateSearchW.o doCPLC.o \ - helpfun.o syntFilter.o enhancer.o hpInput.o LPCdecode.o \ - filter.o hpOutput.o LPCencode.o FrameClassify.o iCBConstruct.o lsf.o +OBJS=anaFilter.o iCBSearch.o packing.o \ + constants.o gainquant.o iLBC_decode.o StateConstructW.o \ + createCB.o getCBvec.o iLBC_encode.o StateSearchW.o doCPLC.o \ + helpfun.o syntFilter.o enhancer.o hpInput.o LPCdecode.o \ + filter.o hpOutput.o LPCencode.o FrameClassify.o iCBConstruct.o lsf.o -all: $(LIB) +include $(ASTTOPDIR)/Makefile.rules +all: $(LIB) -$(LIB): $(OBJS) - ar cr $(LIB) $(OBJS) - ranlib $(LIB) +$(eval $(call ast_make_a_o,$(LIB),$(OBJS))) clean: rm -f $(LIB) *.o - -install: - diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index e52ca19b6..75b3f858f 100644 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -21,10 +21,7 @@ LIB_TARGET_DIR = . # directives can find the machine.h file. # -WARNINGS = -Wall -Wno-comment -Wno-error -CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -CFLAGS += -fPIC -#CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) +CFLAGS+= -fPIC -Wno-comment #fix for PPC processors and ALPHA, And UltraSparc too ifneq ($(OSARCH),Darwin) @@ -56,18 +53,18 @@ LIB = $(LIB_TARGET_DIR)/liblpc10.a .PHONY: all clean +include $(ASTTOPDIR)/Makefile.rules + all: $(LIB) -OBJ= f2clib.o analys.o bsynz.o chanwr.o dcbias.o decode.o \ - deemp.o difmag.o dyptrk.o encode.o energy.o ham84.o \ - hp100.o invert.o irc2pc.o ivfilt.o lpcdec.o lpcenc.o \ - lpcini.o lpfilt.o median.o mload.o onset.o pitsyn.o \ - placea.o placev.o preemp.o prepro.o random.o rcchk.o \ - synths.o tbdm.o voicin.o vparms.o +OBJ=f2clib.o analys.o bsynz.o chanwr.o dcbias.o decode.o \ + deemp.o difmag.o dyptrk.o encode.o energy.o ham84.o \ + hp100.o invert.o irc2pc.o ivfilt.o lpcdec.o lpcenc.o \ + lpcini.o lpfilt.o median.o mload.o onset.o pitsyn.o \ + placea.o placev.o preemp.o prepro.o random.o rcchk.o \ + synths.o tbdm.o voicin.o vparms.o -$(LIB): $(OBJ) - $(AR) cr $@ $(OBJ) - ranlib $@ +$(eval $(call ast_make_a_o,$(LIB),$(OBJ))) clean: - -rm -f *.o $(LIB) + rm -f *.o $(LIB) |