projects / erwise / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fdfb756)
Some compile fixes, not enough
authorToni Nikkanen <toni@tuug.fi>
Sat, 7 Mar 2009 16:20:26 +0000 (18:20 +0200)
committerToni Nikkanen <toni@tuug.fi>
Sat, 7 Mar 2009 16:20:26 +0000 (18:20 +0200)
Cl/WWWLibrary/HTTCP.c patch | blob | history
Cl/WWWLibrary/HTUtils.h patch | blob | history
Makefile patch | blob | history
Ui/UiIncludes.h patch | blob | history
Ui/UiProtos.h patch | blob | history

diff --git a/Cl/WWWLibrary/HTTCP.c b/Cl/WWWLibrary/HTTCP.c
index 3da790b..40a43e8 100644 (file)
--- a/Cl/WWWLibrary/HTTCP.c
+++ b/Cl/WWWLibrary/HTTCP.c
@@ -52,7 +52,8 @@ extern int errno;
 #ifndef vms
 #ifndef NeXT
 #ifndef THINK_C
 #ifndef vms
 #ifndef NeXT
 #ifndef THINK_C
-extern char *sys_errlist[];            /* see man perror on cernvax */
+/* Toni */
+/* extern char *sys_errlist[]; */
 extern int sys_nerr;
 #endif  /* think c */
 #endif /* NeXT */
 extern int sys_nerr;
 #endif  /* think c */
 #endif /* NeXT */
diff --git a/Cl/WWWLibrary/HTUtils.h b/Cl/WWWLibrary/HTUtils.h
index b911690..fb558f8 100644 (file)
--- a/Cl/WWWLibrary/HTUtils.h
+++ b/Cl/WWWLibrary/HTUtils.h
@@ -155,13 +155,8 @@ typedef char       BOOLEAN;                /* Logical value */
 #include "HTString.h"  /* String utilities */
 
 #ifndef ERWISE_UI
 #include "HTString.h"  /* String utilities */
 
 #ifndef ERWISE_UI
-#ifdef __STDC__
+/* Toni */
 #include <stdarg.h>
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#else
-#include <varargs.h>
 #endif /* ERWISE */
 
 #ifdef CURSES
 #endif /* ERWISE */
 
 #ifdef CURSES
diff --git a/Makefile b/Makefile
index 9165f86..0b7e3a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,276 +1,1041 @@
 # Makefile generated by imake - do not edit!
 # Makefile generated by imake - do not edit!
-# $XConsortium: imake.c,v 1.65 91/07/25 17:50:17 rws Exp $
-#
-# The cpp used on this machine replaces all newlines and multiple tabs and
-# spaces in a macro expansion with a single space.  Imake tries to compensate
-# for this, but is not always successful.
-#
+# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $
 
 
-# -------------------------------------------------------------------------
-# Makefile generated from "Imake.tmpl" and </tmp/IIf.a07565>
-# $XConsortium: Imake.tmpl,v 1.139 91/09/16 08:52:48 rws Exp $
+# ----------------------------------------------------------------------
+# Makefile generated from "Imake.tmpl" and </tmp/IIf.w2jYng>
+# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
+# $XdotOrg: util/cf/Imake.tmpl,v 1.17 2006/04/15 15:55:25 herrb Exp $
+#
 #
 #
-# Platform-specific parameters may be set in the appropriate <vendor>.cf
-# configuration files.  Site-specific parameters should be set in the file
-# site.def.  Full rebuilds are recommended if any parameters are changed.
 #
 #
-# If your C preprocessor does not define any unique symbols, you will need
-# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing
-# "make World" the first time).
 #
 #
+# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $
+# ----------------------------------------------------------------------
+
+all::
+
+.SUFFIXES: .i
 
 
-# -------------------------------------------------------------------------
+# $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
+# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
+
+# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+
+# -----------------------------------------------------------------------
 # site-specific configuration parameters that need to come before
 # the platform-specific parameters - edit site.def to change
 
 # site-specific configuration parameters that need to come before
 # the platform-specific parameters - edit site.def to change
 
-# site:  $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $
+# site:  $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
+
+# site:  $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
+
+# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
+
+# ----------------------------------------------------------------------
+# platform-specific configuration parameters - edit linux.cf to change
+
+# $XdotOrg: util/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $
+# platform:  $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
+
+# platform:  $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $
+
+# operating system:  Linux 2.6.28-8-generic armv5tel [ELF] (2.6.28)
+# libc:        (6.5.0)
+# binutils:    (216)
+
+# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
+# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
+
+# $XdotOrg: util/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $
+
+# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
+
+XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0)
+RELEASE_VERSION = RELEASE-1
+
+DRIVERSDKDIR = $(USRLIBDIR)/Server
+DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules
+DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include
+
+       XF86SRC = $(SERVERSRC)/hw/xfree86
+    XF86COMSRC = $(XF86SRC)/common
+ XF86PARSERSRC = $(XF86SRC)/parser
+     XF86OSSRC = $(XF86SRC)/os-support
+ XF86DRIVERSRC = $(XF86SRC)/drivers
+     DRIVERSRC = $(XF86DRIVERSRC)
+
+        XFREE86DOCDIR = $(DOCDIR)
+      XFREE86PSDOCDIR = $(DOCPSDIR)
+     XFREE86PDFDOCDIR = $(DOCPDFDIR)
+    XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 
 
-# -------------------------------------------------------------------------
-# platform-specific configuration parameters - edit sun.cf to change
+# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 
-# platform:  $XConsortium: sun.cf,v 1.72.1.1 92/03/18 13:13:37 rws Exp $
+# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $
 
 
-# operating system:  SunOS 4.1.2
+   SELINUX_LDFLAGS =
 
 
-# $XConsortium: sunLib.rules,v 1.7 91/12/20 11:19:47 rws Exp $
+   SELINUX_INCLUDES = -I/usr/include/selinux
 
 
-.c.o:
-       $(CC) -c $(CFLAGS) $*.c
+   SELINUX_CFLAGS =  -DHAVE_SELINUX
 
 
-# -------------------------------------------------------------------------
+   SELINUX_LIBS = -lselinux
+
+# ----------------------------------------------------------------------
 # site-specific configuration parameters that go after
 # the platform-specific parameters - edit site.def to change
 
 # site-specific configuration parameters that go after
 # the platform-specific parameters - edit site.def to change
 
-# site:  $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $
+# site:  $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
+
+# site:  $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
+
+# ---------------------------------------------------------------------
+# Imake rules for building libraries, programs, scripts, and data files
+# rules:  $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
+# rules:  $XdotOrg: util/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $
+#
+#
+#
+#
+# rules:  $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes Exp $
+
+.PHONY: all interfaces install install.man install.lib install.sdk     depend includes cleandir
+
+ _NULLCMD_ = @ echo -n
 
 
-            SHELL = /bin/sh
+X_BYTE_ORDER = X_LITTLE_ENDIAN
+
+GLIDE2INCDIR =
+
+GLIDE3INCDIR =
+
+GLIDE3LIBNAME =
+
+TKLIBNAME = tk8.4
+
+TKLIBDIR = /usr/lib
+
+TCLLIBNAME = tcl8.4
+
+TCLIBDIR = /usr/lib
+
+          PATHSEP = /
+            SHELL = /bin/sh -e
 
               TOP = .
       CURRENT_DIR = .
 
 
               TOP = .
       CURRENT_DIR = .
 
