diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
| commit | cdc60fdcddbe5666aac11af34c6c030d4a670b99 (patch) | |
| tree | 4ec58bc0728308be9921485d5e79979bbc65a9b1 /xorg-server/hw/dmx/config | |
| parent | 800da6ed70c65f5059726b7ce35030e9c7235f01 (diff) | |
| parent | a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 (diff) | |
| download | vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.gz vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.bz2 vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/config')
| -rw-r--r-- | xorg-server/hw/dmx/config/Makefile.am | 21 | ||||
| -rw-r--r-- | xorg-server/hw/dmx/config/man/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/hw/dmx/config/man/dmxtodmx.man (renamed from xorg-server/hw/dmx/config/dmxtodmx.man) | 0 | ||||
| -rw-r--r-- | xorg-server/hw/dmx/config/man/vdltodmx.man (renamed from xorg-server/hw/dmx/config/vdltodmx.man) | 0 | ||||
| -rw-r--r-- | xorg-server/hw/dmx/config/man/xdmxconfig.man (renamed from xorg-server/hw/dmx/config/xdmxconfig.man) | 0 |
5 files changed, 4 insertions, 19 deletions
diff --git a/xorg-server/hw/dmx/config/Makefile.am b/xorg-server/hw/dmx/config/Makefile.am index 25a814e79..de4ce315d 100644 --- a/xorg-server/hw/dmx/config/Makefile.am +++ b/xorg-server/hw/dmx/config/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = man + noinst_LIBRARIES = libdmxconfig.a LIBSRCS = parser.y \ @@ -53,26 +55,7 @@ dmxtodmx_DEPENDENCIES = libdmxconfig.a dmxtodmx_SOURCES = dmxtodmx.c dmxtodmx_LDADD = -L. -ldmxconfig -appmandir = $(APP_MAN_DIR) - -appman_PRE = xdmxconfig.man vdltodmx.man dmxtodmx.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - EXTRA_DIST = \ - $(appman_PRE) \ test-a.in test-a.out \ test-b.in test-b.out \ test-c.in test-c.out \ diff --git a/xorg-server/hw/dmx/config/man/Makefile.am b/xorg-server/hw/dmx/config/man/Makefile.am new file mode 100644 index 000000000..9bb62a4c6 --- /dev/null +++ b/xorg-server/hw/dmx/config/man/Makefile.am @@ -0,0 +1,2 @@ +include $(top_srcdir)/manpages.am +appman_PRE = xdmxconfig.man vdltodmx.man dmxtodmx.man diff --git a/xorg-server/hw/dmx/config/dmxtodmx.man b/xorg-server/hw/dmx/config/man/dmxtodmx.man index 68c7f5b40..68c7f5b40 100644 --- a/xorg-server/hw/dmx/config/dmxtodmx.man +++ b/xorg-server/hw/dmx/config/man/dmxtodmx.man diff --git a/xorg-server/hw/dmx/config/vdltodmx.man b/xorg-server/hw/dmx/config/man/vdltodmx.man index b733db7ab..b733db7ab 100644 --- a/xorg-server/hw/dmx/config/vdltodmx.man +++ b/xorg-server/hw/dmx/config/man/vdltodmx.man diff --git a/xorg-server/hw/dmx/config/xdmxconfig.man b/xorg-server/hw/dmx/config/man/xdmxconfig.man index dcceea0e3..dcceea0e3 100644 --- a/xorg-server/hw/dmx/config/xdmxconfig.man +++ b/xorg-server/hw/dmx/config/man/xdmxconfig.man |