diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-05-02 19:25:41 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-05-02 19:29:42 -0700 |
| commit | 28cb0b4aa530b966eb48a9fd22617e65390a9792 (patch) | |
| tree | 94e205d336e827c5d3f61f780c9bbe59e2085006 | |
| parent | 47812d4f46ec0211e97b891ce42cb47428c1caac (diff) | |
config: Remove unnecessary calls from configure.ac
AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS variables
AC_HEADERS_STDC result was never used
No headers exist in $(top_srcdir)/src, so no point including -I in CFLAGS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 75392e4..e7c91bc 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ XORG_DEFAULT_OPTIONS # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_PROG_CC AH_TOP([#include "xorg-server.h"]) @@ -61,11 +60,4 @@ AC_SUBST(inputdir) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.1] xproto) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) - -# Checks for header files. -AC_HEADER_STDC - - AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am index 2221bbc..f16093f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +AM_CFLAGS = $(XORG_CFLAGS) @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ |