From 06bec925463ebbe0f2b27a7dcdde70b290738b5f Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 22 Nov 2003 04:06:06 +0000 Subject: [PATCH] distcheck fixes Original commit message from CVS: distcheck fixes --- gst-libs/ext/ffmpeg/Makefile.am | 14 +++----------- sys/v4l2/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am index fc32593f71..0a7a076d04 100644 --- a/gst-libs/ext/ffmpeg/Makefile.am +++ b/gst-libs/ext/ffmpeg/Makefile.am @@ -74,15 +74,6 @@ install: all uninstall: @true -# override recursive targets -# FIXME: maybe this can be prettier, so it doesn't generate warnings -dvi-recursive: - true -check-recursive: - true -installcheck-recursive: - true - noinst_LTLIBRARIES = libavformat.la libavcodec.la @@ -168,8 +159,9 @@ libavformat_la_SOURCES = \ ffmpeg/libavformat/yuv.c libavformat_la_LDFLAGS = -lm -lz -libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir)/ffmpeg -I$(srcdir)/ffmpeg/libavformat \ - -I$(srcdir)/ffmpeg/libavcodec -DHAVE_AV_CONFIG_H \ +libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir) -I$(srcdir)/ffmpeg \ + -I$(srcdir)/ffmpeg/libavformat -I$(srcdir)/ffmpeg/libavcodec \ + -I$(top_srcdir)/gst-libs/ext/linux/ -DHAVE_AV_CONFIG_H \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am index 2c537b412e..5d3e380386 100644 --- a/sys/v4l2/Makefile.am +++ b/sys/v4l2/Makefile.am @@ -11,7 +11,7 @@ libgstvideo4linux2_la_SOURCES = \ gstv4l2colorbalance.c libgstvideo4linux2_la_CFLAGS = $(GST_CFLAGS) libgstvideo4linux2_la_LIBADD = \ - $(top_srcdir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la + $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstv4l2element.h v4l2_calls.h \