+            IMAKE = imake
+           DEPEND = gccmakedep
+        MKDIRHIER = mkdir -p
+          REVPATH = revpath
+    EXPORTLISTGEN =
+             RMAN = /usr/bin/rman
+     RMANBASENAME = rman
+      RMANOPTIONS =
+        CONFIGSRC = $(TOP)/config
+         IMAKESRC = $(CONFIGSRC)/imake
+        DEPENDSRC = $(CONFIGSRC)/util
+
+          INCROOT = /usr/include
+        USRLIBDIR = /usr/lib
+           VARDIR = /var
+        VARLIBDIR = $(VARDIR)/lib
+  SYSTEMUSRLIBDIR = /usr/lib
+  SYSTEMUSRINCDIR = /usr/include
+         SHLIBDIR = /usr/lib
+       LINTLIBDIR = $(USRLIBDIR)/lint
+          MANPATH = /usr/share/man
+    MANSOURCEPATH = $(MANPATH)/man
+           MANDIR = $(MANSOURCEPATH)$(MANSECT)
+    SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT)
+        LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT)
+     DRIVERMANDIR = $(MANSOURCEPATH)4
+       FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT)
+       GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT)
+       MISCMANDIR = $(MANSOURCEPATH)7
+        ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT)
+         ICONDIR = "/usr/share/icons"
+      XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps"
+     DRIVERMANDIR = $(MANSOURCEPATH)4
+     LOGDIRECTORY = $(VARDIR)/log
+
+        VARRUNDIR = $(VARDIR)/run
+
+         VARDBDIR = $(VARDIR)/lib
+
                AR = ar clq
                AR = ar clq
+
+# Nice try but useless: make will inherit BOOTSTRAPCFLAGS
+# from  top Makefile
   BOOTSTRAPCFLAGS =
   BOOTSTRAPCFLAGS =
-               CC = gcc2 -pipe -fstrength-reduce -fpcc-struct-return
-               AS = as
+
+               CC = gcc
+               AS = gcc -c -x assembler
+
+.SUFFIXES: .cc
+
+              CXX = c++
+
+          CXXFILT = c++filt
+
+           CXXLIB = -lstdc++
+
+    CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing
+CXXDEPENDINCLUDES =
+ CXXEXTRA_DEFINES =
+CXXEXTRA_INCLUDES =
+   CXXSTD_DEFINES = -Dlinux -D__arm__ -D__arm32__ -U__arm -Uarm -D_POSIX_C_SOURCE=199309L                              -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                                                  $(CXXPROJECT_DEFINES)
+       CXXOPTIONS =
+      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
+       CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
+         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
 
          COMPRESS = compress
 
          COMPRESS = compress
-              CPP = /lib/cpp $(STD_CPP_DEFINES)
-    PREPROCESSCMD = gcc2 -pipe -fstrength-reduce -fpcc-struct-return -E $(STD_CPP_DEFINES)
+          GZIPCMD = gzip
+
+              CPP = cpp $(STD_CPP_DEFINES)
+           RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
+    PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
+
           INSTALL = install
           INSTALL = install
-               LD = ld
+     INSTALLFLAGS = -c
+
+               LD = gcc -nostdlib
+
+              LEX = flex -l
+               M4 = m4
+          M4FLAGS =
+           LEXLIB = -lfl
+             YACC = bison -y
+           CCYACC = bison -y
+
              LINT = lint
              LINT = lint
+
       LINTLIBFLAG = -C
          LINTOPTS = -axz
                LN = ln -s
              MAKE = make
       LINTLIBFLAG = -C
          LINTOPTS = -axz
                LN = ln -s
              MAKE = make
-               MV = mv
+               MV = mv -f
                CP = cp
 
            RANLIB = ranlib
                CP = cp
 
            RANLIB = ranlib
+
   RANLIBINSTFLAGS =
 
                RM = rm -f
   RANLIBINSTFLAGS =
 
                RM = rm -f
-            TROFF = psroff
+             PERL = perl
+         PERLOPTS =
+     PERLENVSETUP = env LC_ALL=C
+
+          MANSECT = 1
+   SYSCALLMANSECT = 2
+       LIBMANSECT = 3
+    DRIVERMANSECT = 4
+      FILEMANSECT = 5
+      GAMEMANSECT = 6
+      MISCMANSECT = 7
+       ADMMANSECT = 8
+       MANSRCSECT = s
+       MANNEWSECT = n
+ PROJECTMANSUFFIX = x
+        MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX)
+ SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX)
+     LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX)
+  DRIVERMANSUFFIX = 4x
+    FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX)
+    GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX)
+    MISCMANSUFFIX = 7x
+     ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX)
+   ADMINMANSUFFIX = 8
+     MANSRCSUFFIX = man
+     MANNEWSUFFIX = _man
+          MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__adminmansuffix__=$(ADMINMANSUFFIX) -D__projectroot__=$(PROJECTROOT) -D__xconfigfile__=$(XCONFIGFILE) -D__xconfigdir__=$(XCONFIGDIR) -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) -D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) $(XORGMANDEFS) $(VENDORMANDEFS)
+
+   COMPRESSMANCMD = gzip -n
+
+            TROFF = groff -Tps
+            NROFF = nroff
+
          MSMACROS = -ms
          MSMACROS = -ms
+        MANMACROS = -man
               TBL = tbl
               EQN = eqn
               TBL = tbl
               EQN = eqn
+             NEQN = neqn
+              COL = col
+         COLFLAGS = -b
+
+            MODCC = gcc
+
+           MODCPP = cpp
+        MODCFLAGS = $(CFLAGS)
+            MODAS = gcc -c -x assembler
+       MODASFLAGS =
+
+            MODLD = gcc -nostdlib
+
+       MODLDFLAGS =
+MODLDCOMBINEFLAGS = -r
+            MODAR = ar clq
+
+        MODRANLIB = ranlib
+
+            DVIPS = dvips
+            LATEX = latex
+
      STD_INCLUDES =
      STD_INCLUDES =
