diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Xext/Makefile.am | 3 | ||||
| -rw-r--r-- | Xprint/Makefile.am | 2 | ||||
| -rw-r--r-- | Xprint/doc/Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | cpprules.in | 23 | ||||
| -rw-r--r-- | doc/Makefile.am | 18 | ||||
| -rw-r--r-- | hw/xfree86/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/doc/devel/Makefile.am | 9 | ||||
| -rw-r--r-- | hw/xfree86/doc/man/Makefile.am | 19 | ||||
| -rw-r--r-- | hw/xfree86/utils/kbd_mode/Makefile.am | 15 | ||||
| -rw-r--r-- | hw/xfree86/utils/pcitweak/Makefile.am | 8 | ||||
| -rw-r--r-- | hw/xfree86/utils/scanpci/Makefile.am | 8 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/Makefile.am | 26 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/Makefile.am | 20 | ||||
| -rw-r--r-- | hw/xnest/Makefile.am | 9 |
16 files changed, 130 insertions, 48 deletions
diff --git a/Makefile.am b/Makefile.am index 2579434c6..b34a5061d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,7 @@ XPCONFIG_DIR=XpConfig endif SUBDIRS= \ + doc \ include \ dix \ fb \ diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 9dafa163d..adce70f80 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -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 = \ diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am index c6f044923..a7f5b3985 100644 --- a/Xprint/Makefile.am +++ b/Xprint/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = pcl raster ps +SUBDIRS = doc pcl raster ps bin_PROGRAMS = Xprt diff --git a/Xprint/doc/Makefile.am b/Xprint/doc/Makefile.am new file mode 100644 index 000000000..5c7faef1a --- /dev/null +++ b/Xprint/doc/Makefile.am @@ -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
\ No newline at end of file diff --git a/configure.ac b/configure.ac index 6095c325e..e79eaa260 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/cpprules.in b/cpprules.in index 4624a7bde..667b13322 100644 --- a/cpprules.in +++ b/cpprules.in @@ -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) > $@ diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 000000000..94cc964a8 --- /dev/null +++ b/doc/Makefile.am @@ -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)
\ No newline at end of file diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am index a474b3994..e7d8d8be0 100644 --- a/hw/xfree86/doc/Makefile.am +++ b/hw/xfree86/doc/Makefile.am @@ -1 +1 @@ -SUBDIRS = sgml +SUBDIRS = devel man sgml diff --git a/hw/xfree86/doc/devel/Makefile.am b/hw/xfree86/doc/devel/Makefile.am new file mode 100644 index 000000000..5e7ed1570 --- /dev/null +++ b/hw/xfree86/doc/devel/Makefile.am @@ -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
\ No newline at end of file diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/doc/man/Makefile.am new file mode 100644 index 000000000..9d0bc1a82 --- /dev/null +++ b/hw/xfree86/doc/man/Makefile.am @@ -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)
\ No newline at end of file diff --git a/hw/xfree86/utils/kbd_mode/Makefile.am b/hw/xfree86/utils/kbd_mode/Makefile.am index f95a3b722..563a870a8 100644 --- a/hw/xfree86/utils/kbd_mode/Makefile.am +++ b/hw/xfree86/utils/kbd_mode/Makefile.am @@ -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 diff --git a/hw/xfree86/utils/pcitweak/Makefile.am b/hw/xfree86/utils/pcitweak/Makefile.am index bb3461343..5b48b64be 100644 --- a/hw/xfree86/utils/pcitweak/Makefile.am +++ b/hw/xfree86/utils/pcitweak/Makefile.am @@ -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 diff --git a/hw/xfree86/utils/scanpci/Makefile.am b/hw/xfree86/utils/scanpci/Makefile.am index 9711f8f33..d3c0c09bf 100644 --- a/hw/xfree86/utils/scanpci/Makefile.am +++ b/hw/xfree86/utils/scanpci/Makefile.am @@ -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
\ No newline at end of file diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index 0d079233f..af7b527b7 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -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 - -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) +all-local: $(man1_MANS) -CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) +EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre -.man.$(APP_MAN_SUFFIX): - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ +CLEANFILES = $(APPDEFAULTFILES) $(man1_MANS) -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 diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am index 17a3f7879..547600208 100644 --- a/hw/xfree86/utils/xorgconfig/Makefile.am +++ b/hw/xfree86/utils/xorgconfig/Makefile.am @@ -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 diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index f3ddefbba..995ee0216 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -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 |