[FFmpeg-cvslog] r22294 - in trunk: common.mak subdir.mak

[mru]

Author: mru
Date: Sun Mar  7 23:18:33 2010
New Revision: 22294

Log:
Define HAVE_AV_CONFIG_H only when building libraries

Modified:
   trunk/common.mak
   trunk/subdir.mak

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Sun Mar  7 23:18:30 2010	(r22293)
+++ trunk/common.mak	Sun Mar  7 23:18:33 2010	(r22294)
@@ -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

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Sun Mar  7 23:18:30 2010	(r22293)
+++ trunk/subdir.mak	Sun Mar  7 23:18:33 2010	(r22294)
@@ -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)