-  STD_CPP_DEFINES =
-      STD_DEFINES =
- EXTRA_LOAD_FLAGS = -B/usr/bin/
+  STD_CPP_OPTIONS = -traditional
+  STD_CPP_DEFINES = -traditional -Dlinux -D__arm__ -D__arm32__ -U__arm -Uarm -D_POSIX_C_SOURCE=199309L                                 -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                                                  $(PROJECT_DEFINES)
+      STD_DEFINES = -Dlinux -D__arm__ -D__arm32__ -U__arm -Uarm -D_POSIX_C_SOURCE=199309L                              -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                                                  $(PROJECT_DEFINES)
+ EXTRA_LOAD_FLAGS =
+  EXTRA_LDOPTIONS =
   EXTRA_LIBRARIES =
              TAGS = ctags
 
   EXTRA_LIBRARIES =
              TAGS = ctags
 
-    SHAREDCODEDEF = -DSHAREDCODE
-         SHLIBDEF = -DSUNSHLIB
+   PARALLELMFLAGS =
+
+    SHAREDCODEDEF =
+         SHLIBDEF =
+
+     SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS)
+
+         NOSTDLIB = -nostdlib
+     POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic
+
+         PICFLAGS = -fPIC
 
 
-    PROTO_DEFINES =
+      CXXPICFLAGS = -fPIC
+
+    PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
 
      INSTPGMFLAGS =
 
      INSTBINFLAGS = -m 0755
 
      INSTPGMFLAGS =
 
      INSTBINFLAGS = -m 0755
-     INSTUIDFLAGS = -m 4755
+     INSTUIDFLAGS = -m 4711
      INSTLIBFLAGS = -m 0644
      INSTINCFLAGS = -m 0444
      INSTMANFLAGS = -m 0444
      INSTDATFLAGS = -m 0444
      INSTLIBFLAGS = -m 0644
      INSTINCFLAGS = -m 0444
      INSTMANFLAGS = -m 0444
      INSTDATFLAGS = -m 0444
-    INSTKMEMFLAGS = -g kmem -m 2755
-
-      PROJECTROOT = /v/X11R5
+    INSTKMEMFLAGS = -m 4711
 
 
-     TOP_INCLUDES = -I$(INCROOT)
+      PROJECTROOT = /usr
 
 
-      CDEBUGFLAGS = -O
+      CDEBUGFLAGS = -g -O2 -fno-strict-aliasing
         CCOPTIONS =
 
         CCOPTIONS =
 
-      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(DEFINES)
-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
-        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES)
+      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+         LDPRELIB =  $(INSTALLED_LIBS)
+        LDPOSTLIB =
+        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+     CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+
+           LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
 
 
-           LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
+           CCLINK = $(CC)
 
 
-        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(LOCAL_LDFLAGS) -L$(USRLIBDIR)
+          CXXLINK = $(CXX)
 
 
-   LDCOMBINEFLAGS = -X -r
+     LDSTRIPFLAGS = -x
+   LDCOMBINEFLAGS = -r
       DEPENDFLAGS =
       DEPENDFLAGS =
+   DEPEND_DEFINES =
 
 
-        MACROFILE = sun.cf
-           RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
+# Not sure this belongs here
+         TKLIBDIR = /usr/lib
+         TKINCDIR = /usr/include
+        TKLIBNAME = tk8.4
+        TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
+        TCLLIBDIR = /usr/lib
+        TCLINCDIR = /usr/include
+       TCLLIBNAME = tcl8.4
+       TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
+
+        MACROFILE = linux.cf
+           RM_CMD = $(RM)
 
     IMAKE_DEFINES =
 
     IMAKE_DEFINES =
+   IMAKE_WARNINGS = -Wundef
 
          IRULESRC = $(CONFIGDIR)
 
          IRULESRC = $(CONFIGDIR)
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
+        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)                 $(IMAKE_WARNINGS)
 
 
-     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \
-                       $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \
-                       $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES)
+     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl                        $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE)                   $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
 
 
-# -------------------------------------------------------------------------
-# X Window System Build Parameters
-# $XConsortium: Project.tmpl,v 1.138 91/09/10 09:02:12 rws Exp $
+# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
 
 
-# -------------------------------------------------------------------------
-# X Window System make variables; this need to be coordinated with rules
+# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
 
 
-          PATHSEP = /
-        USRLIBDIR = /v/X11R5/lib
-           BINDIR = /v/X11R5/bin
-          INCROOT = /v/X11R5/include
-     BUILDINCROOT = $(TOP)
-      BUILDINCDIR = $(BUILDINCROOT)/X11
-      BUILDINCTOP = ..
-           INCDIR = $(INCROOT)/X11
+# ----------------------------------------------------------------------
+# X Window System Build Parameters and Rules
+# $XdotOrg: util/cf/X11.tmpl,v 1.54 2006/04/15 15:55:25 herrb Exp $
+# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
+
+XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+  XORGMANNAME = X Version 11
+
+STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
+
+FCHOWN_DEFINES = -DHAS_FCHOWN
+
+# -----------------------------------------------------------------------
+# X Window System make variables; these need to be coordinated with rules
+
+             XTOP = $(TOP)
+           BINDIR = /usr/bin
+     BUILDINCROOT = $(TOP)/exports
+      BUILDINCDIR = $(BUILDINCROOT)/include
+      BUILDINCTOP = ../..
+      BUILDLIBDIR = $(TOP)/exports/lib
+      BUILDLIBTOP = ../..
+      BUILDBINDIR = $(TOP)/exports/bin
+      BUILDBINTOP = ../..
+   BUILDMODULEDIR = $(BUILDLIBDIR)/modules
+     BUILDI18NDIR = $(BUILDLIBDIR)/locale
+   BUILDMODULETOP = $(BUILDLIBTOP)/..
+    XBUILDINCROOT = $(XTOP)/exports
+     XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
+     XBUILDINCTOP = ../../..
+     XBUILDBINDIR = $(XBUILDINCROOT)/bin
+           INCDIR = $(INCROOT)
            ADMDIR = /usr/adm
            ADMDIR = /usr/adm
-           LIBDIR = $(USRLIBDIR)/X11
-        CONFIGDIR = $(LIBDIR)/config
-       LINTLIBDIR = $(USRLIBDIR)/lint
+           LIBDIR = /usr/lib/X11
+         SHAREDIR = /usr/share/X11
+       LIBEXECDIR = /usr/libexec
+        MODULEDIR = $(USRLIBDIR)/modules
+   TOP_X_INCLUDES =
+          XBINDIR = $(PROJECTROOT)/bin
+
+       INSTSRCDIR = /usr/src
+
+        ETCX11DIR = /etc/X11
 
 
-          FONTDIR = $(LIBDIR)/fonts
+          CONFDIR = $(ETCX11DIR)
+
+           DOCDIR = $(LIBDIR)/doc
+       DOCHTMLDIR = $(DOCDIR)/html
+         DOCPSDIR = $(DOCDIR)/PostScript
+        DOCPDFDIR = $(DOCDIR)/PDF
+          FONTDIR = /usr/share/fonts/X11
+     ENCODINGSDIR = /usr/share/fonts/X11/encodings
          XINITDIR = $(LIBDIR)/xinit
            XDMDIR = $(LIBDIR)/xdm
          XINITDIR = $(LIBDIR)/xinit
            XDMDIR = $(LIBDIR)/xdm
