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 | e1c1805a388bb545821e919e4b15c3f69bf0e995 (patch) | |
| tree | b1f8a814ddada9bb03decb62c208d84cc4de3ab2 /sys/Makefile.am | |
| parent | e853c4af2acbeb8d1a4d07348b145808077ca774 (diff) | |
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/Makefile.am')
| -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 |