projects / packages / mjpegtools.git / blame
| Commit | Line | Data |
|---|---|---|
| e2e721d2 JB |
1 | --- mjpegtools-1.6.1.93/lavtools/Makefile.am.orig 2004-01-17 23:57:49.000000000 +0100 |
| 2 | +++ mjpegtools-1.6.1.93/lavtools/Makefile.am 2004-01-18 00:16:47.520474480 +0100 | |
| 3 | @@ -45,16 +45,28 @@ | |
| 4 | liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c | |
| 5 | liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \ | |
| 6 | $(QUICKTIME_LIBS) $(JPEG_LIBS) $(DV_LIBS) | |
| 7 | +liblavfile_la_LIBADD = $(top_builddir)/utils/libmjpegutils.la | |
| 8 | ||
| 9 | liblavjpeg_la_SOURCES = jpegutils.c | |
| 10 | liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS) | |
| 11 | +liblavjpeg_la_LIBADD = $(top_builddir)/utils/libmjpegutils.la | |
| 12 | ||
| 13 | liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c | |
| 14 | liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) | |
| 15 | +liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la \ | |
| 16 | + $(top_builddir)/utils/libmjpegutils.la \ | |
| 17 | + $(PTHREAD_LIBS) | |
| 18 | liblavrec_la_CFLAGS = $(AM_CFLAGS) | |
| 19 | ||
| 20 | +if HAVE_X | |
| 21 | + LAVPLAY_X_LIBS = $(X_LIBS) -lX11 | |
| 22 | +endif | |
| 23 | + | |
| 24 | liblavplay_la_SOURCES = liblavplay.c audiolib.c | |
| 25 | liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) | |
| 26 | +liblavplay_la_LIBADD = liblavfile.la liblavjpeg.la \ | |
| 27 | + $(top_builddir)/utils/libmjpegutils.la \ | |
| 28 | + $(PTHREAD_LIBS) $(SDL_LIBS) $(LAVPLAY_X_LIBS) | |
| 29 | liblavplay_la_CFLAGS = $(AM_CFLAGS) | |
| 30 | ||
| 31 | # ********************************************************************* | |
| 32 | @@ -148,10 +160,6 @@ | |
| 33 | multiblend_flt_SOURCES = multiblend.flt.c | |
| 34 | multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la | |
| 35 | ||
| 36 | -if HAVE_X | |
| 37 | - LAVPLAY_X_LIBS = $(X_LIBS) -lX11 | |
| 38 | -endif | |
| 39 | - | |
| 40 | lavplay_SOURCES = lavplay.c | |
| 41 | lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.la \ | |
| 42 | liblavplay.la liblavjpeg.la liblavfile.la \ | |
| 43 | --- mjpegtools-1.6.1.93/mpeg2enc/Makefile.am.orig 2004-01-17 23:57:49.000000000 +0100 | |
| 44 | +++ mjpegtools-1.6.1.93/mpeg2enc/Makefile.am 2004-01-18 00:10:00.416363712 +0100 | |
| 45 | @@ -122,7 +122,8 @@ | |
| 46 | $(top_builddir)/utils/libmjpegutils.la \ | |
| 47 | $(top_builddir)/utils/libcpuaccel.la \ | |
| 48 | $(top_builddir)/utils/libmotion.la \ | |
| 49 | - $(LIBSIMDASM_LIB) | |
| 50 | + $(LIBSIMDASM_LIB) \ | |
| 51 | + @PTHREAD_LIBS@ | |
| 52 | ||
| 53 | mpeg2enc_DEPENDENCIES = \ | |
| 54 | $(top_builddir)/utils/libmjpegutils.la \ |