summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 748603f)
raw | patch | inline | side by side (parent: 748603f)
author | Nikhil Devshatwar <a0132237@ti.com> | |
Wed, 22 May 2013 09:52:37 +0000 (15:22 +0530) | ||
committer | Nikhil Devshatwar <a0132237@ti.com> | |
Wed, 22 May 2013 09:52:37 +0000 (15:22 +0530) |
Fixed clashing of kernel headers with sys headers
Due to the v4l2.c (needed for dmabuftest)
Due to the v4l2.c (needed for dmabuftest)
Makefile.am | patch | blob | history | |
util/Makefile.am | patch | blob | history |
diff --git a/Makefile.am b/Makefile.am
index 5bf2c6c7f2f4b777c2a88662280ee8738a86caed..53eb33601d2d813a58b8c26fb6bf6f978fa0ac29 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
bin_PROGRAMS = fliptest
if ENABLE_V4L2_DMABUF
-bin_PROGRAMS += dmabuftest
+#bin_PROGRAMS += dmabuftest
endif
if ENABLE_DCE
endif
LDADD_COMMON = util/libutil.la @DRM_LIBS@ @X11_LIBS@ @DCE_LIBS@ @GBM_LIBS@ @EGL_LIBS@ @GLES2_LIBS@
-AM_CFLAGS = @LIN_CFLAGS@ @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @GBM_CFLAGS@ @EGL_CFLAGS@ @GLES2_CFLAGS@ @WARN_CFLAGS@ -I$(top_srcdir)/util
+AM_CFLAGS = @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @GBM_CFLAGS@ @EGL_CFLAGS@ @GLES2_CFLAGS@ @WARN_CFLAGS@ -I$(top_srcdir)/util
fliptest_SOURCES = fliptest.c
fliptest_LDADD = $(LDADD_COMMON)
if ENABLE_V4L2_DMABUF
-dmabuftest_SOURCES = dmabuftest.c
-dmabuftest_LDADD = $(LDADD_COMMON)
+#dmabuftest_SOURCES = dmabuftest.c
+#dmabuftest_LDADD = $(LDADD_COMMON)
endif
if ENABLE_DCE
diff --git a/util/Makefile.am b/util/Makefile.am
index e88215d5c81efe71d2531252ded1341aaeb0935a..7a8ab3c9867cd392e688b2167b281ee7bd25a756 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
endif
libutil_la_LIBADD = @DRM_LIBS@ @X11_LIBS@ @DCE_LIBS@ @GBM_LIBS@ @EGL_LIBS@ @GLES2_LIBS@
-libutil_la_CFLAGS = @LIN_CFLAGS@ @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@ @GBM_CFLAGS@ @EGL_CFLAGS@ @GLES2_CFLAGS@
+libutil_la_CFLAGS = @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@ @GBM_CFLAGS@ @EGL_CFLAGS@ @GLES2_CFLAGS@