diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-27 22:33:04 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-02-01 00:08:51 -0800 |
| commit | 68c5c109052610e5873e2160129d21a0ad94482d (patch) | |
| tree | bea6f0bab72c82723b62cac2451a1d7c7edcb3ae | |
| parent | f9bc6f63fbd4c1541f733465984ddff0dfd24e9f (diff) | |
| download | weston-68c5c109052610e5873e2160129d21a0ad94482d.tar.gz | |
build: Move man/Makefile.am into toplevel Makefile.am
| -rw-r--r-- | Makefile.am | 28 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | man/Makefile.am | 26 |
3 files changed, 26 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 526e196b..3cc4deb3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,8 +7,7 @@ SUBDIRS = \ shared \ src \ clients \ - tests \ - man + tests DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install @@ -154,5 +153,30 @@ EXTRA_DIST += $(protocol_sources) endif +man_MANS = weston.1 weston.ini.5 + +if ENABLE_DRM_COMPOSITOR +man_MANS += weston-drm.7 +endif + +MAN_SUBSTS = \ + -e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|g' \ + -e 's|__weston_modules_dir__|$(pkglibdir)|g' \ + -e 's|__weston_shell_client__|$(WESTON_SHELL_CLIENT)|g' \ + -e 's|__version__|$(PACKAGE_VERSION)|g' + +SUFFIXES = .1 .5 .7 .man + +%.1 %.5 %.7 : man/%.man + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + +EXTRA_DIST += \ + man/weston.man \ + man/weston-drm.man \ + man/weston.ini.man + +CLEANFILES += $(man_MANS) + + wayland_protocoldir = $(top_srcdir)/protocol include $(top_srcdir)/wayland-scanner.mk diff --git a/configure.ac b/configure.ac index 5691c850..e2218b9f 100644 --- a/configure.ac +++ b/configure.ac @@ -490,7 +490,6 @@ AC_CONFIG_FILES([Makefile src/version.h src/weston.pc clients/Makefile - man/Makefile tests/Makefile]) AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 5fb030a1..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -man_MANS = weston.1 weston.ini.5 - -if ENABLE_DRM_COMPOSITOR -man_MANS += weston-drm.7 -endif - -MAN_SUBSTS = \ - -e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|g' \ - -e 's|__weston_modules_dir__|$(pkglibdir)|g' \ - -e 's|__weston_shell_client__|$(WESTON_SHELL_CLIENT)|g' \ - -e 's|__version__|$(PACKAGE_VERSION)|g' - -SUFFIXES = .1 .5 .7 .man - -.man.1: - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -.man.5: - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -.man.7: - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -EXTRA_DIST = weston.man weston-drm.man weston.ini.man - -CLEANFILES = $(man_MANS) |