+        XDMVARDIR = $(VARLIBDIR)/xdm
            TWMDIR = $(LIBDIR)/twm
            TWMDIR = $(LIBDIR)/twm
-          MANPATH = /v/X11R5/man
-    MANSOURCEPATH = $(MANPATH)/man
-        MANSUFFIX = n
-     LIBMANSUFFIX = 3
-           MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-        LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX)
+           XSMDIR = $(LIBDIR)/xsm
            NLSDIR = $(LIBDIR)/nls
            NLSDIR = $(LIBDIR)/nls
-        PEXAPIDIR = $(LIBDIR)/PEX
-      XAPPLOADDIR = $(LIBDIR)/app-defaults
+       XLOCALEDIR = $(LIBDIR)/locale
+      LBXPROXYDIR = $(LIBDIR)/lbxproxy
+  PROXYMANAGERDIR = $(LIBDIR)/proxymngr
+        XPRINTDIR = $(LIBDIR)/xserver
+      XAPPLOADDIR = /etc/X11/app-defaults
        FONTCFLAGS = -t
 
      INSTAPPFLAGS = $(INSTDATFLAGS)
 
        FONTCFLAGS = -t
 
      INSTAPPFLAGS = $(INSTDATFLAGS)
 
-            IMAKE = imake
-           DEPEND = makedepend
-              RGB = rgb
-
-            FONTC = bdftopcf
+              RGB = $(XBINDIR)/rgb
+            FONTC = $(XBINDIR)/bdftopcf
+      MKFONTSCALE = $(XBINDIR)/mkfontscale
+        MKFONTDIR = $(XBINDIR)/mkfontdir
+      MKHTMLINDEX = $(XBINDIR)/mkhtmlindex
+          UCS2ANY = $(XBINDIR)/ucs2any
+      BDFTRUNCATE = $(XBINDIR)/bdftruncate
+     UCSMAPPREFIX = $(FONTDIR)/util/map-
+       XCURSORGEN = $(XBINDIR)/xcursorgen
 
 
-        MKFONTDIR = mkfontdir
-        MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier
+     HTMLINDEXCMD = HtmlIndexCmd
 
 
-        CONFIGSRC = $(TOP)/config
-       DOCUTILSRC = $(TOP)/doc/util
+       DOCUTILSRC = $(XTOP)/doc/util
         CLIENTSRC = $(TOP)/clients
           DEMOSRC = $(TOP)/demos
         CLIENTSRC = $(TOP)/clients
           DEMOSRC = $(TOP)/demos
