diff options
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile | 6 | ||||
| -rw-r--r-- | codecs/gsm/Makefile | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index cdc581d3d..8996ad452 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -42,14 +42,14 @@ clean:: gsm/lib/libgsm.a: @mkdir -p gsm/lib - @CFLAGS="$(OTHER_SUBDIR_CFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a + @$(MAKE) -C gsm lib/libgsm.a $(LIBLPC10): - @CFLAGS="$(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C lpc10 all + @$(MAKE) -C lpc10 all $(codec_lpc10): $(LIBLPC10) $(LIBILBC): - @CFLAGS="$(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C ilbc all + @$(MAKE) -C ilbc all $(codec_ilbc): $(LIBILBC) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 036bb530a..ba3a20062 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -72,7 +72,6 @@ PG = # CCFLAGS = -c -O CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops $(OPTIMIZE) -CCFLAGS += -fPIC # LD = gcc # LDFLAGS = @@ -155,7 +154,7 @@ INC = $(ROOT)/inc DEBUG = -DNDEBUG ######### Remove -DNDEBUG to enable assertions. -CFLAGS += $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \ +ASTCFLAGS += $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \ $(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC) ######### It's $(CC) $(CFLAGS) @@ -319,10 +318,6 @@ TOAST_INSTALL_TARGETS = \ # Default rules -.c.o: - $(CC) $(CFLAGS:-Werror=) $? - @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 - include $(ASTTOPDIR)/Makefile.rules # Target rules |