diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 22:21:03 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 22:21:03 -0700 |
| commit | 6f5d7342b4192db164913106b5630ebb91d067ca (patch) | |
| tree | 131e4dc41446dc5b08c8bd2152bff8b5a26c6cb0 | |
| parent | 3337b434ffc664d02e763dfba7e56f5942ad9544 (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, 14 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 2ad247e..82d4c0d 100644 --- a/configure.ac +++ b/configure.ac @@ -4,23 +4,23 @@ AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product AM_INIT_AUTOMAKE([foreign 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(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto) 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 4e1b1a4..40a9794 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -30,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libman_PRE = XF86Misc.man -BUILT_SOURCES = shadows.DONE - EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) + $(XF86Misc_shadowmen) SED = sed @@ -55,7 +53,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) @@ -69,8 +67,7 @@ XF86Misc_shadows = \ XF86MiscGetKbdSettings \ XF86MiscSetKbdSettings -shadows.DONE: - -rm -f $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) - (for i in $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \ - done) +XF86Misc_shadowmen = $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) + +$(XF86Misc_shadowmen): + $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 715b82d..4f5b3f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la libXxf86misc_la_SOURCES = XF86Misc.c -AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS) libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS) libXxf86misc_la_LDFLAGS = -version-number 1:1:0 |