diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 13:25:17 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 13:25:17 -0700 |
| commit | d3e85cdf1f3d0a1d9bb7774698730e75a7866107 (patch) | |
| tree | d777bcb2089ffa195bf3f8599c58e3199db53779 | |
| parent | 4f9150ca6210cabab8c5e46ffcbdd66495acfd8a (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | man/Makefile.am | 15 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 13 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 53aaa9e..38692c0 100644 --- a/configure.ac +++ b/configure.ac @@ -27,26 +27,24 @@ AC_INIT(libXfontcache, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?produc 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) AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Check for dependencies PKG_CHECK_MODULES(XFONTCACHE, x11 xext xextproto fontcacheproto) -XFONTCACHE_CFLAGS="$CWARNFLAGS $XFONTCACHE_CFLAGS" AC_SUBST(XFONTCACHE_CFLAGS) AC_SUBST(XFONTCACHE_LIBS) XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/man/Makefile.am b/man/Makefile.am index fdc9a03..e5700a9 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -30,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libman_PRE = Xfontcache.man -BUILT_SOURCES = shadows.DONE - EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) + $(Xfontcache_shadowmen) SED = sed @@ -56,7 +54,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(LIB_MAN_SUFFIX) .man .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) @@ -67,8 +65,7 @@ Xfontcache_shadows = \ FontCacheChangeCacheSettings \ FontCacheGetCacheStatistics -shadows.DONE: - -rm -f $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) - (for i in $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $$i; \ - done) +Xfontcache_shadowmen = $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) + +$(Xfontcache_shadowmen): + $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $@ diff --git a/src/Makefile.am b/src/Makefile.am index f2094dc..a4d713e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(XFONTCACHE_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XFONTCACHE_CFLAGS) $(MALLOC_ZERO_CFLAGS) lib_LTLIBRARIES = libXfontcache.la libXfontcache_la_SOURCES = \ |