From 0c0c1d79750d9a1bacfd19289fd610c34890f33f Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 26 Nov 2009 18:15:01 +0100
Subject: [PATCH] Fix ffmpeg build with FRSH

---
 build/Makefile.omk.ffmpeg | 2 +-
 build/config.target       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/Makefile.omk.ffmpeg b/build/Makefile.omk.ffmpeg
index 591cb66..b5afe2c 100644
--- 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 565812e..d0a80c7 100644
--- 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
-- 
2.39.2