diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-07 22:18:33 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-07 22:18:33 +0000 |
| commit | 72c2bdebcff5610741d6e89cb6066ba2a88f59ac (patch) | |
| tree | 9e6b4145c18214a768c8ec9097d6ed927ae0d678 | |
| parent | acd0026c0b7ee0f73339ab3b71b34b3b513ee0de (diff) | |
| download | ffmpeg-72c2bdebcff5610741d6e89cb6066ba2a88f59ac.tar.gz | |
Define HAVE_AV_CONFIG_H only when building libraries
Originally committed as revision 22294 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | subdir.mak | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common.mak b/common.mak index d7b54d0427..b55e921f54 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 b67288a4b7..db0d8763f7 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) |