-           LIBSRC = $(TOP)/lib
-          FONTSRC = $(TOP)/fonts
-       INCLUDESRC = $(TOP)/X11
-        SERVERSRC = $(TOP)/server
-          UTILSRC = $(TOP)/util
-        SCRIPTSRC = $(UTILSRC)/scripts
-       EXAMPLESRC = $(TOP)/examples
-       CONTRIBSRC = $(TOP)/../contrib
-           DOCSRC = $(TOP)/doc
-           RGBSRC = $(TOP)/rgb
-        DEPENDSRC = $(UTILSRC)/makedepend
-         IMAKESRC = $(CONFIGSRC)
+       XDOCMACROS = $(DOCUTILSRC)/macros.t
+       XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
+       PROGRAMSRC = $(TOP)/programs
+           LIBSRC = $(XTOP)/lib
+          FONTSRC = $(XTOP)/fonts
+     ENCODINGSSRC = $(FONTSRC)/encodings
+       INCLUDESRC = $(BUILDINCROOT)/include
+      XINCLUDESRC = $(INCLUDESRC)/X11
+        SERVERSRC = $(XTOP)/programs/Xserver
+       CONTRIBSRC = $(XTOP)/../contrib
+   UNSUPPORTEDSRC = $(XTOP)/unsupported
+           DOCSRC = $(XTOP)/doc
+           RGBSRC = $(XTOP)/programs/rgb
+      BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
+     MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
+    FONTSERVERSRC = $(PROGRAMSRC)/xfs
+       FONTINCSRC = $(XTOP)/include/fonts
+        EXTINCSRC = $(XTOP)/include/extensions
+      FTSOURCEDIR = FreeTypeSrcDir
+        DRMSRCDIR = $(TOP)/extras/drm
+       MESASRCDIR = $(TOP)/extras/Mesa
+  OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample
+        PSWRAPSRC = $(XTOP)/config/pswrap
+     TRANSCOMMSRC = $(LIBSRC)/xtrans
+   TRANS_INCLUDES = -I$(TRANSCOMMSRC)
+ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6
+XTRANS_FAILDEFINES = -DFAIL_HARD
+
+    VENDORMANNAME = X.Org
+ VENDORMANVERSION = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+      XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
+    VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)"
+       VENDORNAME = The X.Org Foundation
+  VENDORNAMESHORT = X.Org
+
+ VENDORWEBSUPPORT = http://wiki.X.Org
+
+VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"'
+
+      XKBDEFRULES = xorg
+  XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"'
+
+     XCONFIGFILE = xorg.conf
+      XCONFIGDIR = $(LIBDIR)
+        XLOGFILE = Xorg
+     XSERVERNAME = Xorg
+
+       XENVLIBDIR = $(USRLIBDIR)
+   CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) XLOCALEDIR=$(BUILDLIBDIR)/locale
+
+# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
+
+          XLIBSRC = $(LIBSRC)/X11
+
+SOXLIBREV = 6.2
+DEPXONLYLIB =
+XONLYLIB =  -lX11
+
+LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln
+
+      DEPXLIBONLY = $(DEPXONLYLIB)
+         XLIBONLY = $(XONLYLIB)
+     LINTXONLYLIB = $(LINTXONLY)
+
+      XEXTLIBSRC = $(LIBSRC)/Xext
+
+SOXEXTREV = 6.4
+DEPEXTENSIONLIB =
+EXTENSIONLIB =  -lXext
+
+LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln
+
+LINTEXTENSIONLIB = $(LINTEXTENSION)
+          DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
+             XLIB = $(EXTENSIONLIB) $(XONLYLIB)
+         LINTXLIB = $(LINTXONLYLIB)
+
+    XSSLIBSRC = $(LIBSRC)/Xss
+
+SOXSSREV = 1.0
+DEPXSSLIB =
+XSSLIB =  -lXss
+
+LINTXSS = $(LINTLIBDIR)/llib-lXss.ln
+
+    XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
+
+SOXXF86MISCREV = 1.1
+DEPXXF86MISCLIB =
+XXF86MISCLIB =  -lXxf86misc
+
+LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln
+
+    XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
+
+SOXXF86VMREV = 1.0
+DEPXXF86VMLIB =
+XXF86VMLIB =  -lXxf86vm
+
+LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln
+
+    XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
+
+SOXXF86DGAREV = 1.0
+DEPXXF86DGALIB =
+XXF86DGALIB =  -lXxf86dga
+
+LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln
+
+    XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
+
+SOXXF86RUSHREV = 1.0
+DEPXXF86RUSHLIB =
+XXF86RUSHLIB =  -lXxf86rush
+
+LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln
+
+    XVLIBSRC = $(LIBSRC)/Xv
+
+SOXVREV = 1.0
+DEPXVLIB =
+XVLIB =  -lXv
+
+LINTXV = $(LINTLIBDIR)/llib-lXv.ln
+
+    XVMCLIBSRC = $(LIBSRC)/XvMC
+
+SOXVMCREV = 1.0
+DEPXVMCLIB =
+XVMCLIB =  -lXvMC
+
+LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln
+
+    XINERAMALIBSRC = $(LIBSRC)/Xinerama
+
+SOXINERAMAREV = 1.0
+DEPXINERAMALIB =
+XINERAMALIB =  -lXinerama
+
+LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln
+
+    XRESLIBSRC = $(LIBSRC)/XRes
+
+SOXRESREV = 1.0
+DEPXRESLIB =
+XRESLIB =  -lXRes
+
+LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln
+
+    DMXLIBSRC = $(LIBSRC)/dmx
+
+SODMXREV = 1.0
+DEPDMXLIB =
+DMXLIB =  -ldmx
+
+LINTDMX = $(LINTLIBDIR)/llib-ldmx.ln
+
+    DPSLIBSRC = $(LIBSRC)/dps
+
+DEPDPSLIB = $(USRLIBDIR)/libdps.a
+DPSLIB =  -ldps
+
+LINTDPS = $(LINTLIBDIR)/llib-ldps.ln
+
+    DPSTKLIBSRC = $(LIBSRC)/dpstk
+
+DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a
+DPSTKLIB =  -ldpstk
+
+LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln
+
+    PSRESLIBSRC = $(LIBSRC)/psres
+
+DEPPSRESLIB = $(USRLIBDIR)/libpsres.a
+PSRESLIB =  -lpsres
+
+LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln
+
+    GLULIBSRC = $(LIBSRC)/GLU
+
+SOGLUREV = 1.3
+DEPGLULIB =
+GLULIB =  -lGLU
+
+LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln
+
+    GLXLIBSRC = $(LIBSRC)/GL
+
+SOGLREV = 1.2
+DEPGLXLIB =
+GLXLIB =  -lGL
+
+LINTGLX = $(LINTLIBDIR)/llib-lGL.ln
+
+    GLWIDGETSRC = $(LIBSRC)/GLw
+
+DEPGLWLIB = $(USRLIBDIR)/libGLw.a
+GLWLIB =  -lGLw
+
+LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln
+
+XRENDERDIR = /usr
+XRENDERLIBDIR = /usr/lib
+XRENDERINCDIR = /usr/include
+XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
+DEPXRENDERLIB =
+
+XRENDERINCLUDES = -I$(XRENDERINCDIR)
+
+    XRANDRLIBSRC = $(LIBSRC)/Xrandr
+
+SOXRANDRREV = 2.0
+DEPXRANDRLIB =
+XRANDRLIB =  -lXrandr
+
+LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln
+
+    XFIXESLIBSRC = $(LIBSRC)/Xfixes
+
+SOXFIXESREV = 3.0
+DEPXFIXESLIB =
+XFIXESLIB =  -lXfixes
+
+LINTXFIXES = $(LINTLIBDIR)/llib-lXfixes.ln
+
+   XDAMAGELIBSRC = $(LIBSRC)/Xdamage
+
+SOXDAMAGEREV = 1.0
+DEPXDAMAGELIB =
+XDAMAGELIB =  -lXdamage
+
+LINTXDAMAGE = $(LINTLIBDIR)/llib-lXdamage.ln
+
+XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
+
+SOXCOMPOSITEREV = 1.0
+DEPXCOMPOSITELIB =
+XCOMPOSITELIB =  -lXcomposite
+
+LINTXCOMPOSITE = $(LINTLIBDIR)/llib-lXcomposite.ln
+
+XEVIELIBSRC = $(LIBSRC)/Xevie
+
+SOXEVIEREV = 1.0
+DEPXEVIELIB =
+XEVIELIB =  -lXevie
+
+LINTXEVIE = $(LINTLIBDIR)/llib-lXevie.ln
+
+XCURSORDIR = /usr
+XCURSORLIBDIR = /usr/lib
+XCURSORINCDIR = /usr/include
+XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
+
+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
+
+   APPLEWMLIBSRC = $(LIBSRC)/apple
+
+DEPAPPLEWMLIB = $(USRLIBDIR)/libAppleWM.a
+APPLEWMLIB =  -lAppleWM
+
+LINTAPPLEWM = $(LINTLIBDIR)/llib-lAppleWM.ln
+
+   WINDOWSWMLIBSRC = $(LIBSRC)/windows
+
+DEPWINDOWSWMLIB = $(USRLIBDIR)/libWindowsWM.a
+WINDOWSWMLIB =  -lWindowsWM
+
+LINTWINDOWSWM = $(LINTLIBDIR)/llib-lWindowsWM.ln
+
+    XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
+
+DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a
+XFONTCACHELIB =  -lXfontcache
+
+LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln
+
          XAUTHSRC = $(LIBSRC)/Xau
          XAUTHSRC = $(LIBSRC)/Xau
-          XLIBSRC = $(LIBSRC)/X
+
+SOXAUTHREV = 6.0
+DEPXAUTHLIB =
+XAUTHLIB =  -lXau
+
+LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln
+
+      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
+
+SOXDMCPREV = 6.0
+DEPXDMCPLIB =
+XDMCPLIB =  -lXdmcp
+
+LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln
+
            XMUSRC = $(LIBSRC)/Xmu
            XMUSRC = $(LIBSRC)/Xmu
+
+SOXMUREV = 6.2
+DEPXMULIB =
+XMULIB =  -lXmu
+
+LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
+
+           XMUUSRC = $(LIBSRC)/Xmuu
+
+SOXMUUREV = 1.0
+DEPXMUULIB =
+XMUULIB =  -lXmuu
+
+LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln
+
+       OLDXLIBSRC = $(LIBSRC)/oldX
+
+DEPOLDXLIB = $(USRLIBDIR)/liboldX.a
+OLDXLIB =  -loldX
+
+LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln
+
+         XPLIBSRC = $(LIBSRC)/Xp
+
+SOXPREV = 6.2
+DEPXPLIB =
+XPLIB =  -lXp
+
+LINTXP = $(LINTLIBDIR)/llib-lXp.ln
+
        TOOLKITSRC = $(LIBSRC)/Xt
        TOOLKITSRC = $(LIBSRC)/Xt
