diff -u xcal-4.1/pscal/pscal.man xcal-4.1/pscal/pscal.man --- xcal-4.1/pscal/pscal.man +++ xcal-4.1/pscal/pscal.man @@ -1,6 +1,6 @@ .TH PSCAL 1 "8/January/1990" .SH NAME -pscal +pscal - generates postscript showing your calendar for given year and month .SH SYNOPSIS: .B pscal [ @@ -75,17 +75,6 @@ Sets the font family for the title text (the month and year). .IP "\-f \fIfont\fR" 1i Sets the font family for the day-of-month numbers. -.IP "\-\-no-mini" 1i -Don´t insert previous and next month mini calendars. -.IP "\-\-big-num" 1i -Print big numbers centered in the boxes (as in the mini calendars). -.IP "\-\-german-week-days" 1i -Start the week with Monday. -.IP "\-\-lang \fiLANG\fR" 1i -Print Month and Day names in LANG. Currently de_DE will give german -text, everything else defaults to english. The default enviroment -variable LANG will be used normaly but gets overwritten by this -option. .PP Other arguments starting with `\-' are passed through to .IR lpr (1). diff -u xcal-4.1/pscal/pscal.script xcal-4.1/pscal/pscal.script --- xcal-4.1/pscal/pscal.script +++ xcal-4.1/pscal/pscal.script @@ -69,7 +69,7 @@ # Doesn't deal well with September 1752 or before. # -USAGE="Usage: pscal [ -Rrt ] [ -F hfont ] [ -f font ] [-d directory] [ --no-mini ] [ --big-num ] [ --german-week-days ] [ --lang LANG ] [ month [ year ] ]" +USAGE="Usage: pscal [ -Rrt ] [ -F hfont ] [ -f font ] [-d directory] [ month [ year ] ]" TFONT=Times-Bold DFONT=Helvetica-Bold @@ -84,10 +84,6 @@ LPR="lpr" -NO_MINI=0 -BIG_NUM=0 -GERMAN_WEEK_DAYS=0 - while test $# != 0 do case $1 in @@ -105,10 +101,6 @@ -R) ROTATE=0; SCALE="0.75 0.75"; TRANSLATE="50 900"; shift;; -d) test $# -lt 2 && { echo "$USAGE" 1>&2; exit 1; } Calendar="$2"; shift; shift;; - --no-mini) NO_MINI=1; shift;; - --big-num) BIG_NUM=1; shift;; - --german-week-days) GERMAN_WEEK_DAYS=1; shift;; - --lang) LANG="$2"; shift; shift;; --|-) break;; -*) eval ENVAR=\"$ENVAR $1\"; shift;; *) break @@ -169,6 +161,7 @@ xc\*$MONTHNAME$YEAR) ;; *) + PSCAL_TEMPFILE=$(mktemp -t pscal.XXXXXXXXXX) for file in $list do day=`expr $file : 'xc\([0-9]*\)'` @@ -179,9 +172,9 @@ s/^/$day ( / s/\$/ )/ p" - done > /tmp/pscal$$ - holidays=`cat /tmp/pscal$$` - rm -f /tmp/pscal$$ + done > ${PSCAL_TEMPFILE} + holidays=`cat ${PSCAL_TEMPFILE}` + rm -f ${PSCAL_TEMPFILE} esac fi @@ -191,19 +184,6 @@ for(i = 4; i <= NF; i++) printf(":%s", $i);printf(")\n"); }'` esac -case "$LANG" in - de_DE) - MONTH_NAMES="[ (Januar) (Februar) (März) (April) (Mai) (Juni) (Juli) (August) (September) (October) (November) (December) ]" - WEEK_NAMES="[ (Sonntag) (Montag) (Dienstag) (Mittwoch) (Donnerstag) (Freitag) (Samstag) ]" - WEEK_NAMES_GERMAN="[ (Montag) (Dienstag) (Mittwoch) (Donnerstag) (Freitag) (Samstag) (Sonntag) ]" - ;; - *) - MONTH_NAMES="[ (January) (February) (March) (April) (May) (June) (July) (August) (September) (October) (November) (December) ]" - WEEK_NAMES="[ (Sunday) (Monday) (Tuesday) (Wednesday) (Thursday) (Friday) (Saturday) ]" - WEEK_NAMES_GERMAN="[ (Monday) (Tuesday) (Wednesday) (Thursday) (Friday) (Saturday) (Sunday) ]" - ;; -esac - $LPR $ENVAR < # $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 $ # # # # -# $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $ +# $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.81 2003/02/18 16:51:45 tsi Exp $ +# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 @@ -27,30 +29,31 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.182 2002/10/11 01:40:22 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.201.2.1 2003/03/13 04:10:40 tsi Exp $ +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -# operating system: Linux 2.6.12.3 i686 [ELF] (2.6.12) -# libc: (6.3.5) -# binutils: (216) +# operating system: Linux 2.6.18-xen x86_64 [ELF] (2.6.18) +# libc: (6.7.0) +# binutils: (218) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -# $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -# $XFree86: xc/config/cf/xfree86.cf,v 3.439.2.2 2003/04/23 19:55:19 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 $ -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) +RELEASE_VERSION = RELEASE-1 AFB_DEFS = -DUSE_AFB @@ -67,12 +70,21 @@ XFREE86DOCDIR = $(DOCDIR) XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) XFREE86HTMLDOCDIR = $(DOCHTMLDIR) XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -# $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ + + SELINUX_LDFLAGS = + + SELINUX_INCLUDES = -I/usr/include/selinux + + SELINUX_CFLAGS = -DHAVE_SELINUX + + SELINUX_LIBS = -lselinux # ---------------------------------------------------------------------- # site-specific configuration parameters that go after @@ -80,19 +92,24 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.114 2003/03/19 01:49:23 dawes 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 +X_BYTE_ORDER = X_LITTLE_ENDIAN + GLIDE2INCDIR = /usr/include/glide GLIDE3INCDIR = /usr/include/glide3 @@ -118,33 +135,34 @@ MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = - RMAN = RmanCmd + RMAN = /usr/bin/rman RMANBASENAME = rman - RMANOPTIONS = RmanOptions + RMANOPTIONS = CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util - INCROOT = /usr/X11R6/include - USRLIBDIR = /usr/X11R6/lib + INCROOT = /usr/include + USRLIBDIR = /usr/lib VARDIR = /var VARLIBDIR = $(VARDIR)/lib SYSTEMUSRLIBDIR = /usr/lib SYSTEMUSRINCDIR = /usr/include - SHLIBDIR = /usr/X11R6/lib + SHLIBDIR = /usr/lib LINTLIBDIR = $(USRLIBDIR)/lint - MANPATH = /usr/X11R6/man + MANPATH = /usr/share/man MANSOURCEPATH = $(MANPATH)/man MANDIR = $(MANSOURCEPATH)$(MANSECT) SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) - DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)4 FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) - MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT) + MISCMANDIR = $(MANSOURCEPATH)7 ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) - ICONDIR = /usr/X11R6/lib/X11/icons - XCURSORPATH = ~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons + ICONDIR = "/usr/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + DRIVERMANDIR = $(MANSOURCEPATH)4 LOGDIRECTORY = $(VARDIR)/log VARRUNDIR = $(VARDIR)/run @@ -165,12 +183,14 @@ CXX = c++ -m32 CXXFILT = c++filt - CXXLIB = + + CXXLIB = -lstdc++ + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES) + CXXSTD_DEFINES = -Dlinux -D__i386__ -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) @@ -179,8 +199,8 @@ COMPRESS = compress GZIPCMD = gzip - CPP = /usr/bin/cpp $(STD_CPP_DEFINES) - RAWCPP = /usr/bin/cpp -undef $(STD_CPP_OPTIONS) + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) INSTALL = install @@ -211,6 +231,7 @@ RM = rm -f PERL = perl PERLOPTS = + PERLENVSETUP = env LC_ALL=C MANSECT = 1 SYSCALLMANSECT = 2 @@ -226,22 +247,21 @@ MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) - DRIVERMANSUFFIX = $(DRIVERMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = 4x FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) - MISCMANSUFFIX = $(MISCMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = 7x ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + ADMINMANSUFFIX = 8 MANSRCSUFFIX = man MANNEWSUFFIX = _man - MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) + 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 - HTMLROFF = groff -Thtml - MSMACROS = -ms MANMACROS = -man TBL = tbl @@ -252,7 +272,7 @@ MODCC = gcc -m32 - MODCPP = /usr/bin/cpp + MODCPP = cpp MODCFLAGS = $(CFLAGS) MODAS = gcc -m32 -c -x assembler MODASFLAGS = @@ -270,8 +290,8 @@ STD_INCLUDES = 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) + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -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__i386__ -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 = @@ -284,6 +304,9 @@ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + PICFLAGS = -fPIC CXXPICFLAGS = -fPIC @@ -300,21 +323,21 @@ INSTDATFLAGS = -m 0444 INSTKMEMFLAGS = -m 4711 - PROJECTROOT = /usr/X11R6 + PROJECTROOT = /usr CDEBUGFLAGS = -g -O2 -fno-strict-aliasing CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) $(SELINUX_INCLUDES) + 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) $(SELINUX_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIB = $(INSTALLED_LIBS) LDPOSTLIB = - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(SELINUX_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SELINUX_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) CCLINK = $(CC) @@ -344,7 +367,7 @@ IRULESRC = $(CONFIGDIR) IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - 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) + 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ @@ -352,18 +375,16 @@ # ---------------------------------------------------------------------- # 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.196.2.3 2003/10/08 17:56:30 eich Exp $ +# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -XORGRELSTRING = Release 6.6 -XORGMANNAME = X Version 11 - -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT @@ -373,7 +394,7 @@ # X Window System make variables; these need to be coordinated with rules XTOP = $(TOP) - BINDIR = /usr/X11R6/bin + BINDIR = /usr/bin BUILDINCROOT = $(TOP)/exports BUILDINCDIR = $(BUILDINCROOT)/include BUILDINCTOP = ../.. @@ -382,6 +403,7 @@ BUILDBINDIR = $(TOP)/exports/bin BUILDBINTOP = ../.. BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDI18NDIR = $(BUILDLIBDIR)/locale BUILDMODULETOP = $(BUILDLIBTOP)/.. XBUILDINCROOT = $(XTOP)/exports XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 @@ -389,10 +411,14 @@ XBUILDBINDIR = $(XBUILDINCROOT)/bin INCDIR = $(INCROOT) ADMDIR = /usr/adm - LIBDIR = /usr/X11R6/lib/X11 - LIBEXECDIR = /usr/X11R6/libexec + 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 @@ -402,8 +428,8 @@ DOCHTMLDIR = $(DOCDIR)/html DOCPSDIR = $(DOCDIR)/PostScript DOCPDFDIR = $(DOCDIR)/PDF - FONTDIR = $(LIBDIR)/fonts - ENCODINGSDIR = $(FONTDIR)/encodings + FONTDIR = /usr/share/fonts/X11 + ENCODINGSDIR = /usr/share/fonts/X11/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm XDMVARDIR = $(VARLIBDIR)/xdm @@ -411,7 +437,6 @@ XSMDIR = $(LIBDIR)/xsm NLSDIR = $(LIBDIR)/nls XLOCALEDIR = $(LIBDIR)/locale - PEXAPIDIR = $(LIBDIR)/PEX LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver @@ -420,14 +445,15 @@ INSTAPPFLAGS = $(INSTDATFLAGS) - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTDIR = $(BINDIR)/mkfontdir - MKHTMLINDEX = $(BINDIR)/mkhtmlindex - UCS2ANY = $(BINDIR)/ucs2any - BDFTRUNCATE = $(BINDIR)/bdftruncate + 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 = $(BINDIR)/xcursorgen + XCURSORGEN = $(XBINDIR)/xcursorgen HTMLINDEXCMD = HtmlIndexCmd @@ -452,23 +478,40 @@ FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions - FTSOURCEDIR = $(TOP)/extras/FreeType - XTTSOURCEDIR = $(TOP)/extras/X-TrueType + 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) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 +XTRANS_FAILDEFINES = -DFAIL_HARD - XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' - VENDORMANDEFS = -D__vendorversion__="\"$(VENDORMANVERSION)\" $(VENDORMANNAME)" + 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) + 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.14 2001/08/01 00:44:32 tsi Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ XLIBSRC = $(LIBSRC)/X11 @@ -478,7 +521,9 @@ LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) XEXTLIBSRC = $(LIBSRC)/Xext @@ -495,35 +540,40 @@ XSSLIBSRC = $(LIBSRC)/Xss -DEPXSSLIB = $(USRLIBDIR)/libXss.a +SOXSSREV = 1.0 +DEPXSSLIB = XSSLIB = -lXss LINTXSS = $(LINTLIBDIR)/llib-lXss.ln XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = XXF86MISCLIB = -lXxf86misc LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = XXF86VMLIB = -lXxf86vm LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = XXF86DGALIB = -lXxf86dga LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = XXF86RUSHLIB = -lXxf86rush LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln @@ -538,45 +588,53 @@ XVMCLIBSRC = $(LIBSRC)/XvMC -DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a +SOXVMCREV = 1.0 +DEPXVMCLIB = XVMCLIB = -lXvMC LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln XINERAMALIBSRC = $(LIBSRC)/Xinerama -DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a +SOXINERAMAREV = 1.0 +DEPXINERAMALIB = XINERAMALIB = -lXinerama LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln XRESLIBSRC = $(LIBSRC)/XRes -DEPXRESLIB = $(USRLIBDIR)/libXRes.a +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 -SODPSREV = 1.0 -DEPDPSLIB = +DEPDPSLIB = $(USRLIBDIR)/libdps.a DPSLIB = -ldps LINTDPS = $(LINTLIBDIR)/llib-ldps.ln DPSTKLIBSRC = $(LIBSRC)/dpstk -SODPSTKREV = 1.0 -DEPDPSTKLIB = +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a DPSTKLIB = -ldpstk LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln PSRESLIBSRC = $(LIBSRC)/psres -SOPSRESREV = 1.0 -DEPPSRESLIB = +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a PSRESLIB = -lpsres LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln @@ -612,7 +670,7 @@ XRENDERINCLUDES = -I$(XRENDERINCDIR) - XRANDRRLIBSRC = $(LIBSRC)/Xrandr + XRANDRLIBSRC = $(LIBSRC)/Xrandr SOXRANDRREV = 2.0 DEPXRANDRLIB = @@ -620,6 +678,38 @@ 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 @@ -627,6 +717,20 @@ 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 @@ -636,14 +740,16 @@ XAUTHSRC = $(LIBSRC)/Xau -DEPXAUTHLIB = $(USRLIBDIR)/libXau.a +SOXAUTHREV = 6.0 +DEPXAUTHLIB = XAUTHLIB = -lXau LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln XDMCPLIBSRC = $(LIBSRC)/Xdmcp -DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a +SOXDMCPREV = 6.0 +DEPXDMCPLIB = XDMCPLIB = -lXdmcp LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln @@ -701,12 +807,20 @@ AWIDGETSRC = $(LIBSRC)/Xaw -SOXAWREV = 7.0 +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 @@ -731,29 +845,6 @@ LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln - PEXLIBSRC = $(LIBSRC)/PEX5 - -SOPEXREV = 6.0 -DEPPEXLIB = -PEXLIB = -lPEX5 - -LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln - - XIELIBSRC = $(LIBSRC)/XIE - -SOXIEREV = 6.0 -DEPXIELIB = -XIELIB = -lXIE - -LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln - - PHIGSLIBSRC = $(LIBSRC)/PHIGS - -DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a -PHIGSLIB = -lphigs - -LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln - DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a XBSDLIB = -lXbsd @@ -761,7 +852,7 @@ ICESRC = $(LIBSRC)/ICE -SOICEREV = 6.3 +SOICEREV = 6.4 DEPICELIB = ICELIB = -lICE @@ -785,7 +876,8 @@ FSLIBSRC = $(LIBSRC)/FS -DEPFSLIB = $(USRLIBDIR)/libFS.a +SOFSREV = 6.0 +DEPFSLIB = FSLIB = -lFS LINTFS = $(LINTLIBDIR)/llib-lFS.ln @@ -809,7 +901,7 @@ LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FONTFT2LIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) FONTENCLIBSRC = $(LIBSRC)/fontenc @@ -828,16 +920,17 @@ FREETYPE2DIR = /usr FREETYPE2LIBDIR = /usr/lib -FREETYPE2INCDIR = /usr/include/freetype2 +FREETYPE2INCDIR = /usr/include FREETYPE2LIB = -lfreetype -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + FREETYPE2DEFINES = -DFREETYPE2 EXPATLIBSRC = $(LIBSRC)/expat -SOEXPATREV = 1.0 +SOEXPATREV = 0.4 DEPEXPATLIB = EXPATLIB = -lexpat @@ -853,14 +946,6 @@ EXPATDEFINES = -DEXPAT - XFT1LIBSRC = $(LIBSRC)/Xft1 - -SOXFT1REV = 1.1 -DEPXFT1LIB = -XFT1LIB = -lXft - -LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln - XFTDIR = /usr XFTLIBDIR = /usr/lib XFTINCDIR = /usr/include @@ -870,12 +955,12 @@ FONTCONFIGDIR = /usr FONTCONFIGLIBDIR = /usr/lib -FONTCONFIGINCDIR = /usr/include/fontconfig +FONTCONFIGINCDIR = /usr/include FONTCONFIGBINDIR = /usr/bin FONTCONFIGLIB = -lfontconfig -FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) +FONTCONFIGINCLUDES = FCCACHE = $(FONTCONFIGBINDIR)/fc-cache @@ -893,20 +978,28 @@ XKBFILELIBSRC = $(LIBSRC)/xkbfile -DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = XKBFILELIB = -lxkbfile LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln - XKBCOMPCMD = $(BINDIR)/xkbcomp + XKBCOMPCMD = $(XBINDIR)/xkbcomp XKBUILIBSRC = $(LIBSRC)/xkbui -DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a +SOXKBUIREV = 1.0 +DEPXKBUILIB = XKBUILIB = -lxkbui LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + XTRAPLIBSRC = $(LIBSRC)/XTrap SOXTRAPREV = 6.4 @@ -928,16 +1021,21 @@ DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? + XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) - LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIBS = $(INSTALLED_LIBS) LDPOSTLIBS = - TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) + TOP_INCLUDES = $(TOP_X_INCLUDES) PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' CXXPROJECT_DEFINES = @@ -963,8 +1061,13 @@ pscal.$(MANNEWSUFFIX): pscal.$(MANSRCSUFFIX) $(RM) $@ - cd `dirname pscal` && \ - $(LN) `basename pscal.$(MANSRCSUFFIX)` `basename $@` + if test -z "$(PREPROCESSMANPAGES)" ; then \ + cd `dirname pscal` && \ + $(LN) `basename pscal.$(MANSRCSUFFIX)` `basename $@`; \ + else \ + $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ + < pscal.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[ ]*XCOMM$$/s/XCOMM/#/' -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[ ]*XHASH/s/XHASH/#/' -e '/\@\@$$/s/\@\@$$/\\/' >$@; \ + fi cleandir:: $(RM) pscal.$(MANNEWSUFFIX) @@ -993,16 +1096,26 @@ $(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:: cleandir:: - $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ @@ -1022,6 +1135,8 @@ distclean:: cleandir + PREPROCESSMANPAGES = true + # ---------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit diff -u xcal-4.1/xcal_cal/Makefile xcal-4.1/xcal_cal/Makefile --- xcal-4.1/xcal_cal/Makefile +++ xcal-4.1/xcal_cal/Makefile @@ -4,20 +4,22 @@ # ---------------------------------------------------------------------- # Makefile generated from "Imake.tmpl" and # $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 $ # # # # -# $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $ +# $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.81 2003/02/18 16:51:45 tsi Exp $ +# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 @@ -27,30 +29,31 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.182 2002/10/11 01:40:22 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.201.2.1 2003/03/13 04:10:40 tsi Exp $ +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -# operating system: Linux 2.6.12.3 i686 [ELF] (2.6.12) -# libc: (6.3.5) -# binutils: (216) +# operating system: Linux 2.6.18-xen x86_64 [ELF] (2.6.18) +# libc: (6.7.0) +# binutils: (218) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -# $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -# $XFree86: xc/config/cf/xfree86.cf,v 3.439.2.2 2003/04/23 19:55:19 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 $ -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) +RELEASE_VERSION = RELEASE-1 AFB_DEFS = -DUSE_AFB @@ -67,12 +70,21 @@ XFREE86DOCDIR = $(DOCDIR) XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) XFREE86HTMLDOCDIR = $(DOCHTMLDIR) XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -# $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ + + SELINUX_LDFLAGS = + + SELINUX_INCLUDES = -I/usr/include/selinux + + SELINUX_CFLAGS = -DHAVE_SELINUX + + SELINUX_LIBS = -lselinux # ---------------------------------------------------------------------- # site-specific configuration parameters that go after @@ -80,19 +92,24 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.114 2003/03/19 01:49:23 dawes 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 +X_BYTE_ORDER = X_LITTLE_ENDIAN + GLIDE2INCDIR = /usr/include/glide GLIDE3INCDIR = /usr/include/glide3 @@ -118,33 +135,34 @@ MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = - RMAN = RmanCmd + RMAN = /usr/bin/rman RMANBASENAME = rman - RMANOPTIONS = RmanOptions + RMANOPTIONS = CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util - INCROOT = /usr/X11R6/include - USRLIBDIR = /usr/X11R6/lib + INCROOT = /usr/include + USRLIBDIR = /usr/lib VARDIR = /var VARLIBDIR = $(VARDIR)/lib SYSTEMUSRLIBDIR = /usr/lib SYSTEMUSRINCDIR = /usr/include - SHLIBDIR = /usr/X11R6/lib + SHLIBDIR = /usr/lib LINTLIBDIR = $(USRLIBDIR)/lint - MANPATH = /usr/X11R6/man + MANPATH = /usr/share/man MANSOURCEPATH = $(MANPATH)/man MANDIR = $(MANSOURCEPATH)$(MANSECT) SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) - DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)4 FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) - MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT) + MISCMANDIR = $(MANSOURCEPATH)7 ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) - ICONDIR = /usr/X11R6/lib/X11/icons - XCURSORPATH = ~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons + ICONDIR = "/usr/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + DRIVERMANDIR = $(MANSOURCEPATH)4 LOGDIRECTORY = $(VARDIR)/log VARRUNDIR = $(VARDIR)/run @@ -165,12 +183,14 @@ CXX = c++ -m32 CXXFILT = c++filt - CXXLIB = + + CXXLIB = -lstdc++ + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES) + CXXSTD_DEFINES = -Dlinux -D__i386__ -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) @@ -179,8 +199,8 @@ COMPRESS = compress GZIPCMD = gzip - CPP = /usr/bin/cpp $(STD_CPP_DEFINES) - RAWCPP = /usr/bin/cpp -undef $(STD_CPP_OPTIONS) + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) INSTALL = install @@ -211,6 +231,7 @@ RM = rm -f PERL = perl PERLOPTS = + PERLENVSETUP = env LC_ALL=C MANSECT = 1 SYSCALLMANSECT = 2 @@ -226,22 +247,21 @@ MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) - DRIVERMANSUFFIX = $(DRIVERMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = 4x FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) - MISCMANSUFFIX = $(MISCMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = 7x ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + ADMINMANSUFFIX = 8 MANSRCSUFFIX = man MANNEWSUFFIX = _man - MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) + 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 - HTMLROFF = groff -Thtml - MSMACROS = -ms MANMACROS = -man TBL = tbl @@ -252,7 +272,7 @@ MODCC = gcc -m32 - MODCPP = /usr/bin/cpp + MODCPP = cpp MODCFLAGS = $(CFLAGS) MODAS = gcc -m32 -c -x assembler MODASFLAGS = @@ -270,8 +290,8 @@ STD_INCLUDES = 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) + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -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__i386__ -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 = @@ -284,6 +304,9 @@ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + PICFLAGS = -fPIC CXXPICFLAGS = -fPIC @@ -300,21 +323,21 @@ INSTDATFLAGS = -m 0444 INSTKMEMFLAGS = -m 4711 - PROJECTROOT = /usr/X11R6 + PROJECTROOT = /usr CDEBUGFLAGS = -g -O2 -fno-strict-aliasing CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) $(SELINUX_INCLUDES) + 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) $(SELINUX_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIB = $(INSTALLED_LIBS) LDPOSTLIB = - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(SELINUX_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SELINUX_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) CCLINK = $(CC) @@ -344,7 +367,7 @@ IRULESRC = $(CONFIGDIR) IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - 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) + 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ @@ -352,18 +375,16 @@ # ---------------------------------------------------------------------- # 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.196.2.3 2003/10/08 17:56:30 eich Exp $ +# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -XORGRELSTRING = Release 6.6 -XORGMANNAME = X Version 11 - -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT @@ -373,7 +394,7 @@ # X Window System make variables; these need to be coordinated with rules XTOP = $(TOP) - BINDIR = /usr/X11R6/bin + BINDIR = /usr/bin BUILDINCROOT = $(TOP)/exports BUILDINCDIR = $(BUILDINCROOT)/include BUILDINCTOP = ../.. @@ -382,6 +403,7 @@ BUILDBINDIR = $(TOP)/exports/bin BUILDBINTOP = ../.. BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDI18NDIR = $(BUILDLIBDIR)/locale BUILDMODULETOP = $(BUILDLIBTOP)/.. XBUILDINCROOT = $(XTOP)/exports XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 @@ -389,10 +411,14 @@ XBUILDBINDIR = $(XBUILDINCROOT)/bin INCDIR = $(INCROOT) ADMDIR = /usr/adm - LIBDIR = /usr/X11R6/lib/X11 - LIBEXECDIR = /usr/X11R6/libexec + 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 @@ -402,8 +428,8 @@ DOCHTMLDIR = $(DOCDIR)/html DOCPSDIR = $(DOCDIR)/PostScript DOCPDFDIR = $(DOCDIR)/PDF - FONTDIR = $(LIBDIR)/fonts - ENCODINGSDIR = $(FONTDIR)/encodings + FONTDIR = /usr/share/fonts/X11 + ENCODINGSDIR = /usr/share/fonts/X11/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm XDMVARDIR = $(VARLIBDIR)/xdm @@ -411,7 +437,6 @@ XSMDIR = $(LIBDIR)/xsm NLSDIR = $(LIBDIR)/nls XLOCALEDIR = $(LIBDIR)/locale - PEXAPIDIR = $(LIBDIR)/PEX LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver @@ -420,14 +445,15 @@ INSTAPPFLAGS = $(INSTDATFLAGS) - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTDIR = $(BINDIR)/mkfontdir - MKHTMLINDEX = $(BINDIR)/mkhtmlindex - UCS2ANY = $(BINDIR)/ucs2any - BDFTRUNCATE = $(BINDIR)/bdftruncate + 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 = $(BINDIR)/xcursorgen + XCURSORGEN = $(XBINDIR)/xcursorgen HTMLINDEXCMD = HtmlIndexCmd @@ -452,23 +478,40 @@ FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions - FTSOURCEDIR = $(TOP)/extras/FreeType - XTTSOURCEDIR = $(TOP)/extras/X-TrueType + 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) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 +XTRANS_FAILDEFINES = -DFAIL_HARD - XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' - VENDORMANDEFS = -D__vendorversion__="\"$(VENDORMANVERSION)\" $(VENDORMANNAME)" + 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) + 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.14 2001/08/01 00:44:32 tsi Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ XLIBSRC = $(LIBSRC)/X11 @@ -478,7 +521,9 @@ LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) XEXTLIBSRC = $(LIBSRC)/Xext @@ -495,35 +540,40 @@ XSSLIBSRC = $(LIBSRC)/Xss -DEPXSSLIB = $(USRLIBDIR)/libXss.a +SOXSSREV = 1.0 +DEPXSSLIB = XSSLIB = -lXss LINTXSS = $(LINTLIBDIR)/llib-lXss.ln XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = XXF86MISCLIB = -lXxf86misc LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = XXF86VMLIB = -lXxf86vm LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = XXF86DGALIB = -lXxf86dga LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = XXF86RUSHLIB = -lXxf86rush LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln @@ -538,45 +588,53 @@ XVMCLIBSRC = $(LIBSRC)/XvMC -DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a +SOXVMCREV = 1.0 +DEPXVMCLIB = XVMCLIB = -lXvMC LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln XINERAMALIBSRC = $(LIBSRC)/Xinerama -DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a +SOXINERAMAREV = 1.0 +DEPXINERAMALIB = XINERAMALIB = -lXinerama LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln XRESLIBSRC = $(LIBSRC)/XRes -DEPXRESLIB = $(USRLIBDIR)/libXRes.a +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 -SODPSREV = 1.0 -DEPDPSLIB = +DEPDPSLIB = $(USRLIBDIR)/libdps.a DPSLIB = -ldps LINTDPS = $(LINTLIBDIR)/llib-ldps.ln DPSTKLIBSRC = $(LIBSRC)/dpstk -SODPSTKREV = 1.0 -DEPDPSTKLIB = +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a DPSTKLIB = -ldpstk LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln PSRESLIBSRC = $(LIBSRC)/psres -SOPSRESREV = 1.0 -DEPPSRESLIB = +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a PSRESLIB = -lpsres LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln @@ -612,7 +670,7 @@ XRENDERINCLUDES = -I$(XRENDERINCDIR) - XRANDRRLIBSRC = $(LIBSRC)/Xrandr + XRANDRLIBSRC = $(LIBSRC)/Xrandr SOXRANDRREV = 2.0 DEPXRANDRLIB = @@ -620,6 +678,38 @@ 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 @@ -627,6 +717,20 @@ 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 @@ -636,14 +740,16 @@ XAUTHSRC = $(LIBSRC)/Xau -DEPXAUTHLIB = $(USRLIBDIR)/libXau.a +SOXAUTHREV = 6.0 +DEPXAUTHLIB = XAUTHLIB = -lXau LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln XDMCPLIBSRC = $(LIBSRC)/Xdmcp -DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a +SOXDMCPREV = 6.0 +DEPXDMCPLIB = XDMCPLIB = -lXdmcp LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln @@ -701,12 +807,20 @@ AWIDGETSRC = $(LIBSRC)/Xaw -SOXAWREV = 7.0 +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 @@ -731,29 +845,6 @@ LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln - PEXLIBSRC = $(LIBSRC)/PEX5 - -SOPEXREV = 6.0 -DEPPEXLIB = -PEXLIB = -lPEX5 - -LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln - - XIELIBSRC = $(LIBSRC)/XIE - -SOXIEREV = 6.0 -DEPXIELIB = -XIELIB = -lXIE - -LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln - - PHIGSLIBSRC = $(LIBSRC)/PHIGS - -DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a -PHIGSLIB = -lphigs - -LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln - DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a XBSDLIB = -lXbsd @@ -761,7 +852,7 @@ ICESRC = $(LIBSRC)/ICE -SOICEREV = 6.3 +SOICEREV = 6.4 DEPICELIB = ICELIB = -lICE @@ -785,7 +876,8 @@ FSLIBSRC = $(LIBSRC)/FS -DEPFSLIB = $(USRLIBDIR)/libFS.a +SOFSREV = 6.0 +DEPFSLIB = FSLIB = -lFS LINTFS = $(LINTLIBDIR)/llib-lFS.ln @@ -809,7 +901,7 @@ LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FONTFT2LIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) FONTENCLIBSRC = $(LIBSRC)/fontenc @@ -828,16 +920,17 @@ FREETYPE2DIR = /usr FREETYPE2LIBDIR = /usr/lib -FREETYPE2INCDIR = /usr/include/freetype2 +FREETYPE2INCDIR = /usr/include FREETYPE2LIB = -lfreetype -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + FREETYPE2DEFINES = -DFREETYPE2 EXPATLIBSRC = $(LIBSRC)/expat -SOEXPATREV = 1.0 +SOEXPATREV = 0.4 DEPEXPATLIB = EXPATLIB = -lexpat @@ -853,14 +946,6 @@ EXPATDEFINES = -DEXPAT - XFT1LIBSRC = $(LIBSRC)/Xft1 - -SOXFT1REV = 1.1 -DEPXFT1LIB = -XFT1LIB = -lXft - -LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln - XFTDIR = /usr XFTLIBDIR = /usr/lib XFTINCDIR = /usr/include @@ -870,12 +955,12 @@ FONTCONFIGDIR = /usr FONTCONFIGLIBDIR = /usr/lib -FONTCONFIGINCDIR = /usr/include/fontconfig +FONTCONFIGINCDIR = /usr/include FONTCONFIGBINDIR = /usr/bin FONTCONFIGLIB = -lfontconfig -FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) +FONTCONFIGINCLUDES = FCCACHE = $(FONTCONFIGBINDIR)/fc-cache @@ -893,20 +978,28 @@ XKBFILELIBSRC = $(LIBSRC)/xkbfile -DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = XKBFILELIB = -lxkbfile LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln - XKBCOMPCMD = $(BINDIR)/xkbcomp + XKBCOMPCMD = $(XBINDIR)/xkbcomp XKBUILIBSRC = $(LIBSRC)/xkbui -DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a +SOXKBUIREV = 1.0 +DEPXKBUILIB = XKBUILIB = -lxkbui LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + XTRAPLIBSRC = $(LIBSRC)/XTrap SOXTRAPREV = 6.4 @@ -928,16 +1021,21 @@ DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? + XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) - LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIBS = $(INSTALLED_LIBS) LDPOSTLIBS = - TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) + TOP_INCLUDES = $(TOP_X_INCLUDES) PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' CXXPROJECT_DEFINES = @@ -976,8 +1074,13 @@ xcal_cal.$(MANNEWSUFFIX): xcal_cal.$(MANSRCSUFFIX) $(RM) $@ - cd `dirname xcal_cal` && \ - $(LN) `basename xcal_cal.$(MANSRCSUFFIX)` `basename $@` + if test -z "$(PREPROCESSMANPAGES)" ; then \ + cd `dirname xcal_cal` && \ + $(LN) `basename xcal_cal.$(MANSRCSUFFIX)` `basename $@`; \ + else \ + $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ + < xcal_cal.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[ ]*XCOMM$$/s/XCOMM/#/' -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[ ]*XHASH/s/XHASH/#/' -e '/\@\@$$/s/\@\@$$/\\/' >$@; \ + fi cleandir:: $(RM) xcal_cal.$(MANNEWSUFFIX) @@ -1014,16 +1117,26 @@ $(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:: cleandir:: - $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ @@ -1043,6 +1156,8 @@ distclean:: cleandir + PREPROCESSMANPAGES = true + # ---------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit @@ -1069,22 +1184,21 @@ # DO NOT DELETE xcal_cal.o: xcal_cal.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/sys/param.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/limits.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/syslimits.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include-fixed/limits.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include-fixed/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \ /usr/include/linux/param.h /usr/include/asm/param.h \ - /usr/include/linux/config.h /usr/include/linux/autoconf.h \ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ diff -u xcal-4.1/xcalev/Makefile xcal-4.1/xcalev/Makefile --- xcal-4.1/xcalev/Makefile +++ xcal-4.1/xcalev/Makefile @@ -4,20 +4,22 @@ # ---------------------------------------------------------------------- # Makefile generated from "Imake.tmpl" and # $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 $ # # # # -# $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $ +# $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.81 2003/02/18 16:51:45 tsi Exp $ +# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 @@ -27,30 +29,31 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.182 2002/10/11 01:40:22 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.201.2.1 2003/03/13 04:10:40 tsi Exp $ +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -# operating system: Linux 2.6.12.3 i686 [ELF] (2.6.12) -# libc: (6.3.5) -# binutils: (216) +# operating system: Linux 2.6.18-xen x86_64 [ELF] (2.6.18) +# libc: (6.7.0) +# binutils: (218) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -# $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -# $XFree86: xc/config/cf/xfree86.cf,v 3.439.2.2 2003/04/23 19:55:19 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 $ -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) +RELEASE_VERSION = RELEASE-1 AFB_DEFS = -DUSE_AFB @@ -67,12 +70,21 @@ XFREE86DOCDIR = $(DOCDIR) XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) XFREE86HTMLDOCDIR = $(DOCHTMLDIR) XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -# $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ + + SELINUX_LDFLAGS = + + SELINUX_INCLUDES = -I/usr/include/selinux + + SELINUX_CFLAGS = -DHAVE_SELINUX + + SELINUX_LIBS = -lselinux # ---------------------------------------------------------------------- # site-specific configuration parameters that go after @@ -80,19 +92,24 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.114 2003/03/19 01:49:23 dawes 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 +X_BYTE_ORDER = X_LITTLE_ENDIAN + GLIDE2INCDIR = /usr/include/glide GLIDE3INCDIR = /usr/include/glide3 @@ -118,33 +135,34 @@ MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = - RMAN = RmanCmd + RMAN = /usr/bin/rman RMANBASENAME = rman - RMANOPTIONS = RmanOptions + RMANOPTIONS = CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util - INCROOT = /usr/X11R6/include - USRLIBDIR = /usr/X11R6/lib + INCROOT = /usr/include + USRLIBDIR = /usr/lib VARDIR = /var VARLIBDIR = $(VARDIR)/lib SYSTEMUSRLIBDIR = /usr/lib SYSTEMUSRINCDIR = /usr/include - SHLIBDIR = /usr/X11R6/lib + SHLIBDIR = /usr/lib LINTLIBDIR = $(USRLIBDIR)/lint - MANPATH = /usr/X11R6/man + MANPATH = /usr/share/man MANSOURCEPATH = $(MANPATH)/man MANDIR = $(MANSOURCEPATH)$(MANSECT) SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) - DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)4 FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) - MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT) + MISCMANDIR = $(MANSOURCEPATH)7 ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) - ICONDIR = /usr/X11R6/lib/X11/icons - XCURSORPATH = ~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons + ICONDIR = "/usr/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + DRIVERMANDIR = $(MANSOURCEPATH)4 LOGDIRECTORY = $(VARDIR)/log VARRUNDIR = $(VARDIR)/run @@ -165,12 +183,14 @@ CXX = c++ -m32 CXXFILT = c++filt - CXXLIB = + + CXXLIB = -lstdc++ + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES) + CXXSTD_DEFINES = -Dlinux -D__i386__ -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) @@ -179,8 +199,8 @@ COMPRESS = compress GZIPCMD = gzip - CPP = /usr/bin/cpp $(STD_CPP_DEFINES) - RAWCPP = /usr/bin/cpp -undef $(STD_CPP_OPTIONS) + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) INSTALL = install @@ -211,6 +231,7 @@ RM = rm -f PERL = perl PERLOPTS = + PERLENVSETUP = env LC_ALL=C MANSECT = 1 SYSCALLMANSECT = 2 @@ -226,22 +247,21 @@ MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) - DRIVERMANSUFFIX = $(DRIVERMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = 4x FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) - MISCMANSUFFIX = $(MISCMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = 7x ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + ADMINMANSUFFIX = 8 MANSRCSUFFIX = man MANNEWSUFFIX = _man - MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) + 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 - HTMLROFF = groff -Thtml - MSMACROS = -ms MANMACROS = -man TBL = tbl @@ -252,7 +272,7 @@ MODCC = gcc -m32 - MODCPP = /usr/bin/cpp + MODCPP = cpp MODCFLAGS = $(CFLAGS) MODAS = gcc -m32 -c -x assembler MODASFLAGS = @@ -270,8 +290,8 @@ STD_INCLUDES = 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) + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -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__i386__ -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 = @@ -284,6 +304,9 @@ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + PICFLAGS = -fPIC CXXPICFLAGS = -fPIC @@ -300,21 +323,21 @@ INSTDATFLAGS = -m 0444 INSTKMEMFLAGS = -m 4711 - PROJECTROOT = /usr/X11R6 + PROJECTROOT = /usr CDEBUGFLAGS = -g -O2 -fno-strict-aliasing CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) $(SELINUX_INCLUDES) + 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) $(SELINUX_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIB = $(INSTALLED_LIBS) LDPOSTLIB = - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(SELINUX_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SELINUX_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) CCLINK = $(CC) @@ -344,7 +367,7 @@ IRULESRC = $(CONFIGDIR) IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - 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) + 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ @@ -352,18 +375,16 @@ # ---------------------------------------------------------------------- # 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.196.2.3 2003/10/08 17:56:30 eich Exp $ +# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -XORGRELSTRING = Release 6.6 -XORGMANNAME = X Version 11 - -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT @@ -373,7 +394,7 @@ # X Window System make variables; these need to be coordinated with rules XTOP = $(TOP) - BINDIR = /usr/X11R6/bin + BINDIR = /usr/bin BUILDINCROOT = $(TOP)/exports BUILDINCDIR = $(BUILDINCROOT)/include BUILDINCTOP = ../.. @@ -382,6 +403,7 @@ BUILDBINDIR = $(TOP)/exports/bin BUILDBINTOP = ../.. BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDI18NDIR = $(BUILDLIBDIR)/locale BUILDMODULETOP = $(BUILDLIBTOP)/.. XBUILDINCROOT = $(XTOP)/exports XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 @@ -389,10 +411,14 @@ XBUILDBINDIR = $(XBUILDINCROOT)/bin INCDIR = $(INCROOT) ADMDIR = /usr/adm - LIBDIR = /usr/X11R6/lib/X11 - LIBEXECDIR = /usr/X11R6/libexec + 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 @@ -402,8 +428,8 @@ DOCHTMLDIR = $(DOCDIR)/html DOCPSDIR = $(DOCDIR)/PostScript DOCPDFDIR = $(DOCDIR)/PDF - FONTDIR = $(LIBDIR)/fonts - ENCODINGSDIR = $(FONTDIR)/encodings + FONTDIR = /usr/share/fonts/X11 + ENCODINGSDIR = /usr/share/fonts/X11/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm XDMVARDIR = $(VARLIBDIR)/xdm @@ -411,7 +437,6 @@ XSMDIR = $(LIBDIR)/xsm NLSDIR = $(LIBDIR)/nls XLOCALEDIR = $(LIBDIR)/locale - PEXAPIDIR = $(LIBDIR)/PEX LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver @@ -420,14 +445,15 @@ INSTAPPFLAGS = $(INSTDATFLAGS) - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTDIR = $(BINDIR)/mkfontdir - MKHTMLINDEX = $(BINDIR)/mkhtmlindex - UCS2ANY = $(BINDIR)/ucs2any - BDFTRUNCATE = $(BINDIR)/bdftruncate + 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 = $(BINDIR)/xcursorgen + XCURSORGEN = $(XBINDIR)/xcursorgen HTMLINDEXCMD = HtmlIndexCmd @@ -452,23 +478,40 @@ FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions - FTSOURCEDIR = $(TOP)/extras/FreeType - XTTSOURCEDIR = $(TOP)/extras/X-TrueType + 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) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 +XTRANS_FAILDEFINES = -DFAIL_HARD - XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' - VENDORMANDEFS = -D__vendorversion__="\"$(VENDORMANVERSION)\" $(VENDORMANNAME)" + 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) + 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.14 2001/08/01 00:44:32 tsi Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ XLIBSRC = $(LIBSRC)/X11 @@ -478,7 +521,9 @@ LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) XEXTLIBSRC = $(LIBSRC)/Xext @@ -495,35 +540,40 @@ XSSLIBSRC = $(LIBSRC)/Xss -DEPXSSLIB = $(USRLIBDIR)/libXss.a +SOXSSREV = 1.0 +DEPXSSLIB = XSSLIB = -lXss LINTXSS = $(LINTLIBDIR)/llib-lXss.ln XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = XXF86MISCLIB = -lXxf86misc LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = XXF86VMLIB = -lXxf86vm LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = XXF86DGALIB = -lXxf86dga LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = XXF86RUSHLIB = -lXxf86rush LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln @@ -538,45 +588,53 @@ XVMCLIBSRC = $(LIBSRC)/XvMC -DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a +SOXVMCREV = 1.0 +DEPXVMCLIB = XVMCLIB = -lXvMC LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln XINERAMALIBSRC = $(LIBSRC)/Xinerama -DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a +SOXINERAMAREV = 1.0 +DEPXINERAMALIB = XINERAMALIB = -lXinerama LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln XRESLIBSRC = $(LIBSRC)/XRes -DEPXRESLIB = $(USRLIBDIR)/libXRes.a +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 -SODPSREV = 1.0 -DEPDPSLIB = +DEPDPSLIB = $(USRLIBDIR)/libdps.a DPSLIB = -ldps LINTDPS = $(LINTLIBDIR)/llib-ldps.ln DPSTKLIBSRC = $(LIBSRC)/dpstk -SODPSTKREV = 1.0 -DEPDPSTKLIB = +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a DPSTKLIB = -ldpstk LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln PSRESLIBSRC = $(LIBSRC)/psres -SOPSRESREV = 1.0 -DEPPSRESLIB = +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a PSRESLIB = -lpsres LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln @@ -612,7 +670,7 @@ XRENDERINCLUDES = -I$(XRENDERINCDIR) - XRANDRRLIBSRC = $(LIBSRC)/Xrandr + XRANDRLIBSRC = $(LIBSRC)/Xrandr SOXRANDRREV = 2.0 DEPXRANDRLIB = @@ -620,6 +678,38 @@ 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 @@ -627,6 +717,20 @@ 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 @@ -636,14 +740,16 @@ XAUTHSRC = $(LIBSRC)/Xau -DEPXAUTHLIB = $(USRLIBDIR)/libXau.a +SOXAUTHREV = 6.0 +DEPXAUTHLIB = XAUTHLIB = -lXau LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln XDMCPLIBSRC = $(LIBSRC)/Xdmcp -DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a +SOXDMCPREV = 6.0 +DEPXDMCPLIB = XDMCPLIB = -lXdmcp LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln @@ -701,12 +807,20 @@ AWIDGETSRC = $(LIBSRC)/Xaw -SOXAWREV = 7.0 +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 @@ -731,29 +845,6 @@ LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln - PEXLIBSRC = $(LIBSRC)/PEX5 - -SOPEXREV = 6.0 -DEPPEXLIB = -PEXLIB = -lPEX5 - -LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln - - XIELIBSRC = $(LIBSRC)/XIE - -SOXIEREV = 6.0 -DEPXIELIB = -XIELIB = -lXIE - -LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln - - PHIGSLIBSRC = $(LIBSRC)/PHIGS - -DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a -PHIGSLIB = -lphigs - -LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln - DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a XBSDLIB = -lXbsd @@ -761,7 +852,7 @@ ICESRC = $(LIBSRC)/ICE -SOICEREV = 6.3 +SOICEREV = 6.4 DEPICELIB = ICELIB = -lICE @@ -785,7 +876,8 @@ FSLIBSRC = $(LIBSRC)/FS -DEPFSLIB = $(USRLIBDIR)/libFS.a +SOFSREV = 6.0 +DEPFSLIB = FSLIB = -lFS LINTFS = $(LINTLIBDIR)/llib-lFS.ln @@ -809,7 +901,7 @@ LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FONTFT2LIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) FONTENCLIBSRC = $(LIBSRC)/fontenc @@ -828,16 +920,17 @@ FREETYPE2DIR = /usr FREETYPE2LIBDIR = /usr/lib -FREETYPE2INCDIR = /usr/include/freetype2 +FREETYPE2INCDIR = /usr/include FREETYPE2LIB = -lfreetype -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + FREETYPE2DEFINES = -DFREETYPE2 EXPATLIBSRC = $(LIBSRC)/expat -SOEXPATREV = 1.0 +SOEXPATREV = 0.4 DEPEXPATLIB = EXPATLIB = -lexpat @@ -853,14 +946,6 @@ EXPATDEFINES = -DEXPAT - XFT1LIBSRC = $(LIBSRC)/Xft1 - -SOXFT1REV = 1.1 -DEPXFT1LIB = -XFT1LIB = -lXft - -LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln - XFTDIR = /usr XFTLIBDIR = /usr/lib XFTINCDIR = /usr/include @@ -870,12 +955,12 @@ FONTCONFIGDIR = /usr FONTCONFIGLIBDIR = /usr/lib -FONTCONFIGINCDIR = /usr/include/fontconfig +FONTCONFIGINCDIR = /usr/include FONTCONFIGBINDIR = /usr/bin FONTCONFIGLIB = -lfontconfig -FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) +FONTCONFIGINCLUDES = FCCACHE = $(FONTCONFIGBINDIR)/fc-cache @@ -893,20 +978,28 @@ XKBFILELIBSRC = $(LIBSRC)/xkbfile -DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = XKBFILELIB = -lxkbfile LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln - XKBCOMPCMD = $(BINDIR)/xkbcomp + XKBCOMPCMD = $(XBINDIR)/xkbcomp XKBUILIBSRC = $(LIBSRC)/xkbui -DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a +SOXKBUIREV = 1.0 +DEPXKBUILIB = XKBUILIB = -lxkbui LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + XTRAPLIBSRC = $(LIBSRC)/XTrap SOXTRAPREV = 6.4 @@ -928,16 +1021,21 @@ DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? + XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) - LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIBS = $(INSTALLED_LIBS) LDPOSTLIBS = - TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) + TOP_INCLUDES = $(TOP_X_INCLUDES) PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' CXXPROJECT_DEFINES = @@ -977,8 +1075,13 @@ xcalev.$(MANNEWSUFFIX): xcalev.$(MANSRCSUFFIX) $(RM) $@ - cd `dirname xcalev` && \ - $(LN) `basename xcalev.$(MANSRCSUFFIX)` `basename $@` + if test -z "$(PREPROCESSMANPAGES)" ; then \ + cd `dirname xcalev` && \ + $(LN) `basename xcalev.$(MANSRCSUFFIX)` `basename $@`; \ + else \ + $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ + < xcalev.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[ ]*XCOMM$$/s/XCOMM/#/' -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[ ]*XHASH/s/XHASH/#/' -e '/\@\@$$/s/\@\@$$/\\/' >$@; \ + fi cleandir:: $(RM) xcalev.$(MANNEWSUFFIX) @@ -1015,16 +1118,26 @@ $(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:: cleandir:: - $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ @@ -1044,6 +1157,8 @@ distclean:: cleandir + PREPROCESSMANPAGES = true + # ---------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit @@ -1070,12 +1185,12 @@ # DO NOT DELETE xcalev.o: xcalev.c version.h /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/string.h /usr/include/time.h \ diff -u xcal-4.1/xcalpr/Makefile xcal-4.1/xcalpr/Makefile --- xcal-4.1/xcalpr/Makefile +++ xcal-4.1/xcalpr/Makefile @@ -4,20 +4,22 @@ # ---------------------------------------------------------------------- # Makefile generated from "Imake.tmpl" and # $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 $ # # # # -# $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $ +# $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.81 2003/02/18 16:51:45 tsi Exp $ +# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 @@ -27,30 +29,31 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.182 2002/10/11 01:40:22 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.201.2.1 2003/03/13 04:10:40 tsi Exp $ +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -# operating system: Linux 2.6.12.3 i686 [ELF] (2.6.12) -# libc: (6.3.5) -# binutils: (216) +# operating system: Linux 2.6.18-xen x86_64 [ELF] (2.6.18) +# libc: (6.7.0) +# binutils: (218) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -# $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -# $XFree86: xc/config/cf/xfree86.cf,v 3.439.2.2 2003/04/23 19:55:19 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 $ -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) +RELEASE_VERSION = RELEASE-1 AFB_DEFS = -DUSE_AFB @@ -67,12 +70,21 @@ XFREE86DOCDIR = $(DOCDIR) XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) XFREE86HTMLDOCDIR = $(DOCHTMLDIR) XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -# $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ + + SELINUX_LDFLAGS = + + SELINUX_INCLUDES = -I/usr/include/selinux + + SELINUX_CFLAGS = -DHAVE_SELINUX + + SELINUX_LIBS = -lselinux # ---------------------------------------------------------------------- # site-specific configuration parameters that go after @@ -80,19 +92,24 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.114 2003/03/19 01:49:23 dawes 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 +X_BYTE_ORDER = X_LITTLE_ENDIAN + GLIDE2INCDIR = /usr/include/glide GLIDE3INCDIR = /usr/include/glide3 @@ -118,33 +135,34 @@ MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = - RMAN = RmanCmd + RMAN = /usr/bin/rman RMANBASENAME = rman - RMANOPTIONS = RmanOptions + RMANOPTIONS = CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util - INCROOT = /usr/X11R6/include - USRLIBDIR = /usr/X11R6/lib + INCROOT = /usr/include + USRLIBDIR = /usr/lib VARDIR = /var VARLIBDIR = $(VARDIR)/lib SYSTEMUSRLIBDIR = /usr/lib SYSTEMUSRINCDIR = /usr/include - SHLIBDIR = /usr/X11R6/lib + SHLIBDIR = /usr/lib LINTLIBDIR = $(USRLIBDIR)/lint - MANPATH = /usr/X11R6/man + MANPATH = /usr/share/man MANSOURCEPATH = $(MANPATH)/man MANDIR = $(MANSOURCEPATH)$(MANSECT) SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) - DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)4 FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) - MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT) + MISCMANDIR = $(MANSOURCEPATH)7 ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) - ICONDIR = /usr/X11R6/lib/X11/icons - XCURSORPATH = ~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons + ICONDIR = "/usr/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + DRIVERMANDIR = $(MANSOURCEPATH)4 LOGDIRECTORY = $(VARDIR)/log VARRUNDIR = $(VARDIR)/run @@ -165,12 +183,14 @@ CXX = c++ -m32 CXXFILT = c++filt - CXXLIB = + + CXXLIB = -lstdc++ + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES) + CXXSTD_DEFINES = -Dlinux -D__i386__ -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) @@ -179,8 +199,8 @@ COMPRESS = compress GZIPCMD = gzip - CPP = /usr/bin/cpp $(STD_CPP_DEFINES) - RAWCPP = /usr/bin/cpp -undef $(STD_CPP_OPTIONS) + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) INSTALL = install @@ -211,6 +231,7 @@ RM = rm -f PERL = perl PERLOPTS = + PERLENVSETUP = env LC_ALL=C MANSECT = 1 SYSCALLMANSECT = 2 @@ -226,22 +247,21 @@ MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) - DRIVERMANSUFFIX = $(DRIVERMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = 4x FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) - MISCMANSUFFIX = $(MISCMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = 7x ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + ADMINMANSUFFIX = 8 MANSRCSUFFIX = man MANNEWSUFFIX = _man - MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) + 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 - HTMLROFF = groff -Thtml - MSMACROS = -ms MANMACROS = -man TBL = tbl @@ -252,7 +272,7 @@ MODCC = gcc -m32 - MODCPP = /usr/bin/cpp + MODCPP = cpp MODCFLAGS = $(CFLAGS) MODAS = gcc -m32 -c -x assembler MODASFLAGS = @@ -270,8 +290,8 @@ STD_INCLUDES = 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) + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -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__i386__ -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 = @@ -284,6 +304,9 @@ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + PICFLAGS = -fPIC CXXPICFLAGS = -fPIC @@ -300,21 +323,21 @@ INSTDATFLAGS = -m 0444 INSTKMEMFLAGS = -m 4711 - PROJECTROOT = /usr/X11R6 + PROJECTROOT = /usr CDEBUGFLAGS = -g -O2 -fno-strict-aliasing CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) $(SELINUX_INCLUDES) + 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) $(SELINUX_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIB = $(INSTALLED_LIBS) LDPOSTLIB = - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(SELINUX_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SELINUX_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) CCLINK = $(CC) @@ -344,7 +367,7 @@ IRULESRC = $(CONFIGDIR) IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - 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) + 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ @@ -352,18 +375,16 @@ # ---------------------------------------------------------------------- # 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.196.2.3 2003/10/08 17:56:30 eich Exp $ +# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -XORGRELSTRING = Release 6.6 -XORGMANNAME = X Version 11 - -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT @@ -373,7 +394,7 @@ # X Window System make variables; these need to be coordinated with rules XTOP = $(TOP) - BINDIR = /usr/X11R6/bin + BINDIR = /usr/bin BUILDINCROOT = $(TOP)/exports BUILDINCDIR = $(BUILDINCROOT)/include BUILDINCTOP = ../.. @@ -382,6 +403,7 @@ BUILDBINDIR = $(TOP)/exports/bin BUILDBINTOP = ../.. BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDI18NDIR = $(BUILDLIBDIR)/locale BUILDMODULETOP = $(BUILDLIBTOP)/.. XBUILDINCROOT = $(XTOP)/exports XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 @@ -389,10 +411,14 @@ XBUILDBINDIR = $(XBUILDINCROOT)/bin INCDIR = $(INCROOT) ADMDIR = /usr/adm - LIBDIR = /usr/X11R6/lib/X11 - LIBEXECDIR = /usr/X11R6/libexec + 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 @@ -402,8 +428,8 @@ DOCHTMLDIR = $(DOCDIR)/html DOCPSDIR = $(DOCDIR)/PostScript DOCPDFDIR = $(DOCDIR)/PDF - FONTDIR = $(LIBDIR)/fonts - ENCODINGSDIR = $(FONTDIR)/encodings + FONTDIR = /usr/share/fonts/X11 + ENCODINGSDIR = /usr/share/fonts/X11/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm XDMVARDIR = $(VARLIBDIR)/xdm @@ -411,7 +437,6 @@ XSMDIR = $(LIBDIR)/xsm NLSDIR = $(LIBDIR)/nls XLOCALEDIR = $(LIBDIR)/locale - PEXAPIDIR = $(LIBDIR)/PEX LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver @@ -420,14 +445,15 @@ INSTAPPFLAGS = $(INSTDATFLAGS) - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTDIR = $(BINDIR)/mkfontdir - MKHTMLINDEX = $(BINDIR)/mkhtmlindex - UCS2ANY = $(BINDIR)/ucs2any - BDFTRUNCATE = $(BINDIR)/bdftruncate + 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 = $(BINDIR)/xcursorgen + XCURSORGEN = $(XBINDIR)/xcursorgen HTMLINDEXCMD = HtmlIndexCmd @@ -452,23 +478,40 @@ FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions - FTSOURCEDIR = $(TOP)/extras/FreeType - XTTSOURCEDIR = $(TOP)/extras/X-TrueType + 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) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 +XTRANS_FAILDEFINES = -DFAIL_HARD - XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' - VENDORMANDEFS = -D__vendorversion__="\"$(VENDORMANVERSION)\" $(VENDORMANNAME)" + 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) + 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.14 2001/08/01 00:44:32 tsi Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ XLIBSRC = $(LIBSRC)/X11 @@ -478,7 +521,9 @@ LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) XEXTLIBSRC = $(LIBSRC)/Xext @@ -495,35 +540,40 @@ XSSLIBSRC = $(LIBSRC)/Xss -DEPXSSLIB = $(USRLIBDIR)/libXss.a +SOXSSREV = 1.0 +DEPXSSLIB = XSSLIB = -lXss LINTXSS = $(LINTLIBDIR)/llib-lXss.ln XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = XXF86MISCLIB = -lXxf86misc LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = XXF86VMLIB = -lXxf86vm LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = XXF86DGALIB = -lXxf86dga LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = XXF86RUSHLIB = -lXxf86rush LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln @@ -538,45 +588,53 @@ XVMCLIBSRC = $(LIBSRC)/XvMC -DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a +SOXVMCREV = 1.0 +DEPXVMCLIB = XVMCLIB = -lXvMC LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln XINERAMALIBSRC = $(LIBSRC)/Xinerama -DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a +SOXINERAMAREV = 1.0 +DEPXINERAMALIB = XINERAMALIB = -lXinerama LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln XRESLIBSRC = $(LIBSRC)/XRes -DEPXRESLIB = $(USRLIBDIR)/libXRes.a +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 -SODPSREV = 1.0 -DEPDPSLIB = +DEPDPSLIB = $(USRLIBDIR)/libdps.a DPSLIB = -ldps LINTDPS = $(LINTLIBDIR)/llib-ldps.ln DPSTKLIBSRC = $(LIBSRC)/dpstk -SODPSTKREV = 1.0 -DEPDPSTKLIB = +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a DPSTKLIB = -ldpstk LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln PSRESLIBSRC = $(LIBSRC)/psres -SOPSRESREV = 1.0 -DEPPSRESLIB = +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a PSRESLIB = -lpsres LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln @@ -612,7 +670,7 @@ XRENDERINCLUDES = -I$(XRENDERINCDIR) - XRANDRRLIBSRC = $(LIBSRC)/Xrandr + XRANDRLIBSRC = $(LIBSRC)/Xrandr SOXRANDRREV = 2.0 DEPXRANDRLIB = @@ -620,6 +678,38 @@ 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 @@ -627,6 +717,20 @@ 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 @@ -636,14 +740,16 @@ XAUTHSRC = $(LIBSRC)/Xau -DEPXAUTHLIB = $(USRLIBDIR)/libXau.a +SOXAUTHREV = 6.0 +DEPXAUTHLIB = XAUTHLIB = -lXau LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln XDMCPLIBSRC = $(LIBSRC)/Xdmcp -DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a +SOXDMCPREV = 6.0 +DEPXDMCPLIB = XDMCPLIB = -lXdmcp LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln @@ -701,12 +807,20 @@ AWIDGETSRC = $(LIBSRC)/Xaw -SOXAWREV = 7.0 +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 @@ -731,29 +845,6 @@ LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln - PEXLIBSRC = $(LIBSRC)/PEX5 - -SOPEXREV = 6.0 -DEPPEXLIB = -PEXLIB = -lPEX5 - -LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln - - XIELIBSRC = $(LIBSRC)/XIE - -SOXIEREV = 6.0 -DEPXIELIB = -XIELIB = -lXIE - -LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln - - PHIGSLIBSRC = $(LIBSRC)/PHIGS - -DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a -PHIGSLIB = -lphigs - -LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln - DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a XBSDLIB = -lXbsd @@ -761,7 +852,7 @@ ICESRC = $(LIBSRC)/ICE -SOICEREV = 6.3 +SOICEREV = 6.4 DEPICELIB = ICELIB = -lICE @@ -785,7 +876,8 @@ FSLIBSRC = $(LIBSRC)/FS -DEPFSLIB = $(USRLIBDIR)/libFS.a +SOFSREV = 6.0 +DEPFSLIB = FSLIB = -lFS LINTFS = $(LINTLIBDIR)/llib-lFS.ln @@ -809,7 +901,7 @@ LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FONTFT2LIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) FONTENCLIBSRC = $(LIBSRC)/fontenc @@ -828,16 +920,17 @@ FREETYPE2DIR = /usr FREETYPE2LIBDIR = /usr/lib -FREETYPE2INCDIR = /usr/include/freetype2 +FREETYPE2INCDIR = /usr/include FREETYPE2LIB = -lfreetype -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + FREETYPE2DEFINES = -DFREETYPE2 EXPATLIBSRC = $(LIBSRC)/expat -SOEXPATREV = 1.0 +SOEXPATREV = 0.4 DEPEXPATLIB = EXPATLIB = -lexpat @@ -853,14 +946,6 @@ EXPATDEFINES = -DEXPAT - XFT1LIBSRC = $(LIBSRC)/Xft1 - -SOXFT1REV = 1.1 -DEPXFT1LIB = -XFT1LIB = -lXft - -LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln - XFTDIR = /usr XFTLIBDIR = /usr/lib XFTINCDIR = /usr/include @@ -870,12 +955,12 @@ FONTCONFIGDIR = /usr FONTCONFIGLIBDIR = /usr/lib -FONTCONFIGINCDIR = /usr/include/fontconfig +FONTCONFIGINCDIR = /usr/include FONTCONFIGBINDIR = /usr/bin FONTCONFIGLIB = -lfontconfig -FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) +FONTCONFIGINCLUDES = FCCACHE = $(FONTCONFIGBINDIR)/fc-cache @@ -893,20 +978,28 @@ XKBFILELIBSRC = $(LIBSRC)/xkbfile -DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = XKBFILELIB = -lxkbfile LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln - XKBCOMPCMD = $(BINDIR)/xkbcomp + XKBCOMPCMD = $(XBINDIR)/xkbcomp XKBUILIBSRC = $(LIBSRC)/xkbui -DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a +SOXKBUIREV = 1.0 +DEPXKBUILIB = XKBUILIB = -lxkbui LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + XTRAPLIBSRC = $(LIBSRC)/XTrap SOXTRAPREV = 6.4 @@ -928,16 +1021,21 @@ DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? + XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) - LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIBS = $(INSTALLED_LIBS) LDPOSTLIBS = - TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) + TOP_INCLUDES = $(TOP_X_INCLUDES) PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' CXXPROJECT_DEFINES = @@ -972,8 +1070,13 @@ xcalpr.$(MANNEWSUFFIX): xcalpr.$(MANSRCSUFFIX) $(RM) $@ - cd `dirname xcalpr` && \ - $(LN) `basename xcalpr.$(MANSRCSUFFIX)` `basename $@` + if test -z "$(PREPROCESSMANPAGES)" ; then \ + cd `dirname xcalpr` && \ + $(LN) `basename xcalpr.$(MANSRCSUFFIX)` `basename $@`; \ + else \ + $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ + < xcalpr.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[ ]*XCOMM$$/s/XCOMM/#/' -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[ ]*XHASH/s/XHASH/#/' -e '/\@\@$$/s/\@\@$$/\\/' >$@; \ + fi cleandir:: $(RM) xcalpr.$(MANNEWSUFFIX) @@ -999,16 +1102,26 @@ $(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:: cleandir:: - $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ @@ -1028,6 +1141,8 @@ distclean:: cleandir + PREPROCESSMANPAGES = true + # ---------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit diff -u xcal-4.1/debian/menu xcal-4.1/debian/menu --- xcal-4.1/debian/menu +++ xcal-4.1/debian/menu @@ -1,2 +1,2 @@ -?package(xcal):needs=X11 section=Apps/Tools\ +?package(xcal):needs="X11" section="Applications/Normal applications"\ title="xcal" command="/usr/bin/xcal" diff -u xcal-4.1/debian/rules xcal-4.1/debian/rules --- xcal-4.1/debian/rules +++ xcal-4.1/debian/rules @@ -9,10 +9,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=3 +include /usr/share/dpatch/dpatch.make -build: build-stamp +build: build-stamp patch build-stamp: dh_testdir @@ -26,13 +25,13 @@ touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + [ ! -f Makefile ] || $(MAKE) clean dh_clean diff -u xcal-4.1/debian/control xcal-4.1/debian/control --- xcal-4.1/debian/control +++ xcal-4.1/debian/control @@ -2,12 +2,13 @@ Section: misc Priority: optional Maintainer: Lars Bahner -Build-Depends: debhelper, libxt-dev, x-dev, xutils, libxaw7-dev -Standards-Version: 3.6.1 +Build-Depends: debhelper, libxt-dev, libxaw7-dev, xutils-dev, dpatch +Standards-Version: 3.8.0 Package: xcal Architecture: any Depends: ${shlibs:Depends} +Recommends: lpr Description: a graphical calendar with memos and reminder alarms The "classic" calendar app with memos and alarms, xcal normally sits idle and displays the date. When clicked on, pops up a `strip' diff -u xcal-4.1/debian/changelog xcal-4.1/debian/changelog --- xcal-4.1/debian/changelog +++ xcal-4.1/debian/changelog @@ -1,3 +1,26 @@ +xcal (4.1-19) unstable; urgency=low + + * Applied the patch to correct #496393 instead of reverting it :( + (closes: #496393). Thanks to Thijs Kinkhorst for noticing. + + -- Lars Bahner Mon, 25 Aug 2008 11:54:26 +0200 + +xcal (4.1-18.5) unstable; urgency=low + + * Removed internationlization patch from pscal. As it didn't work + properly. + * Fixed incorrect tempfile handling in pscal (closes: #496393) + * Added recommendation on lpr + + -- Lars Bahner Sun, 24 Aug 2008 21:26:18 +0000 + +xcal (4.1-18.4) unstable; urgency=low + + * Fixed build-depends (closes: #485537) + * Cleaned lintian warnings + + -- Lars Bahner Thu, 21 Aug 2008 19:31:25 +0000 + xcal (4.1-18.3) unstable; urgency=medium * Non-maintainer upload. diff -u xcal-4.1/debian/docs xcal-4.1/debian/docs --- xcal-4.1/debian/docs +++ xcal-4.1/debian/docs @@ -6,0 +7 @@ +debian/patches/xcal-brederlow.patch reverted: --- xcal-4.1/debian/patches/xcal-brederlow.readme +++ xcal-4.1.orig/debian/patches/xcal-brederlow.readme @@ -1,11 +0,0 @@ -Package: xcal -Version: 4.1-5 -Severity: wishlist - -I did some work on pscal and added some options and cleaned up some -little things (removed absolute values -440 and -350 and used calculated -once instead). - -I changed the man page and added debian/changelog entries to document -the changes. You will need some italian, french, spanish,... guys for -further internationalization. reverted: --- xcal-4.1/debian/patches/brederlow.changes +++ xcal-4.1.orig/debian/patches/brederlow.changes @@ -1,21 +0,0 @@ ---- xcal-4.1/debian/changelog Sun Dec 19 17:25:03 1999 -+++ xcal-4.1-mrvn/debian/changelog Sun Dec 19 17:37:38 1999 -@@ -1,3 +1,13 @@ -+xcal (4.1-6) unstable; urgency=low -+ -+ * pscal: internationalization (german/english only) -+ * pscal: added option to exclude mini calendars -+ * pscal: added option to use Monday as first day of the week -+ * pscal: added option to write big numbers centered in the boxes -+ * pscal: small typos fixed in the manpage (spaces left out) -+ -+ -- Goswin Brederlow -+ - xcal (4.1-5) unstable; urgency=low - - * new maintainer ---------------------------------------------------------------------- - --- System Information - - diff -u xcal-4.1/Makefile xcal-4.1/Makefile --- xcal-4.1/Makefile +++ xcal-4.1/Makefile @@ -4,20 +4,22 @@ # ---------------------------------------------------------------------- # Makefile generated from "Imake.tmpl" and # $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 $ # # # # -# $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $ +# $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.81 2003/02/18 16:51:45 tsi Exp $ +# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 @@ -27,30 +29,31 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.182 2002/10/11 01:40:22 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.201.2.1 2003/03/13 04:10:40 tsi Exp $ +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -# operating system: Linux 2.6.12.3 i686 [ELF] (2.6.12) -# libc: (6.3.5) -# binutils: (216) +# operating system: Linux 2.6.18-xen x86_64 [ELF] (2.6.18) +# libc: (6.7.0) +# binutils: (218) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -# $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -# $XFree86: xc/config/cf/xfree86.cf,v 3.439.2.2 2003/04/23 19:55:19 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 $ -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) +RELEASE_VERSION = RELEASE-1 AFB_DEFS = -DUSE_AFB @@ -67,12 +70,21 @@ XFREE86DOCDIR = $(DOCDIR) XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) XFREE86HTMLDOCDIR = $(DOCHTMLDIR) XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -# $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ + + SELINUX_LDFLAGS = + + SELINUX_INCLUDES = -I/usr/include/selinux + + SELINUX_CFLAGS = -DHAVE_SELINUX + + SELINUX_LIBS = -lselinux # ---------------------------------------------------------------------- # site-specific configuration parameters that go after @@ -80,19 +92,24 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ +# 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.114 2003/03/19 01:49:23 dawes 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 +X_BYTE_ORDER = X_LITTLE_ENDIAN + GLIDE2INCDIR = /usr/include/glide GLIDE3INCDIR = /usr/include/glide3 @@ -118,33 +135,34 @@ MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = - RMAN = RmanCmd + RMAN = /usr/bin/rman RMANBASENAME = rman - RMANOPTIONS = RmanOptions + RMANOPTIONS = CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util - INCROOT = /usr/X11R6/include - USRLIBDIR = /usr/X11R6/lib + INCROOT = /usr/include + USRLIBDIR = /usr/lib VARDIR = /var VARLIBDIR = $(VARDIR)/lib SYSTEMUSRLIBDIR = /usr/lib SYSTEMUSRINCDIR = /usr/include - SHLIBDIR = /usr/X11R6/lib + SHLIBDIR = /usr/lib LINTLIBDIR = $(USRLIBDIR)/lint - MANPATH = /usr/X11R6/man + MANPATH = /usr/share/man MANSOURCEPATH = $(MANPATH)/man MANDIR = $(MANSOURCEPATH)$(MANSECT) SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) - DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)4 FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) - MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT) + MISCMANDIR = $(MANSOURCEPATH)7 ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) - ICONDIR = /usr/X11R6/lib/X11/icons - XCURSORPATH = ~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons + ICONDIR = "/usr/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + DRIVERMANDIR = $(MANSOURCEPATH)4 LOGDIRECTORY = $(VARDIR)/log VARRUNDIR = $(VARDIR)/run @@ -165,12 +183,14 @@ CXX = c++ -m32 CXXFILT = c++filt - CXXLIB = + + CXXLIB = -lstdc++ + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES) + CXXSTD_DEFINES = -Dlinux -D__i386__ -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) @@ -179,8 +199,8 @@ COMPRESS = compress GZIPCMD = gzip - CPP = /usr/bin/cpp $(STD_CPP_DEFINES) - RAWCPP = /usr/bin/cpp -undef $(STD_CPP_OPTIONS) + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) INSTALL = install @@ -211,6 +231,7 @@ RM = rm -f PERL = perl PERLOPTS = + PERLENVSETUP = env LC_ALL=C MANSECT = 1 SYSCALLMANSECT = 2 @@ -226,22 +247,21 @@ MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) - DRIVERMANSUFFIX = $(DRIVERMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = 4x FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) - MISCMANSUFFIX = $(MISCMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = 7x ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + ADMINMANSUFFIX = 8 MANSRCSUFFIX = man MANNEWSUFFIX = _man - MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) + 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 - HTMLROFF = groff -Thtml - MSMACROS = -ms MANMACROS = -man TBL = tbl @@ -252,7 +272,7 @@ MODCC = gcc -m32 - MODCPP = /usr/bin/cpp + MODCPP = cpp MODCFLAGS = $(CFLAGS) MODAS = gcc -m32 -c -x assembler MODASFLAGS = @@ -270,8 +290,8 @@ STD_INCLUDES = 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) + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -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__i386__ -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 = @@ -284,6 +304,9 @@ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + PICFLAGS = -fPIC CXXPICFLAGS = -fPIC @@ -300,21 +323,21 @@ INSTDATFLAGS = -m 0444 INSTKMEMFLAGS = -m 4711 - PROJECTROOT = /usr/X11R6 + PROJECTROOT = /usr CDEBUGFLAGS = -g -O2 -fno-strict-aliasing CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) $(SELINUX_INCLUDES) + 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) $(SELINUX_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIB = $(INSTALLED_LIBS) LDPOSTLIB = - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(SELINUX_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SELINUX_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) CCLINK = $(CC) @@ -344,7 +367,7 @@ IRULESRC = $(CONFIGDIR) IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - 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) + 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ @@ -352,18 +375,16 @@ # ---------------------------------------------------------------------- # 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.196.2.3 2003/10/08 17:56:30 eich Exp $ - -XORGRELSTRING = Release 6.6 -XORGMANNAME = X Version 11 +# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -VENDORMANNAME = XFree86 -VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT @@ -373,7 +394,7 @@ # X Window System make variables; these need to be coordinated with rules XTOP = $(TOP) - BINDIR = /usr/X11R6/bin + BINDIR = /usr/bin BUILDINCROOT = $(TOP)/exports BUILDINCDIR = $(BUILDINCROOT)/include BUILDINCTOP = ../.. @@ -382,6 +403,7 @@ BUILDBINDIR = $(TOP)/exports/bin BUILDBINTOP = ../.. BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDI18NDIR = $(BUILDLIBDIR)/locale BUILDMODULETOP = $(BUILDLIBTOP)/.. XBUILDINCROOT = $(XTOP)/exports XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 @@ -389,10 +411,14 @@ XBUILDBINDIR = $(XBUILDINCROOT)/bin INCDIR = $(INCROOT) ADMDIR = /usr/adm - LIBDIR = /usr/X11R6/lib/X11 - LIBEXECDIR = /usr/X11R6/libexec + 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 @@ -402,8 +428,8 @@ DOCHTMLDIR = $(DOCDIR)/html DOCPSDIR = $(DOCDIR)/PostScript DOCPDFDIR = $(DOCDIR)/PDF - FONTDIR = $(LIBDIR)/fonts - ENCODINGSDIR = $(FONTDIR)/encodings + FONTDIR = /usr/share/fonts/X11 + ENCODINGSDIR = /usr/share/fonts/X11/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm XDMVARDIR = $(VARLIBDIR)/xdm @@ -411,7 +437,6 @@ XSMDIR = $(LIBDIR)/xsm NLSDIR = $(LIBDIR)/nls XLOCALEDIR = $(LIBDIR)/locale - PEXAPIDIR = $(LIBDIR)/PEX LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver @@ -420,14 +445,15 @@ INSTAPPFLAGS = $(INSTDATFLAGS) - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTDIR = $(BINDIR)/mkfontdir - MKHTMLINDEX = $(BINDIR)/mkhtmlindex - UCS2ANY = $(BINDIR)/ucs2any - BDFTRUNCATE = $(BINDIR)/bdftruncate + 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 = $(BINDIR)/xcursorgen + XCURSORGEN = $(XBINDIR)/xcursorgen HTMLINDEXCMD = HtmlIndexCmd @@ -452,23 +478,40 @@ FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions - FTSOURCEDIR = $(TOP)/extras/FreeType - XTTSOURCEDIR = $(TOP)/extras/X-TrueType + 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) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 +XTRANS_FAILDEFINES = -DFAIL_HARD - XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' - VENDORMANDEFS = -D__vendorversion__="\"$(VENDORMANVERSION)\" $(VENDORMANNAME)" + 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) + 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.14 2001/08/01 00:44:32 tsi Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ XLIBSRC = $(LIBSRC)/X11 @@ -478,7 +521,9 @@ LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) XEXTLIBSRC = $(LIBSRC)/Xext @@ -495,35 +540,40 @@ XSSLIBSRC = $(LIBSRC)/Xss -DEPXSSLIB = $(USRLIBDIR)/libXss.a +SOXSSREV = 1.0 +DEPXSSLIB = XSSLIB = -lXss LINTXSS = $(LINTLIBDIR)/llib-lXss.ln XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = XXF86MISCLIB = -lXxf86misc LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = XXF86VMLIB = -lXxf86vm LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = XXF86DGALIB = -lXxf86dga LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = XXF86RUSHLIB = -lXxf86rush LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln @@ -538,45 +588,53 @@ XVMCLIBSRC = $(LIBSRC)/XvMC -DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a +SOXVMCREV = 1.0 +DEPXVMCLIB = XVMCLIB = -lXvMC LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln XINERAMALIBSRC = $(LIBSRC)/Xinerama -DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a +SOXINERAMAREV = 1.0 +DEPXINERAMALIB = XINERAMALIB = -lXinerama LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln XRESLIBSRC = $(LIBSRC)/XRes -DEPXRESLIB = $(USRLIBDIR)/libXRes.a +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 -SODPSREV = 1.0 -DEPDPSLIB = +DEPDPSLIB = $(USRLIBDIR)/libdps.a DPSLIB = -ldps LINTDPS = $(LINTLIBDIR)/llib-ldps.ln DPSTKLIBSRC = $(LIBSRC)/dpstk -SODPSTKREV = 1.0 -DEPDPSTKLIB = +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a DPSTKLIB = -ldpstk LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln PSRESLIBSRC = $(LIBSRC)/psres -SOPSRESREV = 1.0 -DEPPSRESLIB = +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a PSRESLIB = -lpsres LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln @@ -612,7 +670,7 @@ XRENDERINCLUDES = -I$(XRENDERINCDIR) - XRANDRRLIBSRC = $(LIBSRC)/Xrandr + XRANDRLIBSRC = $(LIBSRC)/Xrandr SOXRANDRREV = 2.0 DEPXRANDRLIB = @@ -620,6 +678,38 @@ 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 @@ -627,6 +717,20 @@ 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 @@ -636,14 +740,16 @@ XAUTHSRC = $(LIBSRC)/Xau -DEPXAUTHLIB = $(USRLIBDIR)/libXau.a +SOXAUTHREV = 6.0 +DEPXAUTHLIB = XAUTHLIB = -lXau LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln XDMCPLIBSRC = $(LIBSRC)/Xdmcp -DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a +SOXDMCPREV = 6.0 +DEPXDMCPLIB = XDMCPLIB = -lXdmcp LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln @@ -701,12 +807,20 @@ AWIDGETSRC = $(LIBSRC)/Xaw -SOXAWREV = 7.0 +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 @@ -731,29 +845,6 @@ LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln - PEXLIBSRC = $(LIBSRC)/PEX5 - -SOPEXREV = 6.0 -DEPPEXLIB = -PEXLIB = -lPEX5 - -LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln - - XIELIBSRC = $(LIBSRC)/XIE - -SOXIEREV = 6.0 -DEPXIELIB = -XIELIB = -lXIE - -LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln - - PHIGSLIBSRC = $(LIBSRC)/PHIGS - -DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a -PHIGSLIB = -lphigs - -LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln - DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a XBSDLIB = -lXbsd @@ -761,7 +852,7 @@ ICESRC = $(LIBSRC)/ICE -SOICEREV = 6.3 +SOICEREV = 6.4 DEPICELIB = ICELIB = -lICE @@ -785,7 +876,8 @@ FSLIBSRC = $(LIBSRC)/FS -DEPFSLIB = $(USRLIBDIR)/libFS.a +SOFSREV = 6.0 +DEPFSLIB = FSLIB = -lFS LINTFS = $(LINTLIBDIR)/llib-lFS.ln @@ -809,7 +901,7 @@ LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FONTFT2LIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) FONTENCLIBSRC = $(LIBSRC)/fontenc @@ -828,16 +920,17 @@ FREETYPE2DIR = /usr FREETYPE2LIBDIR = /usr/lib -FREETYPE2INCDIR = /usr/include/freetype2 +FREETYPE2INCDIR = /usr/include FREETYPE2LIB = -lfreetype -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + FREETYPE2DEFINES = -DFREETYPE2 EXPATLIBSRC = $(LIBSRC)/expat -SOEXPATREV = 1.0 +SOEXPATREV = 0.4 DEPEXPATLIB = EXPATLIB = -lexpat @@ -853,14 +946,6 @@ EXPATDEFINES = -DEXPAT - XFT1LIBSRC = $(LIBSRC)/Xft1 - -SOXFT1REV = 1.1 -DEPXFT1LIB = -XFT1LIB = -lXft - -LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln - XFTDIR = /usr XFTLIBDIR = /usr/lib XFTINCDIR = /usr/include @@ -870,12 +955,12 @@ FONTCONFIGDIR = /usr FONTCONFIGLIBDIR = /usr/lib -FONTCONFIGINCDIR = /usr/include/fontconfig +FONTCONFIGINCDIR = /usr/include FONTCONFIGBINDIR = /usr/bin FONTCONFIGLIB = -lfontconfig -FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) +FONTCONFIGINCLUDES = FCCACHE = $(FONTCONFIGBINDIR)/fc-cache @@ -893,20 +978,28 @@ XKBFILELIBSRC = $(LIBSRC)/xkbfile -DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = XKBFILELIB = -lxkbfile LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln - XKBCOMPCMD = $(BINDIR)/xkbcomp + XKBCOMPCMD = $(XBINDIR)/xkbcomp XKBUILIBSRC = $(LIBSRC)/xkbui -DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a +SOXKBUIREV = 1.0 +DEPXKBUILIB = XKBUILIB = -lxkbui LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + XTRAPLIBSRC = $(LIBSRC)/XTrap SOXTRAPREV = 6.4 @@ -928,16 +1021,21 @@ DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? + XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) - LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPRELIBS = $(INSTALLED_LIBS) LDPOSTLIBS = - TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) + TOP_INCLUDES = $(TOP_X_INCLUDES) PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' CXXPROJECT_DEFINES = @@ -963,7 +1061,7 @@ xcal: $(OBJS1) $(DEPLIBS1) $(RM) $@ - $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS1) $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) $(LDLIBS) -lm $(EXTRA_LOAD_FLAGS) + $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS1) $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) $(LDLIBS) -lm $(EXTRA_LOAD_FLAGS) install:: xcal @if [ -d $(DESTDIR)$(BINDIR) ]; then \ @@ -980,8 +1078,13 @@ xcal.$(MANNEWSUFFIX): xcal.$(MANSRCSUFFIX) $(RM) $@ - cd `dirname xcal` && \ - $(LN) `basename xcal.$(MANSRCSUFFIX)` `basename $@` + if test -z "$(PREPROCESSMANPAGES)" ; then \ + cd `dirname xcal` && \ + $(LN) `basename xcal.$(MANSRCSUFFIX)` `basename $@`; \ + else \ + $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ + < xcal.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[ ]*XCOMM$$/s/XCOMM/#/' -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[ ]*XHASH/s/XHASH/#/' -e '/\@\@$$/s/\@\@$$/\\/' >$@; \ + fi cleandir:: $(RM) xcal.$(MANNEWSUFFIX) @@ -1060,16 +1163,26 @@ $(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:: cleandir:: - $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ @@ -1221,6 +1334,8 @@ $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) distclean; \ done + PREPROCESSMANPAGES = true + distclean:: $(RM) Makefile Makefile.dep @@ -1231,322 +1346,307 @@ xcal.o: xcal.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/time.h /usr/include/bits/time.h \ - /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \ + /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \ /usr/include/sys/types.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/sys/sysmacros.h /usr/X11R6/include/X11/X.h \ - /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \ - /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \ - /usr/include/string.h /usr/X11R6/include/X11/Core.h \ - /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \ - /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \ - /usr/X11R6/include/X11/Xos.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ - /usr/include/bits/stat.h /usr/include/unistd.h \ + /usr/include/sys/sysmacros.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h /usr/include/X11/Xresource.h \ + /usr/include/string.h /usr/include/X11/Core.h \ + /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \ + /usr/include/X11/Object.h /usr/include/X11/RectObj.h \ + /usr/include/X11/Xos.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/sys/time.h /usr/X11R6/include/X11/Xarch.h \ - /usr/X11R6/include/X11/StringDefs.h /usr/X11R6/include/X11/Shell.h \ - /usr/X11R6/include/X11/SM/SMlib.h /usr/X11R6/include/X11/SM/SM.h \ - /usr/X11R6/include/X11/ICE/ICElib.h /usr/X11R6/include/X11/ICE/ICE.h \ - /usr/X11R6/include/X11/Xaw/Command.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Simple.h \ - /usr/X11R6/include/X11/Xmu/Converters.h \ - /usr/X11R6/include/X11/Xaw/Form.h xcal.h calendar.bm help.bm \ - help_press.bm mouse.bm mouseaway.bm xcal_ad.h -xcal_alarm.o: xcal_alarm.c /usr/X11R6/include/X11/IntrinsicP.h \ - /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \ + /usr/include/sys/time.h /usr/include/X11/Xarch.h \ + /usr/include/X11/StringDefs.h /usr/include/X11/Shell.h \ + /usr/include/X11/SM/SMlib.h /usr/include/X11/SM/SM.h \ + /usr/include/X11/ICE/ICElib.h /usr/include/X11/ICE/ICE.h \ + /usr/include/X11/Xaw/Command.h /usr/include/X11/Xaw/Label.h \ + /usr/include/X11/Xaw/Simple.h /usr/include/X11/Xmu/Converters.h \ + /usr/include/X11/Xaw/Form.h xcal.h calendar.bm help.bm help_press.bm \ + mouse.bm mouseaway.bm xcal_ad.h +xcal_alarm.o: xcal_alarm.c /usr/include/X11/IntrinsicP.h \ + /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \ /usr/include/sys/types.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/include/string.h \ - /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \ - /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \ - /usr/X11R6/include/X11/RectObj.h /usr/X11R6/include/X11/CoreP.h \ - /usr/X11R6/include/X11/CompositeP.h /usr/X11R6/include/X11/ConstrainP.h \ - /usr/X11R6/include/X11/ObjectP.h /usr/X11R6/include/X11/RectObjP.h \ - /usr/X11R6/include/X11/Xos.h /usr/include/fcntl.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/time.h /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h /usr/include/X11/Xresource.h \ + /usr/include/string.h /usr/include/X11/Core.h \ + /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \ + /usr/include/X11/Object.h /usr/include/X11/RectObj.h \ + /usr/include/X11/CoreP.h /usr/include/X11/CompositeP.h \ + /usr/include/X11/ConstrainP.h /usr/include/X11/ObjectP.h \ + /usr/include/X11/RectObjP.h /usr/include/X11/Xos.h /usr/include/fcntl.h \ /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/sys/time.h \ - /usr/X11R6/include/X11/Xarch.h /usr/X11R6/include/X11/StringDefs.h \ - /usr/X11R6/include/X11/Shell.h /usr/X11R6/include/X11/SM/SMlib.h \ - /usr/X11R6/include/X11/SM/SM.h /usr/X11R6/include/X11/ICE/ICElib.h \ - /usr/X11R6/include/X11/ICE/ICE.h /usr/X11R6/include/X11/Xaw/AsciiText.h \ - /usr/X11R6/include/X11/Xaw/Text.h /usr/X11R6/include/X11/Xaw/Simple.h \ - /usr/X11R6/include/X11/Xmu/Converters.h \ - /usr/X11R6/include/X11/Xaw/TextSink.h \ - /usr/X11R6/include/X11/Xaw/TextSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSink.h \ - /usr/X11R6/include/X11/Xaw/MultiSrc.h \ - /usr/X11R6/include/X11/Xaw/Command.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Form.h /usr/X11R6/include/X11/Xaw/Paned.h \ - /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ - /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/getopt.h /usr/include/sys/time.h /usr/include/X11/Xarch.h \ + /usr/include/X11/StringDefs.h /usr/include/X11/Shell.h \ + /usr/include/X11/SM/SMlib.h /usr/include/X11/SM/SM.h \ + /usr/include/X11/ICE/ICElib.h /usr/include/X11/ICE/ICE.h \ + /usr/include/X11/Xaw/AsciiText.h /usr/include/X11/Xaw/Text.h \ + /usr/include/X11/Xaw/Simple.h /usr/include/X11/Xmu/Converters.h \ + /usr/include/X11/Xaw/TextSink.h /usr/include/X11/Xaw/TextSrc.h \ + /usr/include/X11/Xaw/AsciiSrc.h /usr/include/X11/Xaw/AsciiSink.h \ + /usr/include/X11/Xaw/MultiSrc.h /usr/include/X11/Xaw/Command.h \ + /usr/include/X11/Xaw/Label.h /usr/include/X11/Xaw/Form.h \ + /usr/include/X11/Xaw/Paned.h /usr/include/stdio.h /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/ctype.h /usr/include/pwd.h /usr/include/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h xcal.h xcal_buts.o: xcal_buts.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/pwd.h \ - /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \ + /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/include/string.h \ - /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \ - /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \ - /usr/X11R6/include/X11/RectObj.h /usr/X11R6/include/X11/Xos.h \ - /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ + /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \ + /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \ + /usr/include/X11/keysym.h /usr/include/X11/keysymdef.h \ + /usr/include/X11/Xresource.h /usr/include/string.h \ + /usr/include/X11/Core.h /usr/include/X11/Composite.h \ + /usr/include/X11/Constraint.h /usr/include/X11/Object.h \ + /usr/include/X11/RectObj.h /usr/include/X11/Xos.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/sys/time.h /usr/X11R6/include/X11/Xarch.h \ - /usr/X11R6/include/X11/StringDefs.h \ - /usr/X11R6/include/X11/Xaw/Command.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Simple.h \ - /usr/X11R6/include/X11/Xmu/Converters.h xcal.h -xcal_days.o: xcal_days.c /usr/X11R6/include/X11/Intrinsic.h \ - /usr/X11R6/include/X11/Xlib.h /usr/include/sys/types.h \ + /usr/include/sys/time.h /usr/include/X11/Xarch.h \ + /usr/include/X11/StringDefs.h /usr/include/X11/Xaw/Command.h \ + /usr/include/X11/Xaw/Label.h /usr/include/X11/Xaw/Simple.h \ + /usr/include/X11/Xmu/Converters.h xcal.h +xcal_days.o: xcal_days.c /usr/include/X11/Intrinsic.h \ + /usr/include/X11/Xlib.h /usr/include/sys/types.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/include/string.h \ - /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \ - /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \ - /usr/X11R6/include/X11/RectObj.h + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-32.h /usr/include/bits/types.h \ + /usr/include/bits/typesizes.h /usr/include/time.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h /usr/include/X11/Xresource.h \ + /usr/include/string.h /usr/include/X11/Core.h \ + /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \ + /usr/include/X11/Object.h /usr/include/X11/RectObj.h xcal_edit.o: xcal_edit.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/pwd.h \ - /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \ + /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/include/string.h \ - /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \ - /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \ - /usr/X11R6/include/X11/RectObj.h /usr/X11R6/include/X11/Xos.h \ - /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ + /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \ + /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \ + /usr/include/X11/keysym.h /usr/include/X11/keysymdef.h \ + /usr/include/X11/Xresource.h /usr/include/string.h \ + /usr/include/X11/Core.h /usr/include/X11/Composite.h \ + /usr/include/X11/Constraint.h /usr/include/X11/Object.h \ + /usr/include/X11/RectObj.h /usr/include/X11/Xos.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/sys/time.h /usr/X11R6/include/X11/Xarch.h \ - /usr/X11R6/include/X11/StringDefs.h /usr/X11R6/include/X11/Shell.h \ - /usr/X11R6/include/X11/SM/SMlib.h /usr/X11R6/include/X11/SM/SM.h \ - /usr/X11R6/include/X11/ICE/ICElib.h /usr/X11R6/include/X11/ICE/ICE.h \ - /usr/X11R6/include/X11/Xaw/AsciiText.h \ - /usr/X11R6/include/X11/Xaw/Text.h /usr/X11R6/include/X11/Xaw/Simple.h \ - /usr/X11R6/include/X11/Xmu/Converters.h \ - /usr/X11R6/include/X11/Xaw/TextSink.h \ - /usr/X11R6/include/X11/Xaw/TextSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSink.h \ - /usr/X11R6/include/X11/Xaw/MultiSrc.h \ - /usr/X11R6/include/X11/Xaw/Command.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Paned.h /usr/X11R6/include/X11/Xaw/Form.h \ - /usr/X11R6/include/X11/Xaw/Dialog.h xcal.h /usr/include/dirent.h \ - /usr/include/bits/dirent.h /usr/include/bits/posix1_lim.h \ - /usr/include/bits/local_lim.h /usr/include/linux/limits.h + /usr/include/sys/time.h /usr/include/X11/Xarch.h \ + /usr/include/X11/StringDefs.h /usr/include/X11/Shell.h \ + /usr/include/X11/SM/SMlib.h /usr/include/X11/SM/SM.h \ + /usr/include/X11/ICE/ICElib.h /usr/include/X11/ICE/ICE.h \ + /usr/include/X11/Xaw/AsciiText.h /usr/include/X11/Xaw/Text.h \ + /usr/include/X11/Xaw/Simple.h /usr/include/X11/Xmu/Converters.h \ + /usr/include/X11/Xaw/TextSink.h /usr/include/X11/Xaw/TextSrc.h \ + /usr/include/X11/Xaw/AsciiSrc.h /usr/include/X11/Xaw/AsciiSink.h \ + /usr/include/X11/Xaw/MultiSrc.h /usr/include/X11/Xaw/Command.h \ + /usr/include/X11/Xaw/Label.h /usr/include/X11/Xaw/Paned.h \ + /usr/include/X11/Xaw/Form.h /usr/include/X11/Xaw/Dialog.h xcal.h \ + /usr/include/dirent.h /usr/include/bits/dirent.h \ + /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \ + /usr/include/linux/limits.h xcal_help.o: xcal_help.c /usr/include/sys/types.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h xcal_mmap.h \ - /usr/include/sys/mman.h /usr/include/bits/mman.h \ - /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/time.h /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h xcal_mmap.h /usr/include/sys/mman.h \ + /usr/include/bits/mman.h /usr/include/sys/stat.h \ + /usr/include/bits/stat.h /usr/include/stdio.h /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/string.h \ - /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \ - /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \ - /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \ - /usr/X11R6/include/X11/StringDefs.h /usr/X11R6/include/X11/Shell.h \ - /usr/X11R6/include/X11/SM/SMlib.h /usr/X11R6/include/X11/SM/SM.h \ - /usr/X11R6/include/X11/ICE/ICElib.h /usr/X11R6/include/X11/ICE/ICE.h \ - /usr/X11R6/include/X11/Xaw/AsciiText.h \ - /usr/X11R6/include/X11/Xaw/Text.h /usr/X11R6/include/X11/Xaw/Simple.h \ - /usr/X11R6/include/X11/Xmu/Converters.h \ - /usr/X11R6/include/X11/Xaw/TextSink.h \ - /usr/X11R6/include/X11/Xaw/TextSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSink.h \ - /usr/X11R6/include/X11/Xaw/MultiSrc.h \ - /usr/X11R6/include/X11/Xaw/Command.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Form.h /usr/X11R6/include/X11/Xaw/Paned.h \ - xcal.h xcal_help.h + /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \ + /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \ + /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \ + /usr/include/X11/keysym.h /usr/include/X11/keysymdef.h \ + /usr/include/X11/Xresource.h /usr/include/X11/Core.h \ + /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \ + /usr/include/X11/Object.h /usr/include/X11/RectObj.h \ + /usr/include/X11/StringDefs.h /usr/include/X11/Shell.h \ + /usr/include/X11/SM/SMlib.h /usr/include/X11/SM/SM.h \ + /usr/include/X11/ICE/ICElib.h /usr/include/X11/ICE/ICE.h \ + /usr/include/X11/Xaw/AsciiText.h /usr/include/X11/Xaw/Text.h \ + /usr/include/X11/Xaw/Simple.h /usr/include/X11/Xmu/Converters.h \ + /usr/include/X11/Xaw/TextSink.h /usr/include/X11/Xaw/TextSrc.h \ + /usr/include/X11/Xaw/AsciiSrc.h /usr/include/X11/Xaw/AsciiSink.h \ + /usr/include/X11/Xaw/MultiSrc.h /usr/include/X11/Xaw/Command.h \ + /usr/include/X11/Xaw/Label.h /usr/include/X11/Xaw/Form.h \ + /usr/include/X11/Xaw/Paned.h xcal.h xcal_help.h xcal_popup.o: xcal_popup.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/X11R6/include/X11/Intrinsic.h \ - /usr/X11R6/include/X11/Xlib.h /usr/include/sys/types.h \ - /usr/include/time.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/include/string.h \ - /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \ - /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \ - /usr/X11R6/include/X11/RectObj.h /usr/X11R6/include/X11/StringDefs.h \ - /usr/X11R6/include/X11/Shell.h /usr/X11R6/include/X11/SM/SMlib.h \ - /usr/X11R6/include/X11/SM/SM.h /usr/X11R6/include/X11/ICE/ICElib.h \ - /usr/X11R6/include/X11/ICE/ICE.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Simple.h \ - /usr/X11R6/include/X11/Xmu/Converters.h \ - /usr/X11R6/include/X11/Xaw/Dialog.h /usr/X11R6/include/X11/Xaw/Form.h \ - /usr/X11R6/include/X11/Xaw/AsciiText.h \ - /usr/X11R6/include/X11/Xaw/Text.h /usr/X11R6/include/X11/Xaw/TextSink.h \ - /usr/X11R6/include/X11/Xaw/TextSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSink.h \ - /usr/X11R6/include/X11/Xaw/MultiSrc.h \ - /usr/X11R6/include/X11/Xaw/Command.h xcal.h + /usr/include/bits/endian.h /usr/include/X11/Intrinsic.h \ + /usr/include/X11/Xlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h /usr/include/X11/Xresource.h \ + /usr/include/string.h /usr/include/X11/Core.h \ + /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \ + /usr/include/X11/Object.h /usr/include/X11/RectObj.h \ + /usr/include/X11/StringDefs.h /usr/include/X11/Shell.h \ + /usr/include/X11/SM/SMlib.h /usr/include/X11/SM/SM.h \ + /usr/include/X11/ICE/ICElib.h /usr/include/X11/ICE/ICE.h \ + /usr/include/X11/Xaw/Label.h /usr/include/X11/Xaw/Simple.h \ + /usr/include/X11/Xmu/Converters.h /usr/include/X11/Xaw/Dialog.h \ + /usr/include/X11/Xaw/Form.h /usr/include/X11/Xaw/AsciiText.h \ + /usr/include/X11/Xaw/Text.h /usr/include/X11/Xaw/TextSink.h \ + /usr/include/X11/Xaw/TextSrc.h /usr/include/X11/Xaw/AsciiSrc.h \ + /usr/include/X11/Xaw/AsciiSink.h /usr/include/X11/Xaw/MultiSrc.h \ + /usr/include/X11/Xaw/Command.h xcal.h xcal_strip.o: xcal_strip.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/X11R6/include/X11/Intrinsic.h \ - /usr/X11R6/include/X11/Xlib.h /usr/include/sys/types.h \ - /usr/include/time.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/include/string.h \ - /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \ - /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \ - /usr/X11R6/include/X11/RectObj.h /usr/X11R6/include/X11/Xatom.h \ - /usr/X11R6/include/X11/StringDefs.h /usr/X11R6/include/X11/Shell.h \ - /usr/X11R6/include/X11/SM/SMlib.h /usr/X11R6/include/X11/SM/SM.h \ - /usr/X11R6/include/X11/ICE/ICElib.h /usr/X11R6/include/X11/ICE/ICE.h \ - /usr/X11R6/include/X11/Xaw/Paned.h \ - /usr/X11R6/include/X11/Xmu/Converters.h \ - /usr/X11R6/include/X11/Xaw/Viewport.h /usr/X11R6/include/X11/Xaw/Form.h \ - /usr/X11R6/include/X11/Xaw/Reports.h \ - /usr/X11R6/include/X11/Xaw/Command.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Simple.h /usr/X11R6/include/X11/Xaw/Dialog.h \ - /usr/X11R6/include/X11/Xaw/AsciiText.h \ - /usr/X11R6/include/X11/Xaw/Text.h /usr/X11R6/include/X11/Xaw/TextSink.h \ - /usr/X11R6/include/X11/Xaw/TextSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSink.h \ - /usr/X11R6/include/X11/Xaw/MultiSrc.h xcal.h + /usr/include/bits/endian.h /usr/include/X11/Intrinsic.h \ + /usr/include/X11/Xlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h /usr/include/X11/Xresource.h \ + /usr/include/string.h /usr/include/X11/Core.h \ + /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \ + /usr/include/X11/Object.h /usr/include/X11/RectObj.h \ + /usr/include/X11/Xatom.h /usr/include/X11/StringDefs.h \ + /usr/include/X11/Shell.h /usr/include/X11/SM/SMlib.h \ + /usr/include/X11/SM/SM.h /usr/include/X11/ICE/ICElib.h \ + /usr/include/X11/ICE/ICE.h /usr/include/X11/Xaw/Paned.h \ + /usr/include/X11/Xmu/Converters.h /usr/include/X11/Xaw/Viewport.h \ + /usr/include/X11/Xaw/Form.h /usr/include/X11/Xaw/Reports.h \ + /usr/include/X11/Xaw/Command.h /usr/include/X11/Xaw/Label.h \ + /usr/include/X11/Xaw/Simple.h /usr/include/X11/Xaw/Dialog.h \ + /usr/include/X11/Xaw/AsciiText.h /usr/include/X11/Xaw/Text.h \ + /usr/include/X11/Xaw/TextSink.h /usr/include/X11/Xaw/TextSrc.h \ + /usr/include/X11/Xaw/AsciiSrc.h /usr/include/X11/Xaw/AsciiSink.h \ + /usr/include/X11/Xaw/MultiSrc.h xcal.h xcal_memo.o: xcal_memo.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/getopt.h /usr/include/ctype.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/X11R6/include/X11/Xos.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/include/sys/types.h \ - /usr/include/time.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/string.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ - /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/unistd.h \ + /usr/include/bits/endian.h /usr/include/X11/Xos.h \ + /usr/include/X11/Xosdefs.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/string.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ + /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/sys/time.h /usr/X11R6/include/X11/Xarch.h \ - /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \ - /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \ - /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \ - /usr/X11R6/include/X11/RectObj.h /usr/X11R6/include/X11/StringDefs.h \ - /usr/X11R6/include/X11/Shell.h /usr/X11R6/include/X11/SM/SMlib.h \ - /usr/X11R6/include/X11/SM/SM.h /usr/X11R6/include/X11/ICE/ICElib.h \ - /usr/X11R6/include/X11/ICE/ICE.h /usr/X11R6/include/X11/Xaw/AsciiText.h \ - /usr/X11R6/include/X11/Xaw/Text.h /usr/X11R6/include/X11/Xaw/Simple.h \ - /usr/X11R6/include/X11/Xmu/Converters.h \ - /usr/X11R6/include/X11/Xaw/TextSink.h \ - /usr/X11R6/include/X11/Xaw/TextSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSrc.h \ - /usr/X11R6/include/X11/Xaw/AsciiSink.h \ - /usr/X11R6/include/X11/Xaw/MultiSrc.h \ - /usr/X11R6/include/X11/Xaw/Command.h /usr/X11R6/include/X11/Xaw/Label.h \ - /usr/X11R6/include/X11/Xaw/Paned.h /usr/X11R6/include/X11/Xaw/Form.h \ - /usr/X11R6/include/X11/Xaw/Dialog.h xcal.h + /usr/include/sys/time.h /usr/include/X11/Xarch.h \ + /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \ + /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h /usr/include/X11/Xresource.h \ + /usr/include/X11/Core.h /usr/include/X11/Composite.h \ + /usr/include/X11/Constraint.h /usr/include/X11/Object.h \ + /usr/include/X11/RectObj.h /usr/include/X11/StringDefs.h \ + /usr/include/X11/Shell.h /usr/include/X11/SM/SMlib.h \ + /usr/include/X11/SM/SM.h /usr/include/X11/ICE/ICElib.h \ + /usr/include/X11/ICE/ICE.h /usr/include/X11/Xaw/AsciiText.h \ + /usr/include/X11/Xaw/Text.h /usr/include/X11/Xaw/Simple.h \ + /usr/include/X11/Xmu/Converters.h /usr/include/X11/Xaw/TextSink.h \ + /usr/include/X11/Xaw/TextSrc.h /usr/include/X11/Xaw/AsciiSrc.h \ + /usr/include/X11/Xaw/AsciiSink.h /usr/include/X11/Xaw/MultiSrc.h \ + /usr/include/X11/Xaw/Command.h /usr/include/X11/Xaw/Label.h \ + /usr/include/X11/Xaw/Paned.h /usr/include/X11/Xaw/Form.h \ + /usr/include/X11/Xaw/Dialog.h xcal.h strfdate.o: strfdate.c /usr/include/sys/types.h /usr/include/features.h \ - /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stddef.h \ - /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/sys/time.h /usr/include/string.h \ - /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \ - /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \ - /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \ - /usr/X11R6/include/X11/Xos.h /usr/include/fcntl.h \ + /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ + /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ + /usr/include/bits/types.h /usr/include/bits/typesizes.h \ + /usr/include/time.h /usr/lib/gcc/i486-linux-gnu/4.3.1/include/stddef.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/sys/time.h \ + /usr/include/string.h /usr/include/X11/Intrinsic.h \ + /usr/include/X11/Xlib.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h /usr/include/X11/Xresource.h \ + /usr/include/X11/Core.h /usr/include/X11/Composite.h \ + /usr/include/X11/Constraint.h /usr/include/X11/Object.h \ + /usr/include/X11/RectObj.h /usr/include/X11/Xos.h /usr/include/fcntl.h \ /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/X11R6/include/X11/Xarch.h \ - /usr/X11R6/include/X11/StringDefs.h xcal.h + /usr/include/getopt.h /usr/include/X11/Xarch.h \ + /usr/include/X11/StringDefs.h xcal.h version.o: version.c only in patch2: unchanged: --- xcal-4.1.orig/debian/README.Debian +++ xcal-4.1/debian/README.Debian @@ -0,0 +1,3 @@ +It would seem the internationalization patches applied to pscal were not really working, so I reverted them. I someone screams loudly enough I might reapply them , but i somewhat doubt that. + +The patch is added to /usr/share/doc/xcal/, so you might reapply it yourself if desperately needed. only in patch2: unchanged: --- xcal-4.1.orig/debian/compat +++ xcal-4.1/debian/compat @@ -0,0 +1 @@ +5 only in patch2: unchanged: --- xcal-4.1.orig/debian/patches/00List +++ xcal-4.1/debian/patches/00List @@ -0,0 +1,3 @@ +00List +01_pscal_tempfile.patch +xcal-brederlow.patch only in patch2: unchanged: --- xcal-4.1.orig/debian/patches/01_pscal_tempfile.patch +++ xcal-4.1/debian/patches/01_pscal_tempfile.patch @@ -0,0 +1,48 @@ +#!/bin/sh -e +## DP: Debian conformance patch for the Debian pyca-package +## DP: This patch consists mainly of FHS (2.2) stuff +## Copyright @ 2003 by Lars Bahner + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Naur xcal-4.1/pscal/pscal.script xcal-4.1.new/pscal/pscal.script +--- xcal-4.1/pscal/pscal.script 2008-08-25 11:50:34.000000000 +0200 ++++ xcal-4.1.new/pscal/pscal.script 2008-08-25 11:52:30.000000000 +0200 +@@ -161,6 +161,7 @@ + xc\*$MONTHNAME$YEAR) + ;; + *) ++ PSCAL_TEMPFILE=$(mktemp -t pscal.XXXXXXXXXX) + for file in $list + do + day=`expr $file : 'xc\([0-9]*\)'` +@@ -171,9 +172,9 @@ + s/^/$day ( / + s/\$/ )/ + p" +- done > /tmp/pscal$$ +- holidays=`cat /tmp/pscal$$` +- rm -f /tmp/pscal$$ ++ done > ${PSCAL_TEMPFILE} ++ holidays=`cat ${PSCAL_TEMPFILE}` ++ rm -f ${PSCAL_TEMPFILE} + esac + fi +