diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 00:23:42 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 00:23:48 -0700 |
| commit | c302ae79f7819f75628f798d15c980cbf42eec91 (patch) | |
| tree | fc234cff9d29ad8142bff81cc5d4e2785e87b26a /man | |
| parent | 3418a26aa83fbba78ad5a214ca7db2984a44190b (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Also some changes to man/Makefile.am to make it work better with the
AM_SILENT_RULES option that's enabled in XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.am | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index 8ff4f37..13a75c5 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -19,8 +19,10 @@ Xcomposite_man_aliases = \ XCompositeGetOverlayWindow \ XCompositeReleaseOverlayWindow +Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) + libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) + $(Xcomposite_shadowmen) EXTRA_DIST = $(libman_PRE) $(libman_xml) @@ -29,17 +31,8 @@ CLEANFILES = $(libman_DATA) MAINTAINERCLEANFILES = $(libman_PRE) # Generate man page shadow files (Replaces InstallManPageAliases from Imake) - -BUILT_SOURCES = shadows.DONE - -shadows.DONE: - -rm -f $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) - (for i in $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $$i; \ - done) - touch shadows.DONE - -CLEANFILES += shadows.DONE +$(Xcomposite_shadowmen): + $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@ # Substitute system-specific values in man pages @@ -62,7 +55,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ # Generate nroff sources from DocBook/xml @@ -70,7 +63,7 @@ dist-hook: $(libman_PRE) if HAVE_XMLTO .xml.man: - $(XMLTO) man $< && mv $*.__libmansuffix__ $@ + $(AM_V_GEN)$(XMLTO) man $< && mv $*.__libmansuffix__ $@ else .xml.man: @echo "WARNING: configure did not find xmlto, cannot create $@ without it" |