Magellan Linux

Annotation of /trunk/mjpegtools/patches/mjpegtools-1.8.0-as-needed.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 224 - (hide annotations) (download)
Sat Jun 23 13:53:28 2007 UTC (17 years ago) by niro
File size: 1015 byte(s)
-new fixes

1 niro 224 diff -ru mjpegtools-1.8.0-orig/lavtools/Makefile.am mjpegtools-1.8.0/lavtools/Makefile.am
2     --- mjpegtools-1.8.0-orig/lavtools/Makefile.am 2006-08-25 15:09:51.542109878 +0200
3     +++ mjpegtools-1.8.0/lavtools/Makefile.am 2006-08-25 15:11:37.920337695 +0200
4     @@ -51,10 +51,17 @@
5     liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
6     liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
7     liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
8     +liblavrec_la_LIBADD = -llavfile -llavjpeg
9     +liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
10    
11     liblavplay_la_SOURCES = liblavplay.c audiolib.c
12     liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
13     liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
14     +liblavplay_la_LIBADD = -llavfile $(SDL_LIBS) -llavjpeg
15     +liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
16     +if HAVE_X
17     + liblavplay_la_LIBADD += $(X_LIBS) -lX11
18     +endif
19    
20     # *********************************************************************
21     # The tools themselves