From: Gwenole Beauchesne <[email protected]>
---
dummy_drv_video/Makefile.am | 17 ++++++++---------
test/decode/Makefile.am | 2 +-
test/encode/Makefile.am | 2 +-
test/putsurface/Makefile.am | 2 +-
test/vainfo/Makefile.am | 2 +-
va/Makefile.am | 4 +++-
va/egl/Makefile.am | 2 +-
va/glx/Makefile.am | 2 +-
va/x11/Makefile.am | 2 +-
9 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
index f458dd5..2ca506c 100644
--- a/dummy_drv_video/Makefile.am
+++ b/dummy_drv_video/Makefile.am
@@ -20,13 +20,12 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-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
-dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
-dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
+INCLUDES = -I$(top_srcdir)
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/../../include/external/
-I$(top_srcdir)/../../include/kmd
-dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
-
-noinst_HEADERS = dummy_drv_video.h object_heap.h
+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
+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
diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am
index 9d74137..9343a4d 100644
--- a/test/decode/Makefile.am
+++ b/test/decode/Makefile.am
@@ -22,7 +22,7 @@
bin_PROGRAMS = mpeg2vldemo
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+INCLUDES = -I$(top_srcdir)
TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index 133b08e..7b42584 100644
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -22,7 +22,7 @@
bin_PROGRAMS = h264encode avcenc
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+INCLUDES = -I$(top_srcdir)
TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am
index c43bde2..45f62a0 100644
--- a/test/putsurface/Makefile.am
+++ b/test/putsurface/Makefile.am
@@ -22,7 +22,7 @@
bin_PROGRAMS = putsurface
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+INCLUDES = -I$(top_srcdir)
TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am
index 5fd0070..82a15b6 100644
--- a/test/vainfo/Makefile.am
+++ b/test/vainfo/Makefile.am
@@ -23,7 +23,7 @@
bin_PROGRAMS = vainfo
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic
-I$(top_srcdir)/src/x11
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/test/basic
vainfo_LDADD = $(top_builddir)/va/$(libvacorelib)
$(top_builddir)/va/$(libvabackendlib)
vainfo_DEPENDENCIES = $(top_builddir)/va/$(libvacorelib)
$(top_builddir)/va/$(libvabackendlib)
diff --git a/va/Makefile.am b/va/Makefile.am
index c0498ee..de97e21 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -23,7 +23,9 @@
SUBDIRS =
INCLUDES = \
- $(LIBVA_CFLAGS) -I$(top_srcdir)/va/x11 \
+ $(LIBVA_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/va/x11 \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
LDADD = \
diff --git a/va/egl/Makefile.am b/va/egl/Makefile.am
index 5b5abd4..c02daa7 100644
--- a/va/egl/Makefile.am
+++ b/va/egl/Makefile.am
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
+INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
source_c = \
va_egl.c
diff --git a/va/glx/Makefile.am b/va/glx/Makefile.am
index c083a70..05cfbce 100644
--- a/va/glx/Makefile.am
+++ b/va/glx/Makefile.am
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
+INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
source_c = \
va_glx.c \
diff --git a/va/x11/Makefile.am b/va/x11/Makefile.am
index 8052025..c1cbc7e 100644
--- a/va/x11/Makefile.am
+++ b/va/x11/Makefile.am
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va $(DRM_CFLAGS)
+INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va $(DRM_CFLAGS)
source_c = \
dri1_util.c \
--
1.7.4.1
_______________________________________________
Libva mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libva
