summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2011-10-14 18:13:54 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2011-10-17 10:15:11 +0200
commit65d9f4c89df815e9ae1e2dd4c974acf341042bbe (patch)
tree416163d7f426a741ce1a879c954499b0dd5dfbf7
parent254d954c85e2eb3d0f79e18a9abaf5fc4182af74 (diff)
downloadlibva-65d9f4c89df815e9ae1e2dd4c974acf341042bbe.tar.gz
dummy_drv_video: only build if requested.
-rw-r--r--Makefile.am5
-rw-r--r--dummy_drv_video/Makefile.am2
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 97cc0eb..aa10068 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,4 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = va pkgconfig test
-if BUILD_DUMMY_DRIVER
-SUBDIRS += dummy_drv_video
-endif
+SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream
diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
index 2ca506c..245e6e8 100644
--- a/dummy_drv_video/Makefile.am
+++ b/dummy_drv_video/Makefile.am
@@ -22,6 +22,7 @@
INCLUDES = -I$(top_srcdir)
+if BUILD_DUMMY_DRIVER
dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
dummy_drv_video_ladir = $(LIBVA_DRIVERS_PATH)
dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
@@ -29,3 +30,4 @@ dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
noinst_HEADERS = dummy_drv_video.h object_heap.h
+endif