[FFmpeg-cvslog] r22330 - trunk/subdir.mak

mru subversion
Mon Mar 8 19:43:30 CET 2010


Author: mru
Date: Mon Mar  8 19:43:29 2010
New Revision: 22330

Log:
Define HAVE_AV_CONFIG_H when building test apps

Modified:
   trunk/subdir.mak

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Mon Mar  8 19:43:27 2010	(r22329)
+++ trunk/subdir.mak	Mon Mar  8 19:43:29 2010	(r22330)
@@ -5,7 +5,7 @@ include $(SUBDIR)../common.mak
 LIBVERSION := $(lib$(NAME)_VERSION)
 LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
 
-$(OBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
+$(OBJS) $(SUBDIR)%-test.o: CPPFLAGS += -DHAVE_AV_CONFIG_H
 
 ifdef CONFIG_STATIC
 all: $(SUBDIR)$(LIBNAME)
@@ -29,10 +29,10 @@ $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
 	$$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
 
 $(SUBDIR)%-test.o: $(SUBDIR)%.c
-	$$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
+	$$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
 
 $(SUBDIR)%-test.o: $(SUBDIR)%-test.c
-	$$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
+	$$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
 
 $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
 	$$(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d)



More information about the ffmpeg-cvslog mailing list