[Ffmpeg-cvslog] r8788 - trunk/tests/Makefile

[Oded Shimon]

On Mon, Apr 23, 2007 at 09:49:29PM +0300, Oded Shimon wrote:
> On Sun, Apr 22, 2007 at 08:30:14PM +0200, michael wrote:
> > Author: michael
> > Date: Sun Apr 22 20:30:14 2007
> > New Revision: 8788
> > 
> > Log:
> > ensure that seek_test is rebuild if any of the libs changed
> > 
> > 
> > Modified:
> >    trunk/tests/Makefile
> > 
> > Modified: trunk/tests/Makefile
> > ==============================================================================
> > --- trunk/tests/Makefile	(original)
> > +++ trunk/tests/Makefile	Sun Apr 22 20:30:14 2007
> > @@ -82,8 +82,10 @@ audiogen$(EXESUF): audiogen.c
> >  tiny_psnr$(EXESUF): tiny_psnr.c
> >  	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
> >  
> > +LIBAV = ../libavformat/libavformat.a ../libavcodec/libavcodec.a ../libavutil/libavutil.a
> > +
> >  #FIXME cleanup shit below
> > -seek_test$(EXESUF): seek_test.c
> > +seek_test$(EXESUF): seek_test.c $(LIBAV)
> >  	$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat/ -I$(SRC_PATH)/libavcodec/ -I$(SRC_PATH)/libavutil/ -o $@ $< $(SRC_PATH)/libavformat/libavformat.a $(SRC_PATH)/libavcodec/libavcodec.a $(SRC_PATH)/libavutil/libavutil.a $(EXTRALIBS)
> 
> May I suggest...
> 
> LIBAV = $(SRC_PATH)/libavformat/libavformat.a $(SRC_PATH)/libavcodec/libavcodec.a $(SRC_PATH)/libavutil/libavutil.a
> seek_test$(EXESUF): seek_test.c $(LIBAV)
> 	$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat/ -I$(SRC_PATH)/libavcodec/ -I$(SRC_PATH)/libavutil/ -o $@ $^ $(EXTRALIBS)
> 
> 
> Seems more correct and logical...

In diff form...

- ods15
-------------- next part --------------
Index: tests/Makefile
===================================================================
--- tests/Makefile	(revision 8793)
+++ tests/Makefile	(working copy)
@@ -82,11 +82,11 @@
 tiny_psnr$(EXESUF): tiny_psnr.c
 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
-LIBAV = ../libavformat/libavformat.a ../libavcodec/libavcodec.a ../libavutil/libavutil.a
+LIBAV = $(SRC_PATH)/libavformat/libavformat.a $(SRC_PATH)/libavcodec/libavcodec.a $(SRC_PATH)/libavutil/libavutil.a
 
 #FIXME cleanup shit below
 seek_test$(EXESUF): seek_test.c $(LIBAV)
-	$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat/ -I$(SRC_PATH)/libavcodec/ -I$(SRC_PATH)/libavutil/ -o $@ $< $(SRC_PATH)/libavformat/libavformat.a $(SRC_PATH)/libavcodec/libavcodec.a $(SRC_PATH)/libavutil/libavutil.a $(EXTRALIBS)
+	$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat/ -I$(SRC_PATH)/libavcodec/ -I$(SRC_PATH)/libavutil/ -o $@ $^ $(EXTRALIBS)
 
 DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
  $(SRC_PATH)/libavcodec/i386/dsputil_mmx_avg.h \