diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 21:29:45 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 21:29:45 -0700 |
| commit | a195bd6d375c311b9bf6d7cce477f1d131425757 (patch) | |
| tree | cd2f6ecab9bd2a3a3aae368aea44fced3dd6ab9e | |
| parent | f4c43f70dff3cb9702fd62bc388353d02589e618 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | cxpm/Makefile.am | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | sxpm/Makefile.am | 6 |
4 files changed, 13 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index ae0f78b..5926178 100644 --- a/configure.ac +++ b/configure.ac @@ -6,19 +6,21 @@ 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) +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]) # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC LT_AC_PROG_SED -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XPM, xproto x11) -XPM_CFLAGS="$CWARNFLAGS $XPM_CFLAGS" AC_SUBST(XPM_CFLAGS) AC_SUBST(XPM_LIBS) @@ -59,13 +61,8 @@ if test x$STAT_ZFILE = xyes ; then fi PKG_CHECK_MODULES(SXPM, xt xext xextproto, build_sxpm=true, build_sxpm=false) -SXPM_CFLAGS="$CWARNFLAGS $SXPM_CFLAGS" AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile sxpm/Makefile diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am index 3aecc8c..42cd49d 100644 --- a/cxpm/Makefile.am +++ b/cxpm/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = cxpm AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include/X11 -AM_CFLAGS = $(XPM_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS) cxpm_SOURCES = cxpm.c @@ -34,13 +34,13 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ if USE_GETTEXT noinst_DATA = cxpm.po cxpm.po: $(cxpm_SOURCES:%=$(srcdir)/%) - xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%) + $(AM_V_GEN)xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%) CLEANFILES += cxpm.po endif diff --git a/src/Makefile.am b/src/Makefile.am index 5dcdf03..0c8652a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES=libXpm.la AM_CPPFLAGS = -I. -I$(top_srcdir)/include/X11/ -AM_CFLAGS = $(XPM_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS) libXpm_la_LDFLAGS = -version-number 4:11:0 -no-undefined libXpm_la_LIBADD = $(XPM_LIBS) diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am index 65388f8..faa192c 100644 --- a/sxpm/Makefile.am +++ b/sxpm/Makefile.am @@ -2,7 +2,7 @@ if BUILD_SXPM bin_PROGRAMS = sxpm -AM_CFLAGS = $(SXPM_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(SXPM_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @@ -38,13 +38,13 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ if USE_GETTEXT noinst_DATA = sxpm.po sxpm.po: $(sxpm_SOURCES:%=$(srcdir)/%) - xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%) + $(AM_V_GEN)xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%) CLEANFILES += sxpm.po endif |