dummy_drv_video: only build if requested.

diff --git a/Makefile.am b/Makefile.am
index 97cc0eb..aa10068 100644 (file)
--- 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 (file)
--- 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