diff --git a/common.mak b/common.mak index 9f28b596d3..0d5fdceec4 100644 --- a/common.mak +++ b/common.mak @@ -5,6 +5,10 @@ VPATH = $(SRC_PATH_BARE)/lib$(NAME) SRC_DIR = "$(VPATH)" +CFLAGS += $(CFLAGS-yes) +OBJS += $(OBJS-yes) +ASM_OBJS += $(ASM_OBJS-yes) + CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ -I$(SRC_PATH)/libavutil $(OPTFLAGS) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a8fd2c8e12..adfc04d459 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -400,10 +400,6 @@ endif OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \ -CFLAGS += $(CFLAGS-yes) -OBJS += $(OBJS-yes) -ASM_OBJS += $(ASM_OBJS-yes) - EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) NAME=avcodec diff --git a/libavformat/Makefile b/libavformat/Makefile index 056282c8fe..3f338c7647 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -173,8 +173,6 @@ OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o endif -OBJS += $(OBJS-yes) - NAME=avformat ifeq ($(BUILD_SHARED),yes) LIBVERSION=$(LAVFVERSION)