+
+SOXTREV = 6.0
+DEPXTOOLONLYLIB =
+XTOOLONLYLIB =  -lXt
+
+LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln
+
+      DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
+         XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
+     LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
+
+       XALIBSRC = $(LIBSRC)/Xa
+
+SOXAREV = 1.0
+DEPXALIB =
+XALIB =  -lXa
+
+LINTXA = $(LINTLIBDIR)/llib-lXa.ln
+
        AWIDGETSRC = $(LIBSRC)/Xaw
        AWIDGETSRC = $(LIBSRC)/Xaw
-       OLDXLIBSRC = $(LIBSRC)/oldX
-      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-      BDFTOSNFSRC = $(FONTSRC)/bdftosnf
-      BDFTOSNFSRC = $(FONTSRC)/clients/bdftosnf
-      BDFTOPCFSRC = $(FONTSRC)/clients/bdftopcf
-     MKFONTDIRSRC = $(FONTSRC)/clients/mkfontdir
-         FSLIBSRC = $(FONTSRC)/lib/fs
-    FONTSERVERSRC = $(FONTSRC)/server
-     EXTENSIONSRC = $(TOP)/extensions
-         XILIBSRC = $(EXTENSIONSRC)/lib/xinput
-      PHIGSLIBSRC = $(EXTENSIONSRC)/lib/PEX
-
-# $XConsortium: sunLib.tmpl,v 1.14.1.1 92/03/17 14:58:46 rws Exp $
-
-SHLIBLDFLAGS = -assert pure-text
-PICFLAGS = -fPIC
-
-  DEPEXTENSIONLIB =
-     EXTENSIONLIB = -lXext
-
-          DEPXLIB = $(DEPEXTENSIONLIB)
-             XLIB = $(EXTENSIONLIB) -lX11
-
-        DEPXMULIB = $(USRLIBDIR)/libXmu.sa.$(SOXMUREV)
-       XMULIBONLY = -lXmu
-           XMULIB = -lXmu
-
-       DEPOLDXLIB =
-          OLDXLIB = -loldX
-
-      DEPXTOOLLIB = $(USRLIBDIR)/libXt.sa.$(SOXTREV)
-         XTOOLLIB = -lXt
-
-        DEPXAWLIB = $(USRLIBDIR)/libXaw.sa.$(SOXAWREV)
-           XAWLIB = -lXaw
-
-        DEPXILIB =
-           XILIB = -lXi
-
-        SOXLIBREV = 4.10
-          SOXTREV = 4.10
-         SOXAWREV = 5.0
-        SOOLDXREV = 4.10
-         SOXMUREV = 4.10
-        SOXEXTREV = 4.10
-      SOXINPUTREV = 4.10
-
-      DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
-         XAUTHLIB =  -lXau
-      DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
-         XDMCPLIB =  -lXdmcp
-
-        DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
-           PHIGSLIB =  -lphigs
-
-       DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
-          XBSDLIB =  -lXbsd
-
- LINTEXTENSIONLIB = $(LINTLIBDIR)/llib-lXext.ln
-         LINTXLIB = $(LINTLIBDIR)/llib-lX11.ln
-          LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
-        LINTXTOOL = $(LINTLIBDIR)/llib-lXt.ln
-          LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
-           LINTXI = $(LINTLIBDIR)/llib-lXi.ln
-        LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
+
+SOXAWREV = 8.0
+DEPXAWLIB =
+XAWLIB =  -lXaw
+
+LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
+
+       AWIDGET7SRC = $(LIBSRC)/Xaw7
+
+SOXAW7REV = 7.0
+DEPXAW7LIB =
+XAW7LIB =  -lXaw
+
+LINTXAW7 = $(LINTLIBDIR)/llib-lXaw.ln
+
+       AWIDGET6SRC = $(LIBSRC)/Xaw6
+
+SOXAW6REV = 6.1
+DEPXAW6LIB =
+XAW6LIB =  -lXaw
+
+LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln
+
+         XILIBSRC = $(LIBSRC)/Xi
+
+SOXINPUTREV = 6.0
+DEPXILIB =
+XILIB =  -lXi
+
+LINTXI = $(LINTLIBDIR)/llib-lXi.ln
+
+      XTESTLIBSRC = $(LIBSRC)/Xtst
+
+SOXTESTREV = 6.1
+DEPXTESTLIB =
+XTESTLIB =  -lXtst
+
+LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln
+
+DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
+XBSDLIB =  -lXbsd
+
+LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln
+
+           ICESRC = $(LIBSRC)/ICE
+
+SOICEREV = 6.4
+DEPICELIB =
+ICELIB =  -lICE
+
+LINTICE = $(LINTLIBDIR)/llib-lICE.ln
+
+            SMSRC = $(LIBSRC)/SM
+
+SOSMREV = 6.0
+DEPSMLIB =
+SMLIB =  -lSM
+
+LINTSM = $(LINTLIBDIR)/llib-lSM.ln
+
+           XKEYSRC = $(LIBSRC)/Xkey
+
+SOXKEYREV = 6.0
+DEPXKEYLIB =
+XKEYLIB =  -lXkey
+
+LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln
+
+         FSLIBSRC = $(LIBSRC)/FS
+
+SOFSREV = 6.0
+DEPFSLIB =
+FSLIB =  -lFS
+
+LINTFS = $(LINTLIBDIR)/llib-lFS.ln
+
+         FONTLIBSRC = $(LIBSRC)/font
+
+DEPFONTLIB = $(USRLIBDIR)/libXfont.a
+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC)  -lXfont
+
+LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln
+#
+DEPXFONTLIB = $(USRLIBDIR)/libXfont.a
+XFONTLIB =  -lXfont
+
+LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln
+
+     FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
+
+DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a
+FONTSTUBLIB =  -lfntstubs
+
+LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln
+         DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
+            FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB)
+
+         FONTENCLIBSRC = $(LIBSRC)/fontenc
+
+DEPXFONTENCLIB = $(USRLIBDIR)/libfontenc.a
+XFONTENCLIB =  -lfontenc
+
+LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln
+
+          XPMLIBSRC = $(LIBSRC)/Xpm
+
+SOXPMREV = 4.11
+DEPXPMLIB =
+XPMLIB =  -lXpm
+
+LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln
+
+FREETYPE2DIR = /usr
+FREETYPE2LIBDIR = /usr/lib
+FREETYPE2INCDIR = /usr/include
+
+FREETYPE2LIB = -lfreetype
+
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
+
+FREETYPE2DEFINES = -DFREETYPE2
+
+          EXPATLIBSRC = $(LIBSRC)/expat
+
+SOEXPATREV = 0.4
+DEPEXPATLIB =
+EXPATLIB =  -lexpat
+
+LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln
+
+EXPATDIR = /usr
+EXPATLIBDIR = /usr/lib
+EXPATINCDIR = /usr/include
+
+EXPATINCLUDES =
+
+EXPATLIB = -lexpat
+
+EXPATDEFINES = -DEXPAT
+
+XFTDIR = /usr
+XFTLIBDIR = /usr/lib
+XFTINCDIR = /usr/include
+XFTLIB = -L$(XFTLIBDIR) -lXft
+
+XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
+
+FONTCONFIGDIR = /usr
+FONTCONFIGLIBDIR = /usr/lib
+FONTCONFIGINCDIR = /usr/include
+FONTCONFIGBINDIR = /usr/bin
+
+FONTCONFIGLIB = -lfontconfig
+
+FONTCONFIGINCLUDES =
+
+FCCACHE = $(FONTCONFIGBINDIR)/fc-cache
+
+FONTCONFIGDEFINES = -DFONTCONFIG
+
+LIBPNGINCDIR = /usr/include
+
+LIBPNGINC=
+
+LIBPNGDIR = /usr
+LIBPNGLIBDIR = /usr/lib
+LIBPNGINCDIR = /usr/include
+
+LIBPNGLIB = -lpng
+
+    XKBFILELIBSRC = $(LIBSRC)/xkbfile
+
+SOXKBFILEREV =  1.0
+DEPXKBFILELIB =
+XKBFILELIB =  -lxkbfile
+
+LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln
+
+     XKBCOMPCMD = $(XBINDIR)/xkbcomp
+
+    XKBUILIBSRC = $(LIBSRC)/xkbui
+
+SOXKBUIREV =  1.0
+DEPXKBUILIB =
+XKBUILIB =  -lxkbui
+
+LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln
+
+EXTRAXAWREQS =
+
+EXTRAXAWCLIENTDEPLIBS =
+
+EXTRAXAWCLIENTLIBS =
+
+        XTRAPLIBSRC = $(LIBSRC)/XTrap
+
+SOXTRAPREV = 6.4
+DEPXTRAPLIB =
+XTRAPLIB =  -lXTrap
+
+LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln
 
           DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
          DEPLIBS1 = $(DEPLIBS)
          DEPLIBS2 = $(DEPLIBS)
          DEPLIBS3 = $(DEPLIBS)
 
           DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
          DEPLIBS1 = $(DEPLIBS)
          DEPLIBS2 = $(DEPLIBS)
          DEPLIBS3 = $(DEPLIBS)
