andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Man page processing/installation and other doc file updates

This commit is contained in:
Alan Coopersmith 2005-09-30 02:37:57 +00:00
parent aa74468aa5
commit 4608a2b654
16 changed files with 130 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -33,6 +33,7 @@ XPCONFIG_DIR=XpConfig
endif
SUBDIRS= \
doc \
include \
dix \
fb \

3
Xext/Makefile.am
View File

@ -43,7 +43,8 @@ endif
EXTRA_DIST = \
appgroup.h \
xvdisp.h
xvdisp.h \
README.xtest1-ddx
# dmx.c has a hard dependency on the dmx DDX
libXext_la_SOURCES = \

2
Xprint/Makefile.am
View File

@ -1,4 +1,4 @@
SUBDIRS = pcl raster ps
SUBDIRS = doc pcl raster ps
bin_PROGRAMS = Xprt

11
Xprint/doc/Makefile.am Normal file
View File

@ -0,0 +1,11 @@
MAN_SRCS = Xprt.man.pre
man1_MANS = Xprt.man
all-local: $(man1_MANS)
CLEANFILES = $(man1_MANS)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = $(MAN_SRCS) Xprt.html Xprt.sgml

4
configure.ac
View File

@ -1108,6 +1108,7 @@ composite/Makefile
damageext/Makefile
dbe/Makefile
dix/Makefile
doc/Makefile
fb/Makefile
record/Makefile
XTrap/Makefile
@ -1137,6 +1138,8 @@ hw/xfree86/ddc/Makefile
hw/xfree86/dixmods/Makefile
hw/xfree86/dixmods/extmod/Makefile
hw/xfree86/doc/Makefile
hw/xfree86/doc/devel/Makefile
hw/xfree86/doc/man/Makefile
hw/xfree86/doc/sgml/Makefile
hw/xfree86/dri/Makefile
hw/xfree86/dummylib/Makefile
@ -1182,6 +1185,7 @@ hw/vfb/Makefile
hw/xnest/Makefile
hw/xwin/Makefile
Xprint/Makefile
Xprint/doc/Makefile
Xprint/pcl/Makefile
Xprint/raster/Makefile
Xprint/ps/Makefile

23
cpprules.in
View File

@ -4,7 +4,7 @@
SED = sed
SUFFIXES = .pre
SUFFIXES = .pre .man .man.pre
# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
# to cpp, because that trick does not work on all ANSI C preprocessors.
@ -20,5 +20,26 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e '/^[ ]*XHASH/s/XHASH/\#/' \
-e '/\@\@$$/s/\@\@$$/\\/'
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
XSERVERNAME = Xorg
MANDEFS = \
-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-D__appmansuffix__=$(APP_MAN_SUFFIX) \
-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__projectroot__=$(prefix) \
-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
.pre:
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
.man.pre.man:
$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@

18
doc/Makefile.am Normal file
View File

@ -0,0 +1,18 @@
# Xserver.man covers options generic to all X servers built in this tree
MAN_SRCS = Xserver.man.pre
man1_MANS = Xserver.man
all-local: $(man1_MANS)
CLEANFILES = $(man1_MANS)
include $(top_srcdir)/cpprules.in
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) $(MAN_SRCS)

2
hw/xfree86/doc/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = sgml
SUBDIRS = devel man sgml

9
hw/xfree86/doc/devel/Makefile.am Normal file
View File

@ -0,0 +1,9 @@
# Documentation for developers that is distributed with the source but
# not installed on the system for end-users
EXTRA_DIST = \
DebuggingHints \
Domain.note \
RAC.Notes \
Registry \
exa-driver.txt

19
hw/xfree86/doc/man/Makefile.am Normal file
View File

@ -0,0 +1,19 @@
# Xserver.man covers options generic to all X servers built in this tree
MAN_SRCS = Xorg.man.pre Xorg.conf.man.pre
man1_MANS = Xorg.man
filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
CLEANFILES = $(man1_MANS) $(fileman_DATA)
xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
-rm -f xorg.conf.$(FILE_MAN_SUFFIX)
$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
include $(top_srcdir)/cpprules.in
EXTRAMANDEFS = -D__logdir__=$(logdir)
EXTRA_DIST = $(MAN_SRCS)

