diff options
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | man/Makefile.am | 16 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 16 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index ce4ab28..8b6fad4 100644 --- a/configure.ac +++ b/configure.ac @@ -33,15 +33,19 @@ dnl AC_INIT(libXres, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) -# 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 # get modules @@ -54,9 +58,6 @@ AC_SUBST(XRES_CFLAGS) AC_SUBST(XRES_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 52e5ad3..40467c4 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -30,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libman_PRE = XRes.man -BUILT_SOURCES = shadows.DONE - EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(XRes_shadows:=.@LIB_MAN_SUFFIX@) + $(XRes_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,8 @@ XRes_shadows = \ XResQueryClientResources \ XResQueryClientPixmapBytes -shadows.DONE: - -rm -f $(XRes_shadows:=.@LIB_MAN_SUFFIX@) - (for i in $(XRes_shadows:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $$i; \ - done) +XRes_shadowmen = $(XRes_shadows:=.@LIB_MAN_SUFFIX@) + +$(XRes_shadowmen): + $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $@ + diff --git a/src/Makefile.am b/src/Makefile.am index 16a7c04..a64c939 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ libXRes_la_SOURCES = \ libXRes_la_LIBADD = @XRES_LIBS@ -AM_CFLAGS = @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@ INCLUDES = -I$(top_srcdir)/include |