[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/xf86config Cards, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/xf86config

Modified Files:
      Tag: XPRINT
	Cards Imakefile 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Cards
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/Cards,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/Cards	4 Mar 2004 17:48:18 -0000	1.1.4.1.6.1
+++ b/Cards	10 Apr 2004 09:05:31 -0000	1.1.4.1.6.1.6.1
@@ -2979,7 +2979,7 @@
 
 NAME Appian Jeronimo 2000
 CHIPSET PERMEDIA 3
-SERVER XFree86
+SERVER 3DLabs
 DRIVER glint
 NOCLOCKPROBE
 

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:48:18 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:05:31 -0000	1.1.4.2.6.1.6.1
@@ -1,33 +1,38 @@
 XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.14tsi Exp $
 
-
+#include <Server.tmpl>
 
 
 
 XCOMM $XConsortium: Imakefile /main/5 1996/02/21 18:12:46 kaleb $
 
-            SRCS = xf86config.c cards.c
-            OBJS = xf86config.o cards.o
+            SRCS = xorgconfig.c cards.c
+            OBJS = xorgconfig.o cards.o
  LOCAL_LIBRARIES = $(XKBFILELIB) $(XONLYLIB)
          DEPLIBS =
       CARDDBFILE = $(LIBDIR)/Cards
 
 XCONFIGFILE = XConfigFile
+#if defined XFree86Version
 XVERS = XFree86Version
+#elif defined (XorgVersion)
+XVERS = XorgVersion
+#endif
 XCONSOLEDEFS = XFree86ConsoleDefines
 
          DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \
 		   -DXKB_RULES_DIR=\"$(LIBDIR)/xkb/rules\" \
 		   -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
-		   -DXVERSION="$(XVERS)" $(XCONSOLEDEFS)
+		   -DXVERSION="$(XVERS)" $(XCONSOLEDEFS) $(CONFIG_DEFINES) \
+		   $(XKBDEFRULESDEFS)
 
-AllTarget(ProgramTargetName(xf86config))
+AllTarget(ProgramTargetName(xorgconfig))
 
-NormalProgramTarget(xf86config,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
-InstallProgram(xf86config,$(BINDIR))
+NormalProgramTarget(xorgconfig,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
+InstallProgram(xorgconfig,$(BINDIR))
 
 DependTarget()
 
 InstallNonExecFile(Cards,$(LIBDIR))
-
-InstallManPage(xf86config,$(MANDIR))
+EXTRAMANDEFS = -D__XCONFIGFILE__=$(XCONFIGFILE) -D__XSERVERNAME__=$(XSERVERNAME)
+InstallManPage(xorgconfig,$(MANDIR))