--- mjpegtools-1.8.0-orig/lavtools/Makefile.am	2006-08-25 15:09:51.542109878 +0200
+++ mjpegtools-1.8.0-orig/lavtools/Makefile.am	2006-08-25 15:11:37.920337695 +0200
@@ -51,10 +51,17 @@ 
 liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
 liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
 liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+liblavrec_la_LIBADD = -llavfile -llavjpeg
+liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
 
 liblavplay_la_SOURCES = liblavplay.c audiolib.c
 liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
 liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+liblavplay_la_LIBADD = -llavfile $(SDL_LIBS) -llavjpeg
+liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
+if HAVE_X
+  liblavplay_la_LIBADD += $(X_LIBS) -lX11
+endif
 
 # *********************************************************************
 # The tools themselves