diff options
| author | Benjamin Otte <otte@gnome.org> | 2003-11-12 03:06:07 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2003-11-12 03:06:07 +0000 |
| commit | d8d8ee231d9afd541358e7b0d37f9f064a07f802 (patch) | |
| tree | 7187213f296a0f43ce12f6e75f5e6c9203d4ab37 /sys | |
| parent | 857b8f643c14fb277c9430068179385ff3ac31bf (diff) | |
| download | gst-plugins-bad-d8d8ee231d9afd541358e7b0d37f9f064a07f802.tar.gz gst-plugins-bad-d8d8ee231d9afd541358e7b0d37f9f064a07f802.tar.bz2 gst-plugins-bad-d8d8ee231d9afd541358e7b0d37f9f064a07f802.zip | |
fix build system for X, XShm and Xv
Original commit message from CVS:
fix build system for X, XShm and Xv
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/Makefile.am | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index dad4940a..2ced34ed 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -34,14 +34,17 @@ else VCD_DIR= endif -# doesn't work -#if USE_XFREE -#XVIDEO_DIR=xvideo -#XIMAGE_DIR=ximage -#else -#XVIDEO_DIR= -#XIMAGE_DIR= -#endif +if USE_X +X_DIR=ximage xvideo +else +X_DIR= +endif + +if USE_XVIDEO +XV_DIR=xvimage +else +XV_DIR= +endif if USE_CDROM CDROM_DIR=cdrom @@ -50,6 +53,6 @@ CDROM_DIR= endif SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \ - $(VCD_DIR) $(CDROM_DIR) + $(VCD_DIR) $(CDROM_DIR) $(X_DIR) $(XV_DIR) DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd xvideo ximage glsink cdrom |