diff --git a/ext/Makefile.am b/ext/Makefile.am index 2c0c73bbf6..08210afb8d 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -136,6 +136,12 @@ else OPENQUICKTIME_DIR= endif +if USE_RAW1394 +RAW1394_DIR=raw1394 +else +RAW1394_DIR= +endif + if USE_RTP RTP_DIR=rtp else @@ -170,11 +176,12 @@ SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) $(DVDREAD_DIR) $(ESD_DIR) \ $(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) $(HERMES_DIR) \ - $(HTTP_DIR) $(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \ - $(OPENQUICKTIME_DIR) $(RTP_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR) \ + $(HTTP_DIR) $(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) \ + $(MIKMOD_DIR) $(MPEG2DEC_DIR) $(OPENQUICKTIME_DIR) + $(RAW1394_DIR) $(RTP_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR) \ $(XMMS_DIR) DIST_SUBDIRS=a52 aalib alsa arts artsd avifile audiofile cdparanoia \ dv dvdread esd \ - festival flac gnomevfs gsm hermes http jpeg lame mad mikmod mpeg2dec \ - openquicktime rtp sdl shout vorbis xmms + festival flac gnomevfs gsm hermes http jpeg ladspa lame mad mikmod mpeg2dec \ + openquicktime raw1394 rtp sdl shout sidplay vorbis xmms diff --git a/gst-libs/gst/idct/ieeetest.c b/gst-libs/gst/idct/ieeetest.c index d78158e4bd..23d64eb5b1 100644 --- a/gst-libs/gst/idct/ieeetest.c +++ b/gst-libs/gst/idct/ieeetest.c @@ -15,7 +15,7 @@ #include #include -#include "gstidct.h" +#include #include "dct.h" diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am index 7d7be08121..c8d43ed6d8 100644 --- a/sys/v4l/Makefile.am +++ b/sys/v4l/Makefile.am @@ -1,6 +1,6 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libv4lelement.la libv4lsrc.la \ +plugin_LTLIBRARIES = libv4lelement.la libv4lsrc.la \ libv4lmjpegsrc.la libv4lmjpegsink.la libv4lelement_la_SOURCES = \ @@ -36,4 +36,4 @@ libv4lmjpegsink_la_CFLAGS = \ noinst_HEADERS = gstv4lelement.h v4l_calls.h \ gstv4lsrc.h v4lsrc_calls.h \ gstv4lmjpegsrc.h v4lmjpegsrc_calls.h \ - gstv4lmjpegsink.h v4lmjpegsink_calls.h + gstv4lmjpegsink.h v4lmjpegsink_calls.h videodev_mjpeg.h