summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-13 01:36:45 (GMT)
committerSung-Jin Park <sj76.park@samsung.com>2013-09-03 03:32:30 (GMT)
commitac9ef029e2547857a3cdae4658ffca7a5f0daebf (patch)
tree18c15e935663015edb07e3f35fba71e17049992f
parentb4507a16f69887b351eab65763956978b74b7616 (diff)
downloadxev-ac9ef029e2547857a3cdae4658ffca7a5f0daebf.zip
xev-ac9ef029e2547857a3cdae4658ffca7a5f0daebf.tar.gz
xev-ac9ef029e2547857a3cdae4658ffca7a5f0daebf.tar.bz2
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONSrefs/changes/80/9180/1
Change-Id: I20468e78cc2842639e68bfb97de9e8f984c17ebf Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac13
2 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 009eec2..faf0eef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xev
-xev_CFLAGS = $(XEV_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XEV_CFLAGS)
xev_LDADD = $(XEV_LIBS)
xev_SOURCES = \
@@ -61,7 +61,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog
diff --git a/configure.ac b/configure.ac
index 3ff1144..f4b2ddc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,20 +27,19 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XEV, x11)
AC_SUBST(XEV_CFLAGS)
AC_SUBST(XEV_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile])