Several driver modules do not have a ChangeLog target in Makefile.am #23814

The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
master
Gaetan Nadon 17 years ago
parent afc9e91765
commit c0473e4921
  1. 3
      Makefile.am
  2. 6
      configure.ac

@ -28,9 +28,6 @@ SUBDIRS = src man include
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-evdev.pc pkgconfig_DATA = xorg-evdev.pc
EXTRA_DIST = ChangeLog
MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog .PHONY: ChangeLog

@ -33,15 +33,17 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS # Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3) XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
# Checks for programs. # Checks for programs.
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_CC AC_PROG_CC
XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"]) AH_TOP([#include "xorg-server.h"])

Loading…
Cancel
Save