Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Also fix automake-1.10 warning about needing AM_PROG_CC_C_O

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

2 files changed, 15 insertions, 24 deletions

diff --git a/Makefile.am b/Makefile.am
index d5794fd..617829c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,11 +29,11 @@ bin_PROGRAMS = \
 	xtrapreset \
 	xtrapinfo
 
+AM_CFLAGS = $(CWARNFLAGS) $(XTRAP_APP_CFLAGS)
 
 # 
 # xtrapchar
 #
-xtrapchar_CFLAGS = $(XTRAP_APP_CFLAGS)
 xtrapchar_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapchar_SOURCES = \
@@ -46,7 +46,7 @@ xtrapchar_SOURCES = \
 #
 # xtrapin
 # 
-xtrapin_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
+xtrapin_CFLAGS = -D_BSD_SOURCE
 xtrapin_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapin_SOURCES = \
@@ -57,7 +57,7 @@ xtrapin_SOURCES = \
 #
 # xtrapout
 #
-xtrapout_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
+xtrapout_CFLAGS = -D_BSD_SOURCE
 xtrapout_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapout_SOURCES = \
@@ -68,7 +68,6 @@ xtrapout_SOURCES = \
 #
 # xtrapproto
 #
-xtrapproto_CFLAGS = $(XTRAP_APP_CFLAGS)
 xtrapproto_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapproto_SOURCES = \
@@ -77,7 +76,6 @@ xtrapproto_SOURCES = \
 #
 # xtrapreset
 #
-xtrapreset_CFLAGS = $(XTRAP_APP_CFLAGS)
 xtrapreset_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapreset_SOURCES = \
@@ -86,7 +84,6 @@ xtrapreset_SOURCES = \
 #
 # xtrapstats
 #
-xtrapstats_CFLAGS = $(XTRAP_APP_CFLAGS)
 xtrapstats_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapstats_SOURCES = \
@@ -95,7 +92,6 @@ xtrapstats_SOURCES = \
 #
 # xtrapinfo
 #
-xtrapinfo_CFLAGS = $(XTRAP_APP_CFLAGS)
 xtrapinfo_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapinfo_SOURCES = \
@@ -114,8 +110,6 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) \
 	      $(man_shadows:=.@APP_MAN_SUFFIX@)
 
-BUILT_SOURCES = shadows.DONE
-
 EXTRA_DIST = $(appman_PRE)
 CLEANFILES = $(appman_DATA) $(BUILT_SOURCES)
 
@@ -141,7 +135,7 @@ MAN_SUBSTS = \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
 man_shadows =    \
     xtrapreset   \
@@ -152,11 +146,10 @@ man_shadows =    \
     xtrapchar    \
     xtrapproto
 
-shadows.DONE:
-	-rm -f $(man_shadows:=.@APP_MAN_SUFFIX@)
-	(for i in $(man_shadows:=.@APP_MAN_SUFFIX@) ; do \
-	 echo .so man$(APP_MAN_DIR_SUFFIX)/xtrap.$(APP_MAN_SUFFIX) > $$i; \
-	 done)
+shadowmen = $(man_shadows:=.@APP_MAN_SUFFIX@)
+
+$(shadowmen):
+	 $(AM_V_GEN)echo .so man$(APP_MAN_DIR_SUFFIX)/xtrap.$(APP_MAN_SUFFIX) > $@
 
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
diff --git a/configure.ac b/configure.ac
index 1953f86..9d244a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,25 +26,23 @@ AC_INIT(xtrap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, 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_TYPE_SIGNAL
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XTRAP_APP, x11 xtrap)
-XTRAP_APP_CFLAGS="$CWARNFLAGS $XTRAP_APP_CFLAGS"
 AC_SUBST(XTRAP_APP_CFLAGS)
 AC_SUBST(XTRAP_APP_LIBS)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])