From dbf88774a77d91f3f7996071dfccf61636afa77b Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 9 May 2009 17:13:11 -0700 Subject: Adjust flags definitions to fix lint library build Signed-off-by: Alan Coopersmith --- configure.ac | 2 -- src/Makefile.am | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index b463825..084b3ce 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,6 @@ XORG_CWARNFLAGS # Check for dependencies PKG_CHECK_MODULES(XV, x11 xext xextproto videoproto) -XV_CFLAGS="$CWARNFLAGS $XV_CFLAGS" AC_SUBST(XV_CFLAGS) AC_SUBST(XV_LIBS) @@ -52,7 +51,6 @@ XORG_CHANGELOG dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xv]) -LINT_FLAGS="${LINT_FLAGS} ${XV_CFLAGS}" AC_OUTPUT([Makefile include/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 394233f..0948474 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,8 @@ libXv_la_SOURCES = \ Xvlibint.h libXv_la_LIBADD = @XV_LIBS@ -AM_CFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@ +AM_CPPFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) libXv_la_LDFLAGS = -version-number 1:0:0 -no-undefined @@ -23,6 +24,8 @@ lintlibdir = $(libdir) lintlib_DATA = $(LINTLIB) $(LINTLIB): $(libXau_la_SOURCES) - $(LINT) -y -oXv -x $(ALL_LINT_FLAGS) $(libXv_la_SOURCES) + $(LINT) -y -oXv -x $(ALL_LINT_FLAGS) $(libXv_la_SOURCES) + +CLEANFILES = $(LINTLIB) endif MAKE_LINT_LIB -- cgit v1.2.3