+         DEPLIBS4 = $(DEPLIBS)
+         DEPLIBS5 = $(DEPLIBS)
+         DEPLIBS6 = $(DEPLIBS)
+         DEPLIBS7 = $(DEPLIBS)
+         DEPLIBS8 = $(DEPLIBS)
+         DEPLIBS9 = $(DEPLIBS)
+         DEPLIBS10 = $(DEPLIBS)
 
 
-# -------------------------------------------------------------------------
-# Imake rules for building libraries, programs, scripts, and data files
-# rules:  $XConsortium: Imake.rules,v 1.123 91/09/16 20:12:16 rws Exp $
+      XFTPRELOADPATTERN = libXft.so.?
+  XRENDERPRELOADPATTERN = libXrender.so.?
+    XFONTPRELOADPATTERN = libXfont*.so.?
+
+XMULIBONLY = -lXmu
+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+
+        CONFIGDIR = $(LIBDIR)/config
 
 
-# -------------------------------------------------------------------------
+    USRLIBDIRPATH = $(USRLIBDIR)
+        LDPRELIBS =   $(INSTALLED_LIBS)
+       LDPOSTLIBS =
+     TOP_INCLUDES =  $(TOP_X_INCLUDES)
+  PROJECT_DEFINES =
+   VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"'
+
+CXXPROJECT_DEFINES =
+
+# ----------------------------------------------------------------------
 # start of Imakefile
 
 #
 # start of Imakefile
 
 #
@@ -287,19 +1052,21 @@ world::
         SUBDIRS        = Cl HText Xl Ui erwise
 
 all::
         SUBDIRS        = Cl HText Xl Ui erwise
 
 all::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       (cd $$i ; echo "making" all "in $(CURRENT_DIR)/$$i..."; \
-       $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CDEBUGFLAGS=$(CDEBUGFLAGS)' all); \
+               echo "making" all "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) 'CC=$(CC)' 'CDEBUGFLAGS=$(CDEBUGFLAGS)' all; \
        done
 
 depend::
        done
 
 depend::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       (cd $$i ; echo "depending" "in $(CURRENT_DIR)/$$i..."; \
-       $(MAKE) $(MFLAGS)  depend); \
+               echo "depending" "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS)  depend; \
        done
 
 install::
        done
 
 install::
@@ -311,13 +1078,33 @@ mastermakefiles::
        $(MAKE) -f Makefile.bak Makefile
        $(MAKE) Makefiles
 
        $(MAKE) -f Makefile.bak Makefile
        $(MAKE) Makefiles
 
-# -------------------------------------------------------------------------
+# ----------------------------------------------------------------------
 # common rules for all Makefiles - do not edit
 
 # common rules for all Makefiles - do not edit
 
+.c.i:
+       $(RM) $@
+               $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+
+.SUFFIXES: .ii
+
+.cc.ii:
+       $(RM) $@
+               $(CC) -E $(CFLAGS) $(_NOOP_) $*.cc > $@
+
+.SUFFIXES: .s
+
+.c.s:
+       $(RM) $@
+               $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
+
+.cc.s:
+       $(RM) $@
+               $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc
+
 emptyrule::
 
 emptyrule::
 
-clean::
-       $(RM_CMD) "#"*
+cleandir::
+       $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut   "#"*
 
 Makefile::
        -@if [ -f Makefile ]; then set -x; \
 
 Makefile::
        -@if [ -f Makefile ]; then set -x; \
@@ -329,110 +1116,151 @@ tags::
        $(TAGS) -w *.[ch]
        $(TAGS) -xw *.[ch] > TAGS
 
        $(TAGS) -w *.[ch]
        $(TAGS) -xw *.[ch] > TAGS
 
-saber:
-       # load $(ALLDEFINES) $(SRCS)
+man_keywords::
+
+html_index::
 
 
-osaber:
-       # load $(ALLDEFINES) $(OBJS)
+clean:: cleandir
 
 
-# -------------------------------------------------------------------------
+distclean:: cleandir
+
+# ----------------------------------------------------------------------
 # rules for building in SUBDIRS - do not edit
 
 install::
 # rules for building in SUBDIRS - do not edit
 
 install::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
-       $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
+               echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) install; \
        done
 
 install.man::
        done
 
 install.man::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
