diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ff4713d..51d9d33 100644 --- a/configure.ac +++ b/configure.ac @@ -93,11 +93,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) -AC_SUBST([INCLUDES]) - # Checks for libraries. # Checks for header files. diff --git a/src/Makefile.am b/src/Makefile.am index 88da8a2..dc702f0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,9 @@ # -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) $(PCIACCESS_CFLAGS) + vesa_drv_la_LTLIBRARIES = vesa_drv.la vesa_drv_la_LDFLAGS = -module -avoid-version vesa_drv_ladir = @moduledir@/drivers |