Cosmetic cleanups

3 files changed, 20 insertions, 30 deletions

diff --git a/programs/Xserver/Imakefile b/programs/Xserver/Imakefile
index a64b429ca..e135097fd 100644
--- a/programs/Xserver/Imakefile
+++ b/programs/Xserver/Imakefile
@@ -1,7 +1,7 @@
 /*
  * Server Master Makefile
  */
-XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.330tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.331tsi Exp $
 
 /*
  * Copyright (c) 1994-2007 by The XFree86 Project, Inc.
@@ -212,13 +212,13 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.330tsi Exp $
 
         STATICEXTS = $(XKBEXT) $(XINPUTEXT) $(LBXEXT) $(SITEEXTS) $(RANDRLIB) \
 		     $(RENDERLIB)
-           MISCEXT = Xext/LibraryTargetName(ext)
+           MISCEXT = $(MISCDIR)/LibraryTargetName(ext)
       LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) $(XTRAPEXT)
         EXTENSIONS = $(LOADABLEEXTS) $(STATICEXTS)
 
-           EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) $(LBXDIRS) $(DBEDIR) \
-		     $(RECORDDIR) $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR) \
-		     $(SITEEXTDIRS)
+           EXTDIRS = $(MISCDIR) $(XKBDIR) $(XIDIR) $(GLXDIR) $(LBXDIRS) \
+		     $(DBEDIR) $(RECORDDIR) $(RANDRDIR) $(RENDERDIR) \
+		     $(XTRAPDIR) $(SITEEXTDIRS)
            STDDIRS = include mi $(XPDDXDIR) $(XPFBDIRS)
 
 #if BuildLBX || GzipFontCompression
@@ -352,7 +352,7 @@ XCOMM
      STACKTRACELIB = $(TOP)/util/memleak/LibraryTargetName(stacktrace)
 #endif
 #if DoLoadableServer
-          BASEEXTS = Xext/LibraryTargetName(exts)
+          BASEEXTS = $(MISCDIR)/LibraryTargetName(exts)
     XF86EXTENSIONS = $(BASEEXTS) $(STATICEXTS)
           XF86LIBS = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) $(XF86PARSLIB) \
 		     $(XF86OSLIB) $(STACKTRACELIB)
diff --git a/programs/Xserver/Xprint/pcl/PclPrint.c b/programs/Xserver/Xprint/pcl/PclPrint.c
index 45e27a20a..831b9f3f3 100644
--- a/programs/Xserver/Xprint/pcl/PclPrint.c
+++ b/programs/Xserver/Xprint/pcl/PclPrint.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.9tsi Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -129,9 +129,6 @@ PclEndJob(
     PclContextPrivPtr priv = (PclContextPrivPtr)
       pCon->devPrivates[PclContextPrivateIndex].ptr;
 
-#ifdef CCP_DEBUG
-    FILE *xpoutput;
-#endif
     FILE *fp;
     int retVal;
     char *fileName, *trailer;
@@ -199,16 +196,6 @@ PclEndJob(
     rewind( priv->pJobFile );
     stat( priv->jobFileName, &statBuf );
     
-#ifdef CCP_DEBUG
-    unlink( "/users/prince/XpOutput" );
-    xpoutput = fopen( "/users/prince/XpOutput", "w" );
-    
-    rewind( priv->pJobFile );
-    TransferBytes( priv->pJobFile, xpoutput,
-		      (int)statBuf.st_size );
-    fclose( xpoutput );
-#endif
-    
     XpSubmitJob( priv->jobFileName, pCon );
     fclose( priv->pJobFile );
     unlink( priv->jobFileName );
diff --git a/programs/Xserver/hw/dmx/config/Imakefile b/programs/Xserver/hw/dmx/config/Imakefile
index 311e7e62a..938e7db0b 100644
--- a/programs/Xserver/hw/dmx/config/Imakefile
+++ b/programs/Xserver/hw/dmx/config/Imakefile
@@ -1,23 +1,26 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/dmx/config/Imakefile,v 1.3tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/dmx/config/Imakefile,v 1.4tsi Exp $
 
 #include <Server.tmpl>
 
 YFLAGS = -d
 
-LIBSRCS = parser.c scanner.c dmxparse.c dmxprint.c dmxcompat.c dmxconfig.c
-LIBOBJS = parser.o scanner.o dmxparse.o dmxprint.o dmxcompat.o dmxconfig.o
+LIBSRCS = parser.c scanner.c dmxparse.c dmxconfig.c
+LIBOBJS = parser.o scanner.o dmxparse.o dmxconfig.o
 
 CONFIGSRCS = xdmxconfig.c dmxlog.c Canvas.c
 CONFIGOBJS = xdmxconfig.o dmxlog.o Canvas.o
 
-COMPATSRCS = vdltodmx.c
-COMPATOBJS = vdltodmx.o
+COMPATSRCS = vdltodmx.c dmxcompat.c
+COMPATOBJS = vdltodmx.o dmxcompat.o
 
 TESTSRCS = dmxtodmx.c
 TESTOBJS = dmxtodmx.o
 
-SRCS = $(LIBSRCS) $(CONFIGSRCS) $(COMPATSRCS) $(TESTSRCS)
-OBJS = $(LIBOBJS) $(CONFIGOBJS) $(COMPATOBJS) $(TESTOBJS)
+PRINTSRCS = dmxprint.c
+PRINTOBJS = dmxprint.o
+
+SRCS = $(LIBSRCS) $(CONFIGSRCS) $(COMPATSRCS) $(TESTSRCS) $(PRINTSRCS)
+OBJS = $(LIBOBJS) $(CONFIGOBJS) $(COMPATOBJS) $(TESTOBJS) $(PRINTOBJS)
 
 EXES = xdmxconfig vdltodmx dmxtodmx
 
@@ -37,18 +40,18 @@ YaccFile(parser,$(YFLAGS))
 NormalLibraryObjectRule()
 NormalLibraryTarget(dmxconfig,$(LIBOBJS))
 
-NormalProgramTarget(xdmxconfig,$(CONFIGOBJS),\
+NormalProgramTarget(xdmxconfig,$(CONFIGOBJS) $(PRINTOBJS),\
 	 	    libdmxconfig.a XawClientDepLibs $(DEPXTOOLLIB),\
 	            $(LOCAL_LIBRARIES) XawClientLibs $(XTOOLLIB),NullParameter)
 AllTarget(ProgramTargetName(xdmxconfig))
 InstallProgram(xdmxconfig,$(BINDIR))
 
-NormalProgramTarget(vdltodmx,$(COMPATOBJS),libdmxconfig.a,\
+NormalProgramTarget(vdltodmx,$(COMPATOBJS) $(PRINTOBJS),libdmxconfig.a,\
                     $(LOCAL_LIBRARIES),NullParameter)
 AllTarget(ProgramTargetName(vdltodmx))
 InstallProgram(vdltodmx,$(BINDIR))
 
-NormalProgramTarget(dmxtodmx,$(TESTOBJS),libdmxconfig.a,\
+NormalProgramTarget(dmxtodmx,$(TESTOBJS) $(PRINTOBJS),libdmxconfig.a,\
                     $(LOCAL_LIBRARIES),NullParameter)
 AllTarget(ProgramTargetName(dmxtodmx))
 InstallProgram(dmxtodmx,$(BINDIR))