disting fixes, pixbuf loader still borked in regards to disting

Original commit message from CVS:
disting fixes, pixbuf loader still borked in regards to disting

diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am
index 6fd8f9a..fc32593 100644 (file)
--- a/gst-libs/ext/ffmpeg/Makefile.am
+++ b/gst-libs/ext/ffmpeg/Makefile.am
@@ -31,7 +31,6 @@ EXTRA_DIST = \
        ffmpeg/CREDITS \
        ffmpeg/INSTALL \
        ffmpeg/README \
-       ffmpeg/VERSION \
        ffmpeg/config.mak \
        ffmpeg/configure \
        ffmpeg/cygwin_inttypes.h \

diff --git a/sys/Makefile.am b/sys/Makefile.am
index e47dc0e..dad4940 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -34,11 +34,14 @@ else
 VCD_DIR=
 endif
 
-if USE_XFREE
-XVIDEO_DIR=xvideo ximage
-else
-XVIDEO_DIR=
-endif
+# doesn't work 
+#if USE_XFREE
+#XVIDEO_DIR=xvideo
+#XIMAGE_DIR=ximage
+#else
+#XVIDEO_DIR=
+#XIMAGE_DIR=
+#endif
 
 if USE_CDROM
 CDROM_DIR=cdrom
@@ -47,6 +50,6 @@ CDROM_DIR=
 endif
 
 SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \
-       $(VCD_DIR) $(XVIDEO_DIR) $(CDROM_DIR)
+       $(VCD_DIR) $(CDROM_DIR)
 
-DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd xvideo cdrom
+DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd xvideo ximage glsink cdrom