Sync configure.ac and src/Makefile.am with recent X.Org templates
This commit is contained in:
parent
b890099517
commit
6686bb3776
@ -28,13 +28,7 @@ AC_INIT([xf86-video-wildcatfb],
|
|||||||
[xf86-video-wildcatfb])
|
[xf86-video-wildcatfb])
|
||||||
AC_CONFIG_SRCDIR([Makefile.am])
|
AC_CONFIG_SRCDIR([Makefile.am])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
|
||||||
m4_ifndef([XORG_MACROS_VERSION],
|
|
||||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
|
||||||
XORG_MACROS_VERSION(1.8)
|
|
||||||
XORG_DEFAULT_OPTIONS
|
|
||||||
|
|
||||||
AC_CONFIG_AUX_DIR(.)
|
AC_CONFIG_AUX_DIR(.)
|
||||||
|
|
||||||
# Initialize Automake
|
# Initialize Automake
|
||||||
@ -45,6 +39,12 @@ AM_MAINTAINER_MODE
|
|||||||
AC_DISABLE_STATIC
|
AC_DISABLE_STATIC
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
|
|
||||||
|
# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||||
|
m4_ifndef([XORG_MACROS_VERSION],
|
||||||
|
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||||
|
XORG_MACROS_VERSION(1.8)
|
||||||
|
XORG_DEFAULT_OPTIONS
|
||||||
|
|
||||||
AH_TOP([#include "xorg-server.h"])
|
AH_TOP([#include "xorg-server.h"])
|
||||||
|
|
||||||
# Define a configure option for an alternate module directory
|
# Define a configure option for an alternate module directory
|
||||||
@ -64,10 +64,12 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
|
|||||||
|
|
||||||
# Checks for libraries.
|
# Checks for libraries.
|
||||||
|
|
||||||
AC_SUBST([moduledir])
|
# Checks for header files.
|
||||||
|
AC_HEADER_STDC
|
||||||
|
|
||||||
DRIVER_NAME=wildcatfb
|
DRIVER_NAME=wildcatfb
|
||||||
AC_SUBST([DRIVER_NAME])
|
AC_SUBST([DRIVER_NAME])
|
||||||
|
AC_SUBST([moduledir])
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
|
# -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
|
# _ladir passes a dummy rpath to libtool so the thing will actually link
|
||||||
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
|
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
|
||||||
AM_CFLAGS = @XORG_CFLAGS@
|
AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
|
||||||
wildcatfb_drv_la_LTLIBRARIES = wildcatfb_drv.la
|
wildcatfb_drv_la_LTLIBRARIES = wildcatfb_drv.la
|
||||||
wildcatfb_drv_la_LDFLAGS = -module -avoid-version
|
wildcatfb_drv_la_LDFLAGS = -module -avoid-version
|
||||||
wildcatfb_drv_ladir = @moduledir@/drivers
|
wildcatfb_drv_ladir = @moduledir@/drivers
|
||||||
|
Loading…
Reference in New Issue
Block a user