15
hw/xfree86/utils/kbd_mode/Makefile.am
View File

@ -35,12 +35,23 @@ if BSD_KBD_MODE
INCLUDES = $(XORG_INCS)
kbd_mode_CFLAGS = $(XORG_CFLAGS)
kbd_mode_SOURCES = bsd-kbd_mode.c
dist_man1_MANS = bsd-kbd_mode.man
MAN_SRC = bsd-kbd_mode.man.pre
endif
if SUN_KBD_MODE
kbd_mode_SOURCES = sun-kbd_mode.c
dist_man1_MANS = sun-kbd_mode.man
MAN_SRC = sun-kbd_mode.man.pre
endif
man1_MANS = kbd_mode.man
all-local: kbd_mode.man.pre $(man1_MANS)
kbd_mode.man.pre: $(MAN_SRC)
$(LN_S) $(MAN_SRC) kbd_mode.man.pre
endif
include $(top_srcdir)/cpprules.in
EXTRA_DIST = bsd-kbd_mode.man.pre sun-kbd_mode.man.pre

8
hw/xfree86/utils/pcitweak/Makefile.am
View File

@ -41,6 +41,10 @@ pcitweak_LDADD = \
pcitweak_SOURCES = \
pcitweak.c
dist_man1_MANS = \
pcitweak.man
man1_MANS = pcitweak.man
CLEANFILES = $(man1_MANS)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = pcitweak.man.pre

8
hw/xfree86/utils/scanpci/Makefile.am
View File

@ -43,6 +43,10 @@ scanpci_LDADD = \
scanpci_SOURCES = \
scanpci.c
dist_man1_MANS = \
scanpci.man
man1_MANS = scanpci.man
CLEANFILES = $(man1_MANS)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = scanpci.man.pre

26
hw/xfree86/utils/xorgcfg/Makefile.am
View File

@ -109,8 +109,6 @@ XPM_DATA = \
monitor.xpm \
mouse.xpm
include $(top_srcdir)/cpprules.in
# App default files (*.ad)
appdefaultdir = $(sysconfdir)/X11/app-defaults
@ -120,27 +118,15 @@ APPDEFAULTFILES = XOrgCfg
appdefault_DATA = $(APPDEFAULTFILES)
# Man page
man1_MANS = xorgcfg.man
SUFFIXES += .$(APP_MAN_SUFFIX) .man
all-local: $(man1_MANS)
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre
MANDEFS = -D__appmansuffix__=$(APP_MAN_SUFFIX) \
-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-D__xservername__=Xorg -D__xconfigfile__=xorg.conf \
-D__projectroot__=$(prefix)
CLEANFILES = $(APPDEFAULTFILES) $(man1_MANS)
CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
.man.$(APP_MAN_SUFFIX):
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
dist_man1_MANS = \
xorgcfg.man
EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre
CLEANFILES = $(APPDEFAULTFILES)
# Rules needed to cpp man page
include $(top_srcdir)/cpprules.in
endif

20
hw/xfree86/utils/xorgconfig/Makefile.am
View File

@ -47,24 +47,10 @@ xorgconfig_SOURCES = \
# Man page
include $(top_srcdir)/cpprules.in
SUFFIXES += .$(APP_MAN_SUFFIX) .man
man1_MANS = xorgconfig.man
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MANDEFS = -D__appmansuffix__=$(APP_MAN_SUFFIX) \
-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-D__xservername__=Xorg -D__xconfigfile__=xorg.conf \
-D__projectroot__=$(prefix)
CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
.man.$(APP_MAN_SUFFIX):
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
dist_man1_MANS = \
xorgconfig.man
CLEANFILES = $(man1_MANS)
EXTRA_DIST = \
Cards98 \
xf86config.cmd
xorgconfig.man.pre

9
hw/xnest/Makefile.am
View File

@ -58,9 +58,16 @@ AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
EXTRA_DIST = os2Stub.c \
icon \
screensaver
screensaver \
Xnest.man.pre
# -UDPMSExtension for miinitext? can't put into
# OS_DEFINES???
# EXT_DEFINES???
# ICONFIGFILES -- SpecialCObjectRule
man1_MANS = Xnest.man
CLEANFILES = $(man1_MANS)
include $(top_srcdir)/cpprules.in