summaryrefslogtreecommitdiff
path: root/package/multimedia/ffmpeg
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-06-25 23:26:04 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-07 08:14:41 +0200
commite721a7c07e0a9ab4a6a8fe7aff9f378ac4144df6 (patch)
tree676209106c916a1f9c2e1bbf6803e309a5a9029c /package/multimedia/ffmpeg
parent26082e79af64550d16fb1e314a904456b90a464e (diff)
Merge TARGET_CONFIGURE_ENV into TARGET_CONFIGURE_OPTS
TARGET_CONFIGURE_ENV defines CFLAGS, LDFLAGS, CXXFLAGS and FCFLAGS, separatly from all other variables that are part of TARGET_CONFIGURE_OPTS. This is useless and not consistent with the HOST_CONFIGURE_ variables, therefore we merge TARGET_CONFIGURE_ENV into TARGET_CONFIGURE_OPTS and fix the few users of TARGET_CONFIGURE_ENV. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/multimedia/ffmpeg')
-rw-r--r--package/multimedia/ffmpeg/ffmpeg.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 81984f1a7..aac39c15b 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -121,7 +121,6 @@ define FFMPEG_CONFIGURE_CMDS
(cd $(FFMPEG_SRCDIR) && rm -rf config.cache && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_ENV) \
$(FFMPEG_CONF_ENV) \
./configure \
--enable-cross-compile \