summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2012-03-12 14:51:38 -0400
committerJakob Bornecrantz <jakob@vmware.com>2012-03-13 21:37:52 +0100
commit04169f3860e4a7d03485631bee40c05fc45b72c6 (patch)
treefdd3e7689812dd51f3d9bf6909baf7cdfb4f4ce1 /src
parente6836ff099e5565dea58a53bba9b2df377241ef7 (diff)
config: include saa and vmwgfx subdirs in the tarball
Use AM_CONDITIONAL. Automake knows what to distribute. It needs to be able to navigate down the subdirs to find what needs to be included in the tarball. To test reliably, create a tarball and expand it into a separate directory and build with xatracker. Distcheck will not detect missing code when such code is configured not to build. The content of a tarball *must* always be identical, regardless of the configuration options used or on which platform it was configured. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f54168..04c9e0d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,8 +28,11 @@ vmware_drv_la_LTLIBRARIES = vmware_drv.la
vmware_drv_la_LDFLAGS = -module -avoid-version
vmware_drv_la_CFLAGS = $(CWARNFLAGS) @XORG_CFLAGS@
vmware_drv_ladir = @moduledir@/drivers
-vmware_drv_la_LIBADD = @VMWGFX_LIBADD@
-vmware_drv_la_DEPENDENCIES = @VMWGFX_LIBADD@
+
+if BUILD_VMWGFX
+vmware_drv_la_LIBADD = $(top_builddir)/vmwgfx/libvmwgfx.la
+vmware_drv_la_DEPENDENCIES = $(top_builddir)/vmwgfx/libvmwgfx.la
+endif
vmware_drv_la_SOURCES = \
bits2pixels.c \