+       for i in $(SUBDIRS) ;\
+       do \
+               echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) install.man; \
+       done
+
+install.sdk::
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       (cd $$i ; echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \
-       $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install.man); \
+               echo "installing driver SDK" "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR='$(DESTDIR)' install.sdk; \
        done
 
 clean::
        done
 
 clean::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       (cd $$i ; echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \
-       $(MAKE) $(MFLAGS) RM_CMD='$(RM_CMD)' clean); \
+               echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS)  clean; \
        done
 
 tags::
        done
 
 tags::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       (cd $$i ; echo "tagging" "in $(CURRENT_DIR)/$$i..."; \
-       $(MAKE) $(MFLAGS) TAGS='$(TAGS)' tags); \
+               echo "tagging" "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) TAGS='$(TAGS)' tags; \
        done
 
        done
 
+$(ONESUBDIR)/Makefile:
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[n]*) executeit="no";; esac; done; \
+       cd $(ONESUBDIR) && \
+       if [ "$$executeit" != "no" ]; then \
+               $(IMAKE_CMD) -DTOPDIR=$(IMAKETOP) -DCURDIR=$(ONECURDIR)$(ONESUBDIR); \
+       fi;
+
 Makefiles::
 Makefiles::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       -@for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
+       for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[n]*) executeit="no";; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       echo "making Makefiles in $(CURRENT_DIR)/$$i..."; \
-       case "$$i" in \
-       ./?*/?*/?*/?*) newtop=../../../../ sub=subsubsubsub;; \
-       ./?*/?*/?*) newtop=../../../ sub=subsubsub;; \
-       ./?*/?*) newtop=../../ sub=subsub;; \
-       ./?*) newtop=../ sub=sub;; \
-       */?*/?*/?*) newtop=../../../../ sub=subsubsubsub;; \
-       */?*/?*) newtop=../../../ sub=subsubsub;; \
-       */?*) newtop=../../ sub=subsub;; \
-       *) newtop=../ sub=sub;; \
-       esac; \
-       case "$(TOP)" in \
-       /?*) newtop= upprefix= ;; \
-       *) upprefix=../ ;; \
-       esac; \
-       $(MAKE) $${sub}dirMakefiles UPPREFIX=$$upprefix NEWTOP=$$newtop \
-       MAKEFILE_SUBDIR=$$i NEW_CURRENT_DIR=$(CURRENT_DIR)/$$i;\
+               case "$(CURRENT_DIR)" in \
+               .) curdir= ;; \
+               *) curdir=$(CURRENT_DIR)/ ;; \
+               esac; \
+               echo "making Makefiles in $$curdir$$i..."; \
+               itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \
+               curtmp="$(CURRENT_DIR)" \
+               toptmp=""; \
+               case "$$itmp" in \
+                   ../?*) \
+                       while echo "$$itmp" | grep '^\.\./' > /dev/null;\
+                         do \
+                            toptmp="/`basename $$curtmp`$$toptmp"; \
+                            curtmp="`dirname $$curtmp`"; \
+                            itmp="`echo $$itmp | sed 's;\.\./;;'`"; \
+                         done \
+                   ;; \
+               esac; \
+               case "$$itmp" in \
+               */?*/?*/?*/?*)  newtop=../../../../..;; \
+               */?*/?*/?*)     newtop=../../../..;; \
+               */?*/?*)        newtop=../../..;; \
+               */?*)           newtop=../..;; \
+               *)              newtop=..;; \
+               esac; \
+               newtop="$$newtop$$toptmp"; \
+               case "$(TOP)" in \
+               /?*) imaketop=$(TOP) \
+                    imakeprefix= ;; \
+               .) imaketop=$$newtop \
+                  imakeprefix=$$newtop/ ;; \
+               *) imaketop=$$newtop/$(TOP) \
+                  imakeprefix=$$newtop/ ;; \
+               esac; \
+               $(RM) $$i/Makefile.bak; \
+               if [ -f $$i/Makefile ]; then \
+                       echo "  $(MV) Makefile Makefile.bak"; \
+                       if [ "$$executeit" != "no" ]; then \
+                               $(MV) $$i/Makefile $$i/Makefile.bak; \
+                       fi; \
+               fi; \
+               $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \
+               if [ -d $$i ] ; then \
+                       cd $$i; \
+                       $(MAKE) $(MFLAGS) Makefiles; \
+                       cd $$newtop; \
+               else \
+                       exit 1; \
+               fi; \
        done
 
        done
 
-subdirMakefiles:
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak
-       -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then set -x; \
-       $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \
-       else exit 0; fi
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \
-       $(MAKE) $(MFLAGS) Makefiles
-
-subsubdirMakefiles:
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak
-       -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then set -x; \
-       $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \
-       else exit 0; fi
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \
-       $(MAKE) $(MFLAGS) Makefiles
-
-subsubsubdirMakefiles:
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak
-       -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then set -x; \
-       $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \
-       else exit 0; fi
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(UPPREFIX)$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \
-       $(MAKE) $(MFLAGS) Makefiles
-
-subsubsubsubdirMakefiles:
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak
-       -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then set -x; \
-       $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \
-       else exit 0; fi
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(UPPREFIX)$(UPPREFIX)$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \
-       $(MAKE) $(MFLAGS) Makefiles
-
 includes::
 includes::
-       @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
+       for i in $(SUBDIRS) ;\
+       do \
+               echo including "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS)  includes; \
+       done
+
+distclean::
+       @for flag in ${MAKEFLAGS} ''; do \
+         case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \
        for i in $(SUBDIRS) ;\
        do \
        for i in $(SUBDIRS) ;\
        do \
-       (cd $$i ; echo including "in $(CURRENT_DIR)/$$i..."; \
-       $(MAKE) $(MFLAGS)  includes); \
+               echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \
+               $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS)  distclean; \
        done
 
        done
 
-# -------------------------------------------------------------------------
+    PREPROCESSMANPAGES = true
+
+distclean::
+       $(RM) Makefile Makefile.dep
+
+# ----------------------------------------------------------------------
 # dependencies generated by makedepend
 
 # dependencies generated by makedepend
 
diff --git a/Ui/UiIncludes.h b/Ui/UiIncludes.h
index a34d59c..632584e 100644 (file)
--- a/Ui/UiIncludes.h
+++ b/Ui/UiIncludes.h
@@ -4,7 +4,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <varargs.h>
+/* Toni */
+#include <stdarg.h>
 
 #include <X11/Intrinsic.h>
 #include <X11/cursorfont.h>
 
 #include <X11/Intrinsic.h>
 #include <X11/cursorfont.h>
diff --git a/Ui/UiProtos.h b/Ui/UiProtos.h
index cabd1bb..c4520fd 100644 (file)
--- a/Ui/UiProtos.h
+++ b/Ui/UiProtos.h
@@ -4,8 +4,8 @@
 /*
  *  Misc. prototypes (external to library)
  */
 /*
  *  Misc. prototypes (external to library)
  */
-
-extern int fprintf(FILE * stream, char *format,...);
+/* Toni */
+/* extern int fprintf(FILE * stream, char *format,...); */
 
 
 /*
 
 
 /*
Unnamed repository; edit this file to name it for gitweb.