--- asmixer-0.5.orig/Makefile
+++ asmixer-0.5/Makefile
@@ -1,103 +1,112 @@
# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c /main/88 1995/12/08 16:33:13 gildea $
+# $TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $
# ----------------------------------------------------------------------
# Makefile generated from "Imake.tmpl" and <Imakefile>
-# $XConsortium: Imake.tmpl /main/r61_main/3 1996/02/02 18:57:32 gildea $
-# $XFree86: xc/config/cf/Imake.tmpl,v 3.27 1996/09/14 13:05:02 dawes Exp $
+# $TOG: Imake.tmpl /main/249 1997/10/13 15:28:56 kaleb $
#
+#
+#
+#
+# $XFree86: xc/config/cf/Imake.tmpl,v 3.86 2000/12/01 00:24:30 dawes Exp $
+# ----------------------------------------------------------------------
+
+all::
.SUFFIXES: .i
-# $XConsortium: Imake.cf /main/22 1995/12/05 16:39:53 mor $
-# $XFree86: xc/config/cf/Imake.cf,v 3.28 1996/10/16 14:28:24 dawes Exp $
+# $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
+
+# $XFree86: xc/config/cf/Imake.cf,v 3.62 2000/11/02 02:51:05 dawes Exp $
+
+# Keep cpp from replacing path elements containing i486/i586/i686
+
+# for compatibility with 3.3.x
# -----------------------------------------------------------------------
# site-specific configuration parameters that need to come before
# the platform-specific parameters - edit site.def to change
-# site: $XConsortium: site.sample /main/19 1995/12/14 13:03:29 matt $
-# site: $XFree86: xc/config/cf/site.def,v 3.10 1996/01/07 09:57:49 dawes 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.23 2000/03/31 22:55:15 dawes Exp $
-# $XFree86: xc/config/cf/xf86site.def,v 3.91 1996/10/19 15:12:30 dawes Exp $
+# $XFree86: xc/config/cf/xf86site.def,v 3.169 2000/12/14 08:03:47 herrb Exp $
# ----------------------------------------------------------------------
# platform-specific configuration parameters - edit linux.cf to change
-# platform: $XConsortium: linux.cf /main/18 1996/02/02 18:59:31 gildea $
-# platform: $XFree86: xc/config/cf/linux.cf,v 3.49 1996/10/19 15:12:28 dawes Exp $
+# platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
+
+# platform: $XFree86: xc/config/cf/linux.cf,v 3.157 2000/12/14 17:00:46 dawes Exp $
+
+# operating system: Linux 2.4.2 i686 [ELF] (2.4.2)
+# libc: (6.2.2)
+# binutils: (31)
-# $XConsortium: lnxLib.rules /main/12 1996/01/03 14:51:18 kaleb $
-# $XFree86: xc/config/cf/lnxLib.rules,v 3.24 1996/10/06 13:09:44 dawes Exp $
+# $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $
+# $XFree86: xc/config/cf/lnxLib.rules,v 3.37 1999/06/06 08:47:44 dawes Exp $
-# $XFree86: xc/config/cf/xfree86.cf,v 3.117 1996/10/19 15:12:31 dawes Exp $
+# $XFree86: xc/config/cf/xfree86.cf,v 3.337 2000/12/14 16:38:45 dawes Exp $
-# $XConsortium: xfree86.cf /main/17 1996/01/03 14:50:55 kaleb $
+# $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
-LINKKITDIR = $(USRLIBDIR)/Server
-XF98LINKKITDIR = $(USRLIBDIR)/Server
+AFB_DEFS = -DUSE_AFB
+
+DRIVERSDKDIR = $(USRLIBDIR)/Server
+DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules
+DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include
XF86SRC = $(SERVERSRC)/hw/xfree86
- XF86ACCELSRC = $(XF86SRC)/accel
XF86COMSRC = $(XF86SRC)/common
- XF86CONFIGSRC = $(XF86COMSRC)
- XF86HWSRC = $(XF86SRC)/common_hw
+ XF86PARSERSRC = $(XF86SRC)/parser
XF86OSSRC = $(XF86SRC)/os-support
- VGADRIVERSRC = $(XF86SRC)/vga256/drivers
-VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers
- VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers
- MONODRIVERSRC = $(XF86SRC)/mono/drivers
- S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
- S3VDRIVERSRC = $(XF86SRC)/accel/s3_virge/drivers
-
- XF68SRC = $(SERVERSRC)/hw/xfree68
- XF68COMSRC = $(XF68SRC)/common
- XF68CONFIGSRC = $(XF68COMSRC)
- XF68OSSRC = $(XF68SRC)/os-support
-
- XF98SRC = $(SERVERSRC)/hw/xfree98
- XF98ACCELSRC = $(XF98SRC)/accel
- XF98COMSRC = $(XF98SRC)/common
- XF98CONFIGSRC = $(XF98COMSRC)
- XF98HWSRC = $(XF98SRC)/common_hw/generic
- XF98HWNECSRC = $(XF98SRC)/common_hw/nec
- XF98HWPWSKBSRC = $(XF98SRC)/common_hw/pwskb
- XF98HWPWLBSRC = $(XF98SRC)/common_hw/pwlb
- XF98HWGA968SRC = $(XF98SRC)/common_hw/ga968
- XF98OSSRC = $(XF98SRC)/os-support
- XF98VGADRIVERSRC = $(XF98SRC)/vga256/drivers
-XF98VGA16DRIVERSRC = $(XF98SRC)/vga16/drivers
- XF98VGA2DRIVERSRC = $(XF98SRC)/vga2/drivers
- XF98MONODRIVERSRC = $(XF98SRC)/mono/drivers
-XF98NECS3DRIVERSRC = $(XF98SRC)/accel/s3nec/drivers
-XF98PWSKBDRIVERSRC = $(XF98SRC)/accel/s3pwskb/drivers
- XF98PWLBDRIVERSRC = $(XF98SRC)/accel/s3pwlb/drivers
-XF98GA968DRIVERSRC = $(XF98SRC)/accel/s3ga968/drivers
-
- XFREE86DOCDIR = $(LIBDIR)/doc
- XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
- XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
-XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)/Japanese
+ XF86DRIVERSRC = $(XF86SRC)/drivers
+ DRIVERSRC = $(XF86DRIVERSRC)
+
+ XFREE86DOCDIR = $(DOCDIR)
+ XFREE86PSDOCDIR = $(DOCPSDIR)
+ XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
-# $XConsortium: xf86.rules,v 1.7 95/01/25 16:34:39 kaleb Exp $
-# $XFree86: xc/config/cf/xf86.rules,v 3.15 1996/09/24 13:48:46 dawes Exp $
+# $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
+# $XFree86: xc/config/cf/xf86.rules,v 3.31 2000/03/31 22:55:15 dawes Exp $
# ----------------------------------------------------------------------
# site-specific configuration parameters that go after
# the platform-specific parameters - edit site.def to change
-# site: $XConsortium: site.sample /main/19 1995/12/14 13:03:29 matt $
-# site: $XFree86: xc/config/cf/site.def,v 3.10 1996/01/07 09:57:49 dawes 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.23 2000/03/31 22:55:15 dawes Exp $
# ---------------------------------------------------------------------
# Imake rules for building libraries, programs, scripts, and data files
-# rules: $XConsortium: Imake.rules /main/208 1996/01/17 11:08:27 kaleb $
-# rules: $XFree86: xc/config/cf/Imake.rules,v 3.27 1996/09/01 04:12:46 dawes Exp $
+# rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
+#
+#
+#
+#
+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.86 2000/12/12 17:05:30 dawes Exp $
_NULLCMD_ = @ echo -n
+GLIDE2INCDIR = /usr/include/glide
+
+GLIDE3INCDIR = /usr/include/glide3
+
+GLIDE3LIBNAME = glide3
+
+TKLIBNAME = tk8.3
+
+TKLIBDIR = /usr/lib
+
+TCLLIBNAME = tcl8.3
+
+TCLIBDIR = /usr/lib
+
PATHSEP = /
- SHELL = /bin/sh
+ SHELL = /bin/sh -e
TOP = .
CURRENT_DIR = .
@@ -105,13 +114,20 @@
IMAKE = imake
DEPEND = gccmakedep
MKDIRHIER = mkdir -p
+ REVPATH = revpath
+ EXPORTLISTGEN =
+ RMAN = RmanCmd
+ RMANOPTIONS = RmanOptions
CONFIGSRC = $(TOP)/config
IMAKESRC = $(CONFIGSRC)/imake
DEPENDSRC = $(CONFIGSRC)/util
INCROOT = /usr/X11R6/include
USRLIBDIR = /usr/X11R6/lib
- VARLIBDIR = /var/lib
+ VARDIR = /var
+ VARLIBDIR = $(VARDIR)/lib
+ SYSTEMUSRLIBDIR = /usr/lib
+ SYSTEMUSRINCDIR = /usr/include
SHLIBDIR = /usr/X11R6/lib
LINTLIBDIR = $(USRLIBDIR)/lint
MANPATH = /usr/X11R6/man
@@ -119,31 +135,45 @@
MANDIR = $(MANSOURCEPATH)1
LIBMANDIR = $(MANSOURCEPATH)3
FILEMANDIR = $(MANSOURCEPATH)5
+ MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX)
+ DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
+ LOGDIRECTORY = $(VARDIR)/log
+
+ VARRUNDIR = $(VARDIR)/run
+
+ VARDBDIR = $(VARDIR)/lib
AR = ar clq
BOOTSTRAPCFLAGS =
CC = gcc
AS = as
-.SUFFIXES: .cxx
+.SUFFIXES: .cc
CXX = c++
- CXXDEBUGFLAGS = -O2 -fno-strength-reduce -m486
+ CXXFILT = c++filt
+ CXXLIB =
+ CXXDEBUGFLAGS = -O2 -fno-strength-reduce
+CXXDEPENDINCLUDES =
CXXEXTRA_DEFINES =
CXXEXTRA_INCLUDES =
- CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
+ CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES)
CXXOPTIONS =
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
- CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES)
+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
COMPRESS = compress
+ GZIPCMD = gzip
CPP = /lib/cpp $(STD_CPP_DEFINES)
+ RAWCPP = /lib/cpp -undef $(STD_CPP_OPTIONS)
PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
INSTALL = install
INSTALLFLAGS = -c
LD = ld
LEX = flex -l
+ M4 = m4
+ M4FLAGS =
LEXLIB = -lfl
YACC = bison -y
CCYACC = bison -y
@@ -159,10 +189,16 @@
RANLIBINSTFLAGS =
RM = rm -f
+ PERL = perl
+ PERLOPTS =
MANSUFFIX = 1x
LIBMANSUFFIX = 3x
FILEMANSUFFIX = 5x
- TROFF = psroff
+ MISCMANSUFFIX = 7
+ DRIVERMANSUFFIX = 4
+ MANDEFS = -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT)
+
+ TROFF = groff -Tps
NROFF = nroff
MSMACROS = -ms
MANMACROS = -man
@@ -170,18 +206,29 @@
EQN = eqn
NEQN = neqn
COL = col
-
- DVIPS = dvips
- LATEX = latex
+ COLFLAGS = -b
+ MODCC = gcc
+ MODCPP = /lib/cpp
+ MODCFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREAD_CFLAGS) $(ALLDEFINES)
+ MODAS = as
+ MODASFLAGS =
+ MODLD = ld
+ MODLDFLAGS =
+MODLDCOMBINEFLAGS = -r
+ MODAR = ar clq
+ MODRANLIB =
STD_INCLUDES =
- STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
- STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
- EXTRA_LOAD_FLAGS = -Wl,-rpath,$(SHLIBDIR)
+ STD_CPP_OPTIONS = -traditional
+ STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES)
+ STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES)
+ EXTRA_LOAD_FLAGS =
EXTRA_LDOPTIONS =
EXTRA_LIBRARIES =
TAGS = ctags
+ PARALLELMFLAGS =
+
SHAREDCODEDEF =
SHLIBDEF =
@@ -193,7 +240,7 @@
PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
- INSTPGMFLAGS = -s
+ INSTPGMFLAGS =
INSTBINFLAGS = -m 0755
INSTUIDFLAGS = -m 4711
@@ -205,21 +252,19 @@
PROJECTROOT = /usr/X11R6
- TOP_INCLUDES = -I$(INCROOT)
-
- CDEBUGFLAGS = -O2 -fno-strength-reduce -m486
+ CDEBUGFLAGS = -O2 -fno-strength-reduce
CCOPTIONS =
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
LDPRELIB = -L$(USRLIBDIR)
LDPOSTLIB =
- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
- LDLIBS = $(LDPOSTLIB) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
CCLINK = $(CC)
@@ -230,14 +275,14 @@
DEPENDFLAGS =
# Not sure this belongs here
- TKLIBDIR = /usr/local/lib
- TKINCDIR = /usr/local/include
- TKLIBNAME = tk4.2
- TKLIBRARY = -ltk4.2
- TCLLIBDIR = /usr/local/lib
- TCLINCDIR = /usr/local/include
- TCLLIBNAME = tcl7.6
- TCLLIBRARY = -ltcl7.6
+ TKLIBDIR = /usr/lib
+ TKINCDIR = /usr/include
+ TKLIBNAME = tk8.3
+ TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
+ TCLLIBDIR = /usr/lib
+ TCLINCDIR = /usr/include
+ TCLLIBNAME = tcl8.3
+ TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
MACROFILE = linux.cf
RM_CMD = $(RM)
@@ -247,27 +292,59 @@
IRULESRC = $(CONFIGDIR)
IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
- ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
+
+# $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $
+
+# $XFree86: xc/config/cf/X11.rules,v 1.4 1997/09/09 11:56:20 hohndel Exp $
# ----------------------------------------------------------------------
# X Window System Build Parameters and Rules
-# $XConsortium: Project.tmpl /main/r61_main/6 1996/01/15 12:26:59 gildea $
-# $XFree86: xc/config/cf/Project.tmpl,v 3.34 1996/10/03 08:28:05 dawes Exp $
+# $TOG: X11.tmpl /main/308 1998/06/16 15:14:24 msr $
+#
+#
+#
+#
+# $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $
+
+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/X11R6/bin
- BUILDINCROOT = $(TOP)
- BUILDINCDIR = $(BUILDINCROOT)/X11
- BUILDINCTOP = ..
- BUILDLIBDIR = $(TOP)/usrlib
- BUILDLIBTOP = ..
- INCDIR = $(INCROOT)/X11
+ BUILDINCROOT = $(TOP)/exports
+ BUILDINCDIR = $(BUILDINCROOT)/include
+ BUILDINCTOP = ../..
+ BUILDLIBDIR = $(TOP)/exports/lib
+ BUILDLIBTOP = ../..
+ BUILDBINDIR = $(TOP)/exports/bin
+ BUILDBINTOP = ../..
+ BUILDMODULEDIR = $(BUILDLIBDIR)/modules
+ BUILDMODULETOP = $(BUILDLIBTOP)/..
+ XBUILDINCROOT = $(XTOP)/exports
+ XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
+ XBUILDINCTOP = ../../..
+ XBUILDBINDIR = $(XBUILDINCROOT)/bin
+ INCDIR = $(INCROOT)
ADMDIR = /usr/adm
LIBDIR = $(USRLIBDIR)/X11
+ LIBEXECDIR = /usr/X11R6/libexec
+ MODULEDIR = $(USRLIBDIR)/modules
+ TOP_X_INCLUDES =
+ ETCX11DIR = /etc/X11
+
+ CONFDIR = $(ETCX11DIR)
+
+ DOCDIR = $(LIBDIR)/doc
+ DOCHTMLDIR = $(DOCDIR)/html
+ DOCPSDIR = $(DOCDIR)/PostScript
FONTDIR = $(LIBDIR)/fonts
+ ENCODINGSDIR = $(FONTDIR)/encodings
XINITDIR = $(LIBDIR)/xinit
XDMDIR = $(LIBDIR)/xdm
XDMVARDIR = $(VARLIBDIR)/xdm
@@ -276,43 +353,63 @@
NLSDIR = $(LIBDIR)/nls
XLOCALEDIR = $(LIBDIR)/locale
PEXAPIDIR = $(LIBDIR)/PEX
- XAPPLOADDIR = $(LIBDIR)/app-defaults
+ LBXPROXYDIR = $(LIBDIR)/lbxproxy
+ PROXYMANAGERDIR = $(LIBDIR)/proxymngr
+ XPRINTDIR = $(LIBDIR)/xserver
+ XAPPLOADDIR = /etc/X11/app-defaults
FONTCFLAGS = -t
INSTAPPFLAGS = $(INSTDATFLAGS)
- RGB = rgb
- FONTC = bdftopcf
- MKFONTDIR = mkfontdir
+ RGB = $(BINDIR)/rgb
+ FONTC = $(BINDIR)/bdftopcf
+ MKFONTDIR = $(BINDIR)/mkfontdir
+ MKHTMLINDEX = $(BINDIR)/mkhtmlindex
+ UCS2ANY = $(BINDIR)/ucs2any.pl
+ BDFTRUNCATE = $(BINDIR)/bdftruncate.pl
+ UCSMAPPREFIX = $(FONTDIR)/util/map-
+
+ HTMLINDEXCMD = HtmlIndexCmd
- DOCUTILSRC = $(TOP)/doc/util
+ DOCUTILSRC = $(XTOP)/doc/util
CLIENTSRC = $(TOP)/clients
DEMOSRC = $(TOP)/demos
XDOCMACROS = $(DOCUTILSRC)/macros.t
XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
PROGRAMSRC = $(TOP)/programs
- LIBSRC = $(TOP)/lib
- FONTSRC = $(TOP)/fonts
- INCLUDESRC = $(TOP)/X11
- SERVERSRC = $(TOP)/programs/Xserver
- CONTRIBSRC = $(TOP)/../contrib
- UNSUPPORTEDSRC = $(TOP)/unsupported
- DOCSRC = $(TOP)/doc
- RGBSRC = $(TOP)/programs/rgb
+ 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 = $(TOP)/include/fonts
- EXTINCSRC = $(TOP)/include/extensions
+ FONTINCSRC = $(XTOP)/include/fonts
+ EXTINCSRC = $(XTOP)/include/extensions
+ FTSOURCEDIR = $(TOP)/extras/FreeType
+ XTTSOURCEDIR = $(TOP)/extras/X-TrueType
+ 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)
-# $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $
-# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.9 1996/02/24 04:32:52 dawes Exp $
+ XENVLIBDIR = $(USRLIBDIR)
+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
+
+# $TOG: lnxLib.tmpl /main/7 1998/03/20 14:26:41 mgreess $
+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.11 1999/06/06 12:13:23 dawes Exp $
XLIBSRC = $(LIBSRC)/X11
-SOXLIBREV = 6.1
+SOXLIBREV = 6.2
DEPXONLYLIB =
XONLYLIB = -lX11
@@ -322,11 +419,16 @@
XEXTLIBSRC = $(LIBSRC)/Xext
-SOXEXTREV = 6.1
-DEPXEXTLIB =
-XEXTLIB = -lXext
+SOXEXTREV = 6.4
+DEPEXTENSIONLIB =
+EXTENSIONLIB = -lXext
-LINTXEXT = $(LINTLIBDIR)/llib-lXext.ln
+LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln
+
+LINTEXTENSIONLIB = $(LINTEXTENSION)
+ DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
+ XLIB = $(EXTENSIONLIB) $(XONLYLIB)
+ LINTXLIB = $(LINTXONLYLIB)
XSSLIBSRC = $(LIBSRC)/Xss
@@ -356,14 +458,94 @@
LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln
- EXTENSIONLIB = $(XEXTLIB)
- DEPEXTENSIONLIB = $(DEPXEXTLIB)
- LINTEXTENSION = $(LINTXEXT)
+ XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
- LINTEXTENSIONLIB = $(LINTEXTENSION)
- DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
- XLIB = $(EXTENSIONLIB) $(XONLYLIB)
- LINTXLIB = $(LINTXONLYLIB)
+DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a
+XXF86RUSHLIB = -lXxf86rush
+
+LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln
+
+ XVLIBSRC = $(LIBSRC)/Xv
+
+DEPXVLIB = $(USRLIBDIR)/libXv.a
+XVLIB = -lXv
+
+LINTXV = $(LINTLIBDIR)/llib-lXv.ln
+
+ XINERAMALIBSRC = $(LIBSRC)/Xinerama
+
+DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a
+XINERAMALIB = -lXinerama
+
+LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln
+
+ XINERAMALIBSRC = $(LIBSRC)/Xinerama
+
+DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a
+XINERAMALIB = -lXinerama
+
+LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln
+
+ DPSLIBSRC = $(LIBSRC)/dps
+
+SODPSREV = 1.0
+DEPDPSLIB =
+DPSLIB = -ldps
+
+LINTDPS = $(LINTLIBDIR)/llib-ldps.ln
+
+ DPSTKLIBSRC = $(LIBSRC)/dpstk
+
+SODPSTKREV = 1.0
+DEPDPSTKLIB =
+DPSTKLIB = -ldpstk
+
+LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln
+
+ PSRESLIBSRC = $(LIBSRC)/psres
+
+SOPSRESREV = 1.0
+DEPPSRESLIB =
+PSRESLIB = -lpsres
+
+LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln
+
+ GLULIBSRC = $(LIBSRC)/GL/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
+
+ XRENDERLIBSRC = $(LIBSRC)/Xrender
+
+DEPXRENDERLIB = $(USRLIBDIR)/libXrender.a
+XRENDERLIB = -lXrender
+
+LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln
+
+ XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
+
+DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a
+XFONTCACHELIB = -lXfontcache
+
+LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln
XAUTHSRC = $(LIBSRC)/Xau
@@ -381,7 +563,7 @@
XMUSRC = $(LIBSRC)/Xmu
-SOXMUREV = 6.0
+SOXMUREV = 6.2
DEPXMULIB =
XMULIB = -lXmu
@@ -394,6 +576,14 @@
LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln
+ XPLIBSRC = $(LIBSRC)/Xp
+
+SOXPREV = 6.2
+DEPXPLIB =
+XPLIB = -lXp
+
+LINTXP = $(LINTLIBDIR)/llib-lXp.ln
+
TOOLKITSRC = $(LIBSRC)/Xt
SOXTREV = 6.0
@@ -406,14 +596,30 @@
XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
+ XALIBSRC = $(LIBSRC)/Xa
+
+SOXAREV = 1.0
+DEPXALIB =
+XALIB = -lXa
+
+LINTXA = $(LINTLIBDIR)/llib-lXa.ln
+
AWIDGETSRC = $(LIBSRC)/Xaw
-SOXAWREV = 6.1
+SOXAWREV = 7.0
DEPXAWLIB =
XAWLIB = -lXaw
LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
+ AWIDGET6SRC = $(LIBSRC)/Xaw6
+
+SOXAW6REV = 6.1
+DEPXAW6LIB =
+XAW6LIB = -lXaw
+
+LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln
+
XILIBSRC = $(LIBSRC)/Xi
SOXINPUTREV = 6.0
@@ -460,7 +666,7 @@
ICESRC = $(LIBSRC)/ICE
-SOICEREV = 6.0
+SOICEREV = 6.3
DEPICELIB =
ICELIB = -lICE
@@ -474,6 +680,14 @@
LINTSM = $(LINTLIBDIR)/llib-lSM.ln
+ XKEYSRC = $(LIBSRC)/Xkey
+
+SOXKEYREV = 6.0
+DEPXKEYLIB =
+XKEYLIB = -lXkey
+
+LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln
+
FSLIBSRC = $(LIBSRC)/FS
DEPFSLIB = $(USRLIBDIR)/libFS.a
@@ -483,18 +697,47 @@
FONTLIBSRC = $(LIBSRC)/font
-DEPFONTLIB = $(USRLIBDIR)/libfont.a
-FONTLIB = -lfont
+DEPFONTLIB = $(USRLIBDIR)/libXfont.a
+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont
+
+LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln
+#
+DEPXFONTLIB = $(USRLIBDIR)/libXfont.a
+XFONTLIB = -lXfont
-LINTFONT = $(LINTLIBDIR)/llib-lfont.ln
+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)
XPMLIBSRC = $(LIBSRC)/Xpm
-DEPXPMLIB = $(USRLIBDIR)/libXpm.a
+SOXPMREV = 4.11
+DEPXPMLIB =
XPMLIB = -lXpm
LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln
+ XFTLIBSRC = $(LIBSRC)/Xft
+
+DEPXFTLIB = $(USRLIBDIR)/libXft.a
+XFTLIB = -lXft
+
+LINTXFT = $(LINTLIBDIR)/llib-lXft.ln
+
+FREETYPE2DIR = /usr
+FREETYPE2LIBDIR = /usr/lib
+FREETYPE2INCDIR = /usr/include/freetype2
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
+FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
+FREETYPE2DEFINES = -DFREETYPE2
+
XKBFILELIBSRC = $(LIBSRC)/xkbfile
DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a
@@ -502,7 +745,7 @@
LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln
- XKBCOMPCMD = xkbcomp
+ XKBCOMPCMD = $(BINDIR)/xkbcomp
XKBUILIBSRC = $(LIBSRC)/xkbui
@@ -516,16 +759,31 @@
DEPLIBS1 = $(DEPLIBS)
DEPLIBS2 = $(DEPLIBS)
DEPLIBS3 = $(DEPLIBS)
+ DEPLIBS4 = $(DEPLIBS)
+ DEPLIBS5 = $(DEPLIBS)
+ DEPLIBS6 = $(DEPLIBS)
+ DEPLIBS7 = $(DEPLIBS)
+ DEPLIBS8 = $(DEPLIBS)
+ DEPLIBS9 = $(DEPLIBS)
+ DEPLIBS10 = $(DEPLIBS)
XMULIBONLY = -lXmu
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
CONFIGDIR = $(LIBDIR)/config
+ USRLIBDIRPATH = $(USRLIBDIR)
+ LDPRELIBS = -L$(USRLIBDIR)
+ LDPOSTLIBS =
+ TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES)
+ PROJECT_DEFINES =
+
+CXXPROJECT_DEFINES =
+
# ----------------------------------------------------------------------
# start of Imakefile
-XPMLIB = -L/usr/lib/X11 -lXpm -lm
+XPMLIB = -L/usr/X11R6/lib -lXpm -lm
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
@@ -569,7 +827,13 @@
.c.i:
$(RM) $@
- $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+
+.SUFFIXES: .s
+
+.c.s:
+ $(RM) $@
+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
emptyrule::
@@ -588,6 +852,8 @@
man_keywords::
+html_index::
+
# ----------------------------------------------------------------------
# empty rules for directories that do not have SUBDIRS - do not edit
@@ -597,8 +863,8 @@
install.man::
@echo "install.man in $(CURRENT_DIR) done"
-install.linkkit::
- @echo "install.linkkit in $(CURRENT_DIR) done"
+install.sdk::
+ @echo "install.sdk in $(CURRENT_DIR) done"
Makefiles::
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)