1 --- mjpegtools-1.8.0/lavtools/Makefile.am.orig 2005-06-16 19:09:37.000000000 +0200
2 +++ mjpegtools-1.8.0/lavtools/Makefile.am 2005-10-11 10:13:32.000000000 +0200
4 liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS) $(LIBQUICKTIME_CFLAGS)
5 liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
6 $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
7 +liblavfile_la_LIBADD = $(top_builddir)/utils/libmjpegutils.la
9 liblavjpeg_la_SOURCES = jpegutils.c
10 liblavjpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
11 liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
12 +liblavjpeg_la_LIBADD = $(top_builddir)/utils/libmjpegutils.la
14 liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
15 liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
16 liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
17 +liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la \
18 + $(top_builddir)/utils/libmjpegutils.la
21 + LAVPLAY_X_LIBS = $(X_LIBS) -lX11
24 liblavplay_la_SOURCES = liblavplay.c audiolib.c
25 liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
26 liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
27 +liblavplay_la_LIBADD = liblavfile.la liblavjpeg.la \
28 + $(top_builddir)/utils/libmjpegutils.la \
29 + $(SDL_LIBS) $(LAVPLAY_X_LIBS)
31 # *********************************************************************
32 # The tools themselves
34 multiblend_flt_SOURCES = multiblend.flt.c
35 multiblend_flt_LDADD = $(LIBMJPEGUTILS)
38 - LAVPLAY_X_LIBS = $(X_LIBS) -lX11
41 lavplay_SOURCES = lavplay.c
42 lavplay_LDADD = $(LIBMJPEGUTILS) \
43 liblavplay.la liblavjpeg.la liblavfile.la \