[SCM] libav/experimental: Define HAVE_AV_CONFIG_H only when building libraries
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:03:24 UTC 2013
The following commit has been merged in the experimental branch:
commit 72c2bdebcff5610741d6e89cb6066ba2a88f59ac
Author: Måns Rullgård <mans at mansr.com>
Date: Sun Mar 7 22:18:33 2010 +0000
Define HAVE_AV_CONFIG_H only when building libraries
Originally committed as revision 22294 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/common.mak b/common.mak
index d7b54d0..b55e921 100644
--- a/common.mak
+++ b/common.mak
@@ -31,7 +31,7 @@ endif
ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
-CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS)
+CPPFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS)
CFLAGS += $(ECFLAGS)
%.o: %.c
diff --git a/subdir.mak b/subdir.mak
index b67288a..db0d876 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -5,6 +5,8 @@ include $(SUBDIR)../common.mak
LIBVERSION := $(lib$(NAME)_VERSION)
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
+$(OBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
+
ifdef CONFIG_STATIC
all: $(SUBDIR)$(LIBNAME)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list