[xorg-commit-diffs] xc/doc/specs/programs Imakefile, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/doc/specs/programs
In directory pdx:/home/eich/tstbuild/xc/doc/specs/programs

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/programs/Imakefile,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/Imakefile	5 Mar 2004 13:38:26 -0000	1.1.4.4
+++ b/Imakefile	15 Apr 2004 10:13:46 -0000	1.1.4.5
@@ -8,11 +8,14 @@
 /* does not include manual pages under util (not X programs)
    or any of the library function manual pages under doc/man */
 
+XCONFIGFILE = XConfigFile
+XSERVERNAME = XServerName
+
 XFREE86_MANUALS = \
-  $(TOP)/programs/Xserver/hw/xfree86/XFree86.man \
-  $(TOP)/programs/Xserver/hw/xfree86/XF86Config.man \
-  $(TOP)/programs/Xserver/hw/xfree86/xf86config/xf86config.man \
-  $(TOP)/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man \
+  $(TOP)/programs/Xserver/hw/xfree86/$(XSERVERNAME).man \
+  $(TOP)/programs/Xserver/hw/xfree86/$(XCONFIGFILE).man \
+  $(TOP)/programs/Xserver/hw/xfree86/xf86config/xorgconfig.man \
+  $(TOP)/programs/Xserver/hw/xfree86/xf86cfg/xorgcfg.man \
   $(TOP)/programs/Xserver/hw/xfree86/reconfig/reconfig.man \
   $(TOP)/programs/Xserver/hw/xfree86/getconfig/getconfig.man \
   $(TOP)/programs/Xserver/hw/xfree86/getconfig/cfg.man \
@@ -81,9 +84,6 @@
   $(TOP)/programs/Xserver/hw/xfree86/input/wacom/wacom.man \
   $(TOP)/programs/Xserver/hw/darwin/XDarwin.man \
   $(TOP)/programs/Xserver/hw/darwin/utils/dumpkeymap.man \
-  $(TOP)/programs/Xserver/hw/kdrive/Xkdrive.man \
-  $(TOP)/programs/Xserver/hw/kdrive/vesa/Xvesa.man \
-  $(TOP)/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man \
   $(TOP)/lib/Xxf86dga/XDGA.man \
   $(TOP)/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man \
   $(TOP)/programs/Xserver/hw/xfree86/doc/man/XF86VM.man
@@ -91,8 +91,7 @@
 EXTRA_MANUALS = \
   $(TOP)/extras/rman/rman.1
 
-MANUALS = \
-  $(XFREE86_MANUALS) \
+MANUALS = $(XFREE86_MANUALS) \
   $(TOP)/doc/man/general/X.man \
   $(TOP)/doc/man/general/Standards.man \
   $(TOP)/doc/man/general/Consortium.man \
@@ -111,9 +110,7 @@
   $(TOP)/programs/dpsinfo/dpsinfo.man \
   $(TOP)/programs/editres/editres.man \
   $(TOP)/extras/fontconfig/fc-cache/fc-cache.man \
-  $(TOP)/extras/fontconfig/fc-lang/fc-lang.man \
   $(TOP)/extras/fontconfig/fc-list/fc-list.man \
-  $(TOP)/extras/fontconfig/src/fontconfig.man \
   $(TOP)/programs/fslsfonts/fslsfonts.man \
   $(TOP)/programs/fstobdf/fstobdf.man \
   $(TOP)/config/util/gccmakedep.man \
@@ -181,8 +178,7 @@
   $(TOP)/programs/xfsinfo/xfsinfo.man \
   $(TOP)/programs/xfwp/xfwp.man \
   $(TOP)/programs/xgamma/xgamma.man \
-  $(TOP)/programs/xgc/xgc.man \
-  $(TOP)/programs/xhost/xhost.man \
+  $(TOP)/programs/xgc/xgc.man   $(TOP)/programs/xhost/xhost.man \
   $(TOP)/programs/xinit/xinit.man \
   $(TOP)/programs/xkbcomp/xkbcomp.man \
   $(TOP)/programs/xkbevd/xkbevd.man \
@@ -201,8 +197,7 @@
   $(TOP)/programs/xmodmap/xmodmap.man \
   $(TOP)/programs/Xserver/hw/xnest/Xnest.man \
   $(TOP)/programs/scripts/xon.man \
-  $(TOP)/programs/xprop/xprop.man \
-  $(TOP)/programs/xrandr/xrandr.man \
+  $(TOP)/programs/xprop/xprop.man   $(TOP)/programs/xrandr/xrandr.man \
   $(TOP)/programs/xrdb/xrdb.man \
   $(TOP)/programs/xrefresh/xrefresh.man \
   $(TOP)/programs/xrx/helper/xrx.man \
@@ -224,6 +219,9 @@
   $(TOP)/programs/xwud/xwud.man \
   $(EXTRA_MANUALS)
 
+
+
+
 XCOMM Sun's -man macros use the D and C registers
 MANUALFLAGS = -rD1 -rC1
 
@@ -237,10 +235,13 @@
 EXTRAMANDEFS = -D__logdir__=$(LOGDIRECTORY) -D__xinitdir__=$(XINITDIR)
 
 CppManTarget(man,$(EXTRAMANDEFS))
-
 MSMACROS = $(MANMACROS) $(MANUALFLAGS)
 
+#if 0
 MakeSimpleDoc(man,man.$(MANNEWSUFFIX))
 
 InstallRoffDoc(man)
-
+#endif
+clean::
+	RemoveFile(man.man)
+	RemoveFile(man_drivers.man)