Fix ffmpeg build with FRSH

diff --git a/build/Makefile.omk.ffmpeg b/build/Makefile.omk.ffmpeg
index 591cb66b2985eb286d633b2c6a07b45db3a7a939..b5afe2ca57b2f4371ddf3f3714898b83a9fc6e11 100644 (file)
--- a/build/Makefile.omk.ffmpeg
+++ b/build/Makefile.omk.ffmpeg
@@ -30,6 +30,6 @@ endif
 ifeq ($(FFMPEG_SUBDIR),libavformat)
 HEADERS += os_support.h
 ifeq ($(CONFIG_FFMPEG_WITH_FRSH),y)
-$(NAME)_SOURCES := $(filter-out udp.c,$(NAME)_SOURCES) frsh.c
+$(NAME)_SOURCES := $(filter-out udp.c,$($(NAME)_SOURCES)) frsh.c
 endif
 endif

diff --git a/build/config.target b/build/config.target
index 565812ed1a42da1edf3c75cc865e2116cf2542e6..d0a80c7c9f6b4817ccad725bf1b42a9fc7706431 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -16,6 +16,8 @@ renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
 INCLUDES += -I $(srcdir)/..
 endef
 
+CFLAGS+=$(if $(CONFIG_FFMPEG_WITH_FRSH:n=),-DCONFIG_FFMPEG_WITH_FRSH=y)
+
 
 $(SOURCES_DIR)/Makefile.omk: $(SOURCES_DIR)/Makefile $(MAKERULES_DIR)/ffmpeg/libswscale $(MAKERULES_DIR)/Makefile.omk.ffmpeg
        @echo "  FFOMK   $@"
@@ -68,7 +70,6 @@ CONFIG_AQUOSA=y
 # Instead, we call normal gcc with parameters which mgcc adds
 
 CFLAGS=$(ARCH_GCC_OPTS) -Wall -Wuninitialized -g -O1 $(CFLAGS-y) -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-CFLAGS+=$(if $(CONFIG_FFMPEG_WITH_FRSH:n=),-DCONFIG_FFMPEG_WITH_FRSH=y)
 
 LDFLAGS=$(ARCH_LD_OPTS) $(LIBS_PATH) $(LIBS)
 LDFLAGS += '-Wl,-rpath,$$ORIGIN/../lib' -z origin --enable-new-dtags