diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-31 18:54:23 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-31 18:54:23 +0000 |
| commit | 62d24022ec725850c6635118b5cd372ae47d63d9 (patch) | |
| tree | 1393d83c103303ade89e34444c1bf4fdf81b7d5f /xorg-server/doc | |
| parent | fe6927d79e02d01cce20ecf56c8721fcadc2d278 (diff) | |
| parent | 007385f704a99ab49dab0789f9c330a1a3a455be (diff) | |
| download | vcxsrv-62d24022ec725850c6635118b5cd372ae47d63d9.tar.gz vcxsrv-62d24022ec725850c6635118b5cd372ae47d63d9.tar.bz2 vcxsrv-62d24022ec725850c6635118b5cd372ae47d63d9.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/doc')
| -rw-r--r-- | xorg-server/doc/Makefile.am | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/xorg-server/doc/Makefile.am b/xorg-server/doc/Makefile.am index d3911c9bf..0d24bc257 100644 --- a/xorg-server/doc/Makefile.am +++ b/xorg-server/doc/Makefile.am @@ -1,35 +1,24 @@ -appmandir = $(APP_MAN_DIR) -filemandir = $(FILE_MAN_DIR) - -# Xserver.man covers options generic to all X servers built in this tree -# (i.e. those handled in the os/utils.c options processing instead of in -# the DDX-level options processing) -appman_PRE = Xserver.man.pre -fileman_PRE = - -appman_PROCESSED = $(appman_PRE:man.pre=man) -fileman_PROCESSED = $(fileman_PRE:man.pre=man) - -appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@) -fileman_DATA = $(fileman_PRE:man.pre=@FILE_MAN_SUFFIX@) - -BUILT_SOURCES = $(appman_PROCESSED) $(fileman_PROCESSED) - -CLEANFILES = $(appman_PROCESSED) $(appman_DATA) \ - $(fileman_PROCESSED) $(fileman_DATA) - -include $(top_srcdir)/cpprules.in - -.man.$(APP_MAN_SUFFIX): - cp $< $@ - -.man.$(FILE_MAN_SUFFIX): - cp $< $@ - -EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | sed -e 's/,/, /g'`" - -# Docs about X server internals that we ship with source but don't install -DEVEL_DOCS = smartsched - - -EXTRA_DIST = $(DEVEL_DOCS) $(appman_PRE) $(fileman_PRE) +
+# Xserver.man covers options generic to all X servers built in this tree
+# (i.e. those handled in the os/utils.c options processing instead of in
+# the DDX-level options processing)
+appmandir = $(APP_MAN_DIR)
+appman_PRE = Xserver.man.pre
+
+appman_PROCESSED = $(appman_PRE:man.pre=man)
+appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
+
+BUILT_SOURCES = $(appman_PROCESSED)
+CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
+
+include $(top_srcdir)/cpprules.in
+
+.man.$(APP_MAN_SUFFIX):
+ cp $< $@
+
+EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | sed -e 's/,/, /g'`"
+
+# Docs about X server internals that we ship with source but don't install
+DEVEL_DOCS = smartsched
+
+EXTRA_DIST = $(DEVEL_DOCS) $(appman_PRE) $(fileman_PRE)
|