summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8926334)
raw | patch | inline | side by side (parent: 8926334)
author | Vincent Stehlé <v-stehle@ti.com> | |
Tue, 8 May 2012 09:12:42 +0000 (11:12 +0200) | ||
committer | Rob Clark <rob@ti.com> | |
Thu, 10 May 2012 16:20:24 +0000 (11:20 -0500) |
Do not override the $CFLAGS variable internally to allow specifying it at
configure time. Keep the Linux kernel include path flags in a separate
LIN_CFLAGS variable.
Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
configure time. Keep the Linux kernel include path flags in a separate
LIN_CFLAGS variable.
Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
Makefile.am | patch | blob | history | |
configure.ac | patch | blob | history | |
util/Makefile.am | patch | blob | history |
diff --git a/Makefile.am b/Makefile.am
index dc13f6d5e5cab4defded2ddcad3cff3f76d10093..b47e6e9669533ebae84084841bc5c8d20659a5d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
endif
LDADD_COMMON = util/libutil.la @DRM_LIBS@ @X11_LIBS@ @DCE_LIBS@
-CFLAGS = @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@ -I$(top_srcdir)/util
+AM_CFLAGS = @LIN_CFLAGS@ @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@ -I$(top_srcdir)/util
fliptest_SOURCES = fliptest.c
fliptest_LDADD = $(LDADD_COMMON)
diff --git a/configure.ac b/configure.ac
index 217126bb9cdb9cae02c3df6caab938685985b246..95a872ff863aa75bbd72e57f69bd9608e7b40527 100644 (file)
--- a/configure.ac
+++ b/configure.ac
if test -r "$kernel_source/include/linux/videodev2.h"; then
headers_cflags="$headers_cflags -I$kernel_source/include"
- AC_SUBST(CFLAGS, [$headers_cflags])
+ AC_SUBST(LIN_CFLAGS, [$headers_cflags])
AC_MSG_NOTICE([$kversion provides videodev2.h])
else
AC_MSG_NOTICE([Could not find $kernel_source/include/linux/videodev2.h])
diff --git a/util/Makefile.am b/util/Makefile.am
index e00fe2a2b51192d0ff85f75915d340a66dfe7b7b..eb1341180d95fd5d24d6774178dc42a3ee294e82 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
endif
libutil_la_LIBADD = @DRM_LIBS@ @X11_LIBS@ @DCE_LIBS@
-libutil_la_CFLAGS = @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@
+libutil_la_CFLAGS = @LIN_CFLAGS@ @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@