diff options
Diffstat (limited to 'xc/config')
106 files changed, 203 insertions, 199 deletions
diff --git a/xc/config/Imakefile b/xc/config/Imakefile index a440d1155..8b2608821 100644 --- a/xc/config/Imakefile +++ b/xc/config/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.2 93/12/31 14:57:59 kaleb Exp $ +XCOMM $XConsortium: Imakefile,v 1.3 94/02/09 15:50:05 matt Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/xc/config/cf/Amoeba.cf b/xc/config/cf/Amoeba.cf index 38e7ab5da..33a14d9a4 100644 --- a/xc/config/cf/Amoeba.cf +++ b/xc/config/cf/Amoeba.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: Amoeba.cf,v 1.6 94/11/28 11:55:40 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: Amoeba.cf,v 1.7 95/01/05 19:38:42 kaleb Exp $ /* The presence of this configuration file in the X distribution * does not imply full support for the system it describes. diff --git a/xc/config/cf/DGUX.cf b/xc/config/cf/DGUX.cf index ba2aba271..0c7fd67f5 100644 --- a/xc/config/cf/DGUX.cf +++ b/xc/config/cf/DGUX.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: DGUX.cf,v 1.2 92/12/22 17:45:10 gildea Exp $ +XCOMM platform: $XConsortium: DGUX.cf,v 1.3 93/10/13 15:29:59 rws Exp $ #define OSName DG/UX 4.32 XCOMM operating system: OSName diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf index d5a3fd8b4..da1e29811 100644 --- a/xc/config/cf/FreeBSD.cf +++ b/xc/config/cf/FreeBSD.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: FreeBSD.cf,v 1.4 95/01/05 19:39:23 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: FreeBSD.cf,v 1.5 95/04/07 19:42:53 kaleb Exp $ #define OSName FreeBSD 1.1 #define OSVendor /**/ diff --git a/xc/config/cf/Fresco.tmpl b/xc/config/cf/Fresco.tmpl index b395e3dd6..0b9b5cc33 100644 --- a/xc/config/cf/Fresco.tmpl +++ b/xc/config/cf/Fresco.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Fresco.tmpl,v 1.4 94/03/28 15:24:46 gildea Exp $ +XCOMM $XConsortium: Fresco.tmpl,v 1.5 94/03/31 16:31:31 matt Exp $ XCOMM XCOMM Definitions for using Fresco library XCOMM diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf index 9ec5ea379..7fa73104f 100644 --- a/xc/config/cf/Imake.cf +++ b/xc/config/cf/Imake.cf @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imake.cf,v 1.18 94/12/08 02:34:19 kaleb Exp kaleb $ +XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $ /* * To add support for another platform: * diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules index 78bbde325..384e37c50 100644 --- a/xc/config/cf/Imake.rules +++ b/xc/config/cf/Imake.rules @@ -1,6 +1,6 @@ XCOMM --------------------------------------------------------------------- XCOMM Imake rules for building libraries, programs, scripts, and data files -XCOMM rules: $XConsortium: Imake.rules,v 1.200 95/02/21 21:36:15 gildea Exp gildea $ +XCOMM rules: $XConsortium: Imake.rules,v 1.201 95/06/05 19:43:41 gildea Exp $ /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl index a883d32a1..a5a8f5803 100644 --- a/xc/config/cf/Imake.tmpl +++ b/xc/config/cf/Imake.tmpl @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE -XCOMM $XConsortium: Imake.tmpl,v 1.226 95/02/24 19:48:27 gildea Exp kaleb $ +XCOMM $XConsortium: Imake.tmpl,v 1.227 95/05/05 17:42:07 kaleb Exp $ XCOMM /* diff --git a/xc/config/cf/Imakefile b/xc/config/cf/Imakefile index 4e720ce8f..85db776e4 100644 --- a/xc/config/cf/Imakefile +++ b/xc/config/cf/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.31 94/03/31 11:36:57 gildea Exp $ +XCOMM $XConsortium: Imakefile,v 1.33 95/06/16 20:08:22 kaleb Exp $ #ifdef LocalConfigFiles LOCALFILES = LocalConfigFiles diff --git a/xc/config/cf/Ixx.tmpl b/xc/config/cf/Ixx.tmpl index 2bbe94dd3..cbcba2dd4 100644 --- a/xc/config/cf/Ixx.tmpl +++ b/xc/config/cf/Ixx.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Ixx.tmpl,v 1.4 94/03/28 11:33:55 matt Exp $ +XCOMM $XConsortium: Ixx.tmpl,v 1.5 94/03/28 17:13:30 matt Exp $ XCOMM XCOMM Definitions for using interface translator XCOMM diff --git a/xc/config/cf/Library.tmpl b/xc/config/cf/Library.tmpl index 9e97a9e27..156df351a 100644 --- a/xc/config/cf/Library.tmpl +++ b/xc/config/cf/Library.tmpl @@ -9,7 +9,7 @@ * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir */ -XCOMM $XConsortium: Library.tmpl,v 1.33 95/05/05 19:31:31 kaleb Exp gildea $ +XCOMM $XConsortium: Library.tmpl,v 1.34 95/06/16 17:44:51 gildea Exp $ #ifndef LibraryCplusplusOptions #if DoSharedLib && defined(SharedLibraryCplusplusOptions) diff --git a/xc/config/cf/Mips.cf b/xc/config/cf/Mips.cf index 2696f4671..18ff6697b 100644 --- a/xc/config/cf/Mips.cf +++ b/xc/config/cf/Mips.cf @@ -9,7 +9,7 @@ #define OSMajorVersion 4 #define OSMinorVersion 50 -XCOMM platform: $XConsortium: Mips.cf,v 1.13 93/10/13 15:30:15 rws Exp $ +XCOMM platform: $XConsortium: Mips.cf,v 1.14 94/03/24 15:24:34 gildea Exp $ XCOMM operating system: OSName /*************************************************************************** diff --git a/xc/config/cf/NetBSD.cf b/xc/config/cf/NetBSD.cf index 54c4daf80..1589c5973 100644 --- a/xc/config/cf/NetBSD.cf +++ b/xc/config/cf/NetBSD.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: NetBSD.cf,v 1.4 95/01/05 19:39:34 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: NetBSD.cf,v 1.5 95/04/07 19:42:55 kaleb Exp $ #define OSName NetBSD #define OSVendor /**/ diff --git a/xc/config/cf/Oki.cf b/xc/config/cf/Oki.cf index 3d17cf563..9a86f4bd4 100644 --- a/xc/config/cf/Oki.cf +++ b/xc/config/cf/Oki.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: Oki.cf,v 1.13 95/05/05 17:42:07 kaleb Exp gildea $ +XCOMM platform: $XConsortium: Oki.cf,v 1.14 95/06/09 20:57:00 gildea Exp $ #define OSName Unix System V/860 Release 4.0 Version 3 XCOMM operating system: OSName diff --git a/xc/config/cf/Project.tmpl b/xc/config/cf/Project.tmpl index 7dda5924a..7ea14b8bc 100644 --- a/xc/config/cf/Project.tmpl +++ b/xc/config/cf/Project.tmpl @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XConsortium: Project.tmpl,v 1.249 95/05/23 21:36:40 matt Exp $ +XCOMM $XConsortium: Project.tmpl,v 1.250 95/06/26 15:08:46 dpw Exp $ /*************************************************************************** * * diff --git a/xc/config/cf/README b/xc/config/cf/README index a7fc87f8f..27c9c8639 100644 --- a/xc/config/cf/README +++ b/xc/config/cf/README @@ -1,4 +1,4 @@ -$XConsortium: README,v 1.41 95/05/23 21:38:11 matt Exp gildea $ +$XConsortium: README,v 1.42 95/06/16 19:26:55 gildea Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! diff --git a/xc/config/cf/Server.tmpl b/xc/config/cf/Server.tmpl index e26fb98bb..0888d3ece 100644 --- a/xc/config/cf/Server.tmpl +++ b/xc/config/cf/Server.tmpl @@ -3,7 +3,7 @@ * that Imakefiles in the server subtree will need. */ -XCOMM $XConsortium: Server.tmpl,v 1.12 94/02/08 13:43:06 gildea Exp $ +XCOMM $XConsortium: Server.tmpl,v 1.13 94/04/08 16:59:46 rws Exp $ #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)" diff --git a/xc/config/cf/Threads.tmpl b/xc/config/cf/Threads.tmpl index 439ab856f..23e35458c 100644 --- a/xc/config/cf/Threads.tmpl +++ b/xc/config/cf/Threads.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Threads.tmpl,v 1.2 94/03/28 17:13:39 matt Exp $ +XCOMM $XConsortium: Threads.tmpl,v 1.3 94/03/30 12:04:19 gildea Exp $ /* * For a multi-threaded application or library, diff --git a/xc/config/cf/Win32.cf b/xc/config/cf/Win32.cf index f01d7f1b3..bb4e0f99d 100644 --- a/xc/config/cf/Win32.cf +++ b/xc/config/cf/Win32.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: Win32.cf,v 1.39 94/11/04 00:35:43 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: Win32.cf,v 1.40 94/12/12 22:47:48 kaleb Exp $ #define OSName Microsoft Windows NT 3.5 XCOMM operating system: OSName diff --git a/xc/config/cf/Win32.rules b/xc/config/cf/Win32.rules index bb4cde24e..abd357ecb 100644 --- a/xc/config/cf/Win32.rules +++ b/xc/config/cf/Win32.rules @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: Win32.rules,v 1.40 94/03/28 17:11:24 matt Exp kaleb $ +XCOMM platform: $XConsortium: Win32.rules,v 1.41 94/12/12 22:48:38 kaleb Exp $ #define HasSharedLibraries YES #define NeedLibInsideFlag YES diff --git a/xc/config/cf/WinLib.tmpl b/xc/config/cf/WinLib.tmpl index 62cdb8340..ec0c8eb72 100644 --- a/xc/config/cf/WinLib.tmpl +++ b/xc/config/cf/WinLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: WinLib.tmpl,v 1.15 93/10/11 12:40:21 rws Exp $ +XCOMM $XConsortium: WinLib.tmpl,v 1.1 94/01/08 18:32:51 rws Exp $ #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) diff --git a/xc/config/cf/apollo.cf b/xc/config/cf/apollo.cf index 6103da96d..2171f3db8 100644 --- a/xc/config/cf/apollo.cf +++ b/xc/config/cf/apollo.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: apollo.cf,v 1.30 91/08/25 14:46:56 rws Exp $ +XCOMM platform: $XConsortium: apollo.cf,v 1.31 93/08/07 11:24:47 rws Exp $ /* * Minimally tested, and only in the bsd4.3 environment. X_NOT_POSIX is not diff --git a/xc/config/cf/bsd.cf b/xc/config/cf/bsd.cf index 62f8b7d48..d8ce0dea0 100644 --- a/xc/config/cf/bsd.cf +++ b/xc/config/cf/bsd.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: bsd.cf,v 1.21 93/12/13 17:17:22 dpw Exp kaleb $ +XCOMM platform: $XConsortium: bsd.cf,v 1.22 95/01/05 19:30:02 kaleb Exp $ #define OSName 4.3bsd XCOMM operating system: OSName diff --git a/xc/config/cf/bsdLib.rules b/xc/config/cf/bsdLib.rules index 549e80086..999901985 100644 --- a/xc/config/cf/bsdLib.rules +++ b/xc/config/cf/bsdLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium$ +XCOMM $XConsortium: bsdLib.rules,v 1.1 94/03/29 15:34:45 gildea Exp $ /* * NetBSD/FreeBSD shared library rules @@ -7,9 +7,6 @@ XCOMM $XConsortium$ #ifndef HasSharedLibraries #define HasSharedLibraries YES #endif -#ifndef ForceNormalLib -#define ForceNormalLib YES -#endif #ifndef SharedDataSeparation #define SharedDataSeparation NO #endif diff --git a/xc/config/cf/bsdLib.tmpl b/xc/config/cf/bsdLib.tmpl index 857ef1958..f56cf0ce3 100644 --- a/xc/config/cf/bsdLib.tmpl +++ b/xc/config/cf/bsdLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: bsdLib.tmpl,v 1.1 94/03/29 15:34:46 gildea Exp kaleb $ +XCOMM $XConsortium: bsdLib.tmpl,v 1.2 95/01/23 19:07:12 kaleb Exp $ /* * NetBSD/FreeBSD shared library template diff --git a/xc/config/cf/bsdi.cf b/xc/config/cf/bsdi.cf index c3b394700..c26466925 100644 --- a/xc/config/cf/bsdi.cf +++ b/xc/config/cf/bsdi.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: bsdi.cf,v 1.13 95/01/05 19:33:32 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: bsdi.cf,v 1.14 95/01/11 18:27:52 kaleb Exp $ #define OSName BSD/386 1.1 #define OSVendor BSDI diff --git a/xc/config/cf/convex.cf b/xc/config/cf/convex.cf index fad7e4332..9240d7ae2 100644 --- a/xc/config/cf/convex.cf +++ b/xc/config/cf/convex.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: convex.cf,v 1.0 91/07/28 23:58:24 rws Exp $ +XCOMM platform: $XConsortium: convex.cf,v 1.1 91/07/29 10:31:44 rws Exp $ #define OSName ConvexOS V9.0 XCOMM operating system: OSName diff --git a/xc/config/cf/cray.cf b/xc/config/cf/cray.cf index ff9ed9856..c4feecc3b 100644 --- a/xc/config/cf/cray.cf +++ b/xc/config/cf/cray.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: cray.cf,v 1.48 94/04/02 18:01:58 rws Exp $ +XCOMM platform: $XConsortium: cray.cf,v 1.49 94/04/04 21:28:10 rws Exp $ #define OSName UNICOS 8.0 XCOMM operating system: OSName diff --git a/xc/config/cf/fujitsu.cf b/xc/config/cf/fujitsu.cf index 98077cd87..ca719de6b 100644 --- a/xc/config/cf/fujitsu.cf +++ b/xc/config/cf/fujitsu.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: fujitsu.cf,v 1.4 94/09/01 21:05:53 kaleb Exp gildea $ +XCOMM platform: $XConsortium: fujitsu.cf,v 1.5 95/06/19 02:56:37 gildea Exp $ #ifdef SparcArchitecture diff --git a/xc/config/cf/generic.cf b/xc/config/cf/generic.cf index adf7f81e5..0ba57dbb8 100644 --- a/xc/config/cf/generic.cf +++ b/xc/config/cf/generic.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: generic.cf,v 1.5 91/03/27 09:13:04 rws Exp $ +XCOMM platform: $XConsortium: generic.cf,v 1.6 91/07/03 14:47:42 rws Exp $ #define OSName Unknown Operating System XCOMM operating system: OSName diff --git a/xc/config/cf/hp.cf b/xc/config/cf/hp.cf index f6c7f4f85..bfac20922 100644 --- a/xc/config/cf/hp.cf +++ b/xc/config/cf/hp.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: hp.cf,v 1.69 94/10/22 01:31:09 gildea Exp dpw $ +XCOMM platform: $XConsortium: hp.cf,v 1.70 94/10/28 20:47:55 dpw Exp $ #define OSName HP-UX 9.1 XCOMM operating system: OSName diff --git a/xc/config/cf/hpLib.rules b/xc/config/cf/hpLib.rules index 7eaa9fa81..ae4f0e710 100644 --- a/xc/config/cf/hpLib.rules +++ b/xc/config/cf/hpLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: hpLib.rules,v 1.4 93/09/11 17:57:18 rws Exp kaleb $ +XCOMM $XConsortium: hpLib.rules,v 1.5 95/01/16 19:50:38 kaleb Exp $ /* * HP shared library rules diff --git a/xc/config/cf/hpLib.tmpl b/xc/config/cf/hpLib.tmpl index 92517e010..7da45b886 100644 --- a/xc/config/cf/hpLib.tmpl +++ b/xc/config/cf/hpLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: hpLib.tmpl,v 1.7 93/08/23 19:46:42 rws Exp $ +XCOMM $XConsortium: hpLib.tmpl,v 1.8 93/08/25 15:30:15 rws Exp $ /* * HP shared library template diff --git a/xc/config/cf/ibm.cf b/xc/config/cf/ibm.cf index a40852778..f0a03b656 100644 --- a/xc/config/cf/ibm.cf +++ b/xc/config/cf/ibm.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: ibm.cf,v 1.54 95/03/17 20:53:33 gildea Exp kaleb $ +XCOMM platform: $XConsortium: ibm.cf,v 1.55 95/04/07 19:22:30 kaleb Exp kaleb $ #ifdef RsArchitecture #ifndef OSName @@ -103,7 +103,7 @@ baseobj.Osuf: basedep.CCsuf @@\ #if OSMajorVersion >= 4 #define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS #define CcCmd c89 /* full conforming ANSI C w/ ANSI headers */ - _NULLCMD_ = @ echo +#define AvoidNullMakeCommand YES #else #define XibmServer YES #define ibmIncludeSKYWAY YES diff --git a/xc/config/cf/ibmLib.rules b/xc/config/cf/ibmLib.rules index 9b8305a7c..370416920 100644 --- a/xc/config/cf/ibmLib.rules +++ b/xc/config/cf/ibmLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: ibmLib.rules,v 1.9 93/12/24 11:28:07 rws Exp Kaleb $ +XCOMM $XConsortium: ibmLib.rules,v 1.10 95/04/07 19:22:32 kaleb Exp $ /* * AIX shared library rules diff --git a/xc/config/cf/ibmLib.tmpl b/xc/config/cf/ibmLib.tmpl index 28b51e82a..7591ee87f 100644 --- a/xc/config/cf/ibmLib.tmpl +++ b/xc/config/cf/ibmLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: ibmLib.tmpl,v 1.15 94/03/08 19:56:53 matt Exp $ +XCOMM $XConsortium: ibmLib.tmpl,v 1.16 94/03/09 11:16:26 matt Exp $ /* * AIX shared library template diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf index 9bf67e85e..98d539c63 100644 --- a/xc/config/cf/linux.cf +++ b/xc/config/cf/linux.cf @@ -1,14 +1,18 @@ -XCOMM platform: $XConsortium: linux.cf,v 1.10 95/01/16 18:31:04 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: linux.cf,v 1.11 95/01/23 18:32:03 kaleb Exp kaleb $ #define OSName Linux -#define OSVendor /**/ +#define OSVendor Slackware 2.3.0 ELF #define OSMajorVersion 1 -#define OSMinorVersion 0 -#define OSTeenyVersion 0 +#define OSMinorVersion 2 +#define OSTeenyVersion 11 #ifndef UseElfFormat +#if OSMinorVersion > 1 +#define UseElfFormat YES +#else #define UseElfFormat NO #endif +#endif #define HasGcc YES #define HasGcc2 YES #define HasGcc2ForCplusplus YES @@ -34,15 +38,26 @@ XCOMM platform: $XConsortium: linux.cf,v 1.10 95/01/16 18:31:04 kaleb Exp kaleb #define NeedWidePrototypes NO #if UseElfFormat +#if OSMinorVersion > 1 +#define CcCmd gcc +#define AsCmd as +#define LdCmd ld +#else #define CcCmd gcc -b i486-linuxelf #define AsCmd /usr/i486-linuxelf/bin/as #define LdCmd ld -m elf_i386 +#endif #define AsmDefines -D__ELF__ #define CplusplusCmd g++ -b i486-linuxelf #else #define CcCmd gcc +#if OSMinorVersion < 2 #define AsCmd as #define LdCmd ld +#else +#define AsCmd /usr/i486-linuxaout/bin/as +#define LdCmd ld -m i386linux +#endif #define AsmDefines -DUSE_GAS #endif #define CppCmd /lib/cpp diff --git a/xc/config/cf/lnxLib.rules b/xc/config/cf/lnxLib.rules index a33236295..8bdf1522d 100644 --- a/xc/config/cf/lnxLib.rules +++ b/xc/config/cf/lnxLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: lnxLib.rules,v 1.7 95/01/16 20:20:30 kaleb Exp kaleb $ +XCOMM $XConsortium: lnxLib.rules,v 1.8 95/01/16 21:11:00 kaleb Exp kaleb $ /* * Linux shared library rules (DLL & ELF versions) @@ -27,7 +27,7 @@ XCOMM $XConsortium: lnxLib.rules,v 1.7 95/01/16 20:20:30 kaleb Exp kaleb $ #define ShLibIncludeFile <lnxLib.tmpl> #endif #ifndef SharedLibraryLoadFlags -#define SharedLibraryLoadFlags --shared +#define SharedLibraryLoadFlags -shared #endif #ifndef PositionIndependentCFlags #define PositionIndependentCFlags -fPIC @@ -35,6 +35,9 @@ XCOMM $XConsortium: lnxLib.rules,v 1.7 95/01/16 20:20:30 kaleb Exp kaleb $ #ifndef PositionIndependentCplusplusFlags #define PositionIndependentCplusplusFlags -fPIC #endif +#ifndef ExtraLoadFlags +#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIR) +#endif /* * InstallSharedLibrary - generate rules to install the shared library. @@ -71,7 +74,7 @@ AllTarget(Concat(lib,libname.so.rev)) @@\ Concat(lib,libname.so.rev): solist @@\ $(RM) $@~ @@\ (cd down; T=`echo $@ | sed 's/\.[^\.]*$$//'`; \ - $(LD) -o up/$@~ $(SHLIBLDFLAGS) --soname $$T solist $(REQUIREDLIBS)) @@\ + $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$T solist $(REQUIREDLIBS)) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ $(RM) Concat(lib,libname.so) @@\ diff --git a/xc/config/cf/lnxLib.tmpl b/xc/config/cf/lnxLib.tmpl index 2df324714..07b889eee 100644 --- a/xc/config/cf/lnxLib.tmpl +++ b/xc/config/cf/lnxLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: lnxLib.tmpl,v 1.4 95/01/05 19:36:58 kaleb Exp kaleb $ +XCOMM $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $ /* * Linux shared library template diff --git a/xc/config/cf/luna.cf b/xc/config/cf/luna.cf index 9fdd46209..2fd43a47b 100644 --- a/xc/config/cf/luna.cf +++ b/xc/config/cf/luna.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: luna.cf,v 1.30 94/04/01 19:59:08 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: luna.cf,v 1.31 94/09/19 15:04:42 kaleb Exp $ /* * Please set the values for OSMajorVerion and OSMinorVersion * before making makefiles. diff --git a/xc/config/cf/macII.cf b/xc/config/cf/macII.cf index abf9b524a..240c3a9cf 100644 --- a/xc/config/cf/macII.cf +++ b/xc/config/cf/macII.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: macII.cf,v 1.46 94/04/02 16:27:41 kaleb Exp $ +XCOMM platform: $XConsortium: macII.cf,v 1.47 94/07/05 11:09:07 kaleb Exp $ #define OSName A/UX 3.0.1 #define OSMajorVersion 3 diff --git a/xc/config/cf/moto.cf b/xc/config/cf/moto.cf index aaa8a57c1..067085c2a 100644 --- a/xc/config/cf/moto.cf +++ b/xc/config/cf/moto.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: moto.cf,v 1.13 94/02/10 20:02:44 rws Exp $ +XCOMM platform: $XConsortium: moto.cf,v 1.14 94/04/05 18:19:38 converse Exp $ #if defined(MotoR3Architecture) diff --git a/xc/config/cf/ncr.cf b/xc/config/cf/ncr.cf index 024b1a785..5745f2fc2 100644 --- a/xc/config/cf/ncr.cf +++ b/xc/config/cf/ncr.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: ncr.cf,v 1.20 95/05/05 17:42:07 kaleb Exp gildea $ +XCOMM platform: $XConsortium: ncr.cf,v 1.21 95/06/09 20:57:00 gildea Exp $ #define OSName Unix System V Release 4/MP-RAS #define OSVendor NCR XCOMM operating system: OSName diff --git a/xc/config/cf/nec.cf b/xc/config/cf/nec.cf index 229492963..9ee177a56 100644 --- a/xc/config/cf/nec.cf +++ b/xc/config/cf/nec.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: nec.cf,v 1.1 94/03/26 18:15:10 rws Exp $ +XCOMM platform: $XConsortium: nec.cf,v 1.2 94/04/11 21:18:22 rws Exp $ #ifdef nec_ews_svr2 # define NecCISCArchitecture diff --git a/xc/config/cf/necLib.rules b/xc/config/cf/necLib.rules index 7867a432f..537958679 100644 --- a/xc/config/cf/necLib.rules +++ b/xc/config/cf/necLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: necLib.rules,v 1.2 94/04/11 21:17:09 rws Exp kaleb $ +XCOMM $XConsortium: necLib.rules,v 1.3 95/01/16 19:50:38 kaleb Exp $ /* * NECOS shared library rules diff --git a/xc/config/cf/necLib.tmpl b/xc/config/cf/necLib.tmpl index 65084cdc5..2e7f04b05 100644 --- a/xc/config/cf/necLib.tmpl +++ b/xc/config/cf/necLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium$ +XCOMM $XConsortium: necLib.tmpl,v 1.1 94/03/26 18:15:22 rws Exp $ /* * NEC shared library template diff --git a/xc/config/cf/oldlib.rules b/xc/config/cf/oldlib.rules index e0a493994..52faa69eb 100644 --- a/xc/config/cf/oldlib.rules +++ b/xc/config/cf/oldlib.rules @@ -1,6 +1,6 @@ /* You should not use these any more, use new Library.tmpl insead */ -XCOMM $XConsortium: oldlib.rules,v 1.1 91/03/25 15:08:40 rws Exp $ +XCOMM $XConsortium: oldlib.rules,v 1.2 91/04/09 19:15:13 rws Exp $ /* * ProfiledLibraryObjectRule - generate make rules to build both profiled diff --git a/xc/config/cf/osf1.cf b/xc/config/cf/osf1.cf index c3e13b436..d1e03caa3 100644 --- a/xc/config/cf/osf1.cf +++ b/xc/config/cf/osf1.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: osf1.cf,v 1.48 95/04/24 19:33:49 gildea Exp gildea $ +XCOMM platform: $XConsortium: osf1.cf,v 1.49 95/06/09 20:57:00 gildea Exp $ /* only tested with Digital OSF/1 */ #ifdef AlphaArchitecture diff --git a/xc/config/cf/osfLib.rules b/xc/config/cf/osfLib.rules index 5d8fee88f..431c0ddc6 100644 --- a/xc/config/cf/osfLib.rules +++ b/xc/config/cf/osfLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: osfLib.rules,v 1.11 95/01/16 19:50:38 kaleb Exp kaleb $ +XCOMM $XConsortium: osfLib.rules,v 1.12 95/06/16 19:09:33 kaleb Exp $ /* * OSF/1 shared library rules diff --git a/xc/config/cf/osfLib.tmpl b/xc/config/cf/osfLib.tmpl index 86130af67..c0eea7afb 100644 --- a/xc/config/cf/osfLib.tmpl +++ b/xc/config/cf/osfLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: osfLib.tmpl,v 1.17 94/01/29 11:47:36 rws Exp $ +XCOMM $XConsortium: osfLib.tmpl,v 1.18 94/06/03 21:38:46 matt Exp $ /* * OSF/1 shared library template diff --git a/xc/config/cf/pegasus.cf b/xc/config/cf/pegasus.cf index c5d4e91fc..714903d2c 100644 --- a/xc/config/cf/pegasus.cf +++ b/xc/config/cf/pegasus.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: pegasus.cf,v 1.35 93/09/21 11:17:06 rws Exp $ +XCOMM platform: $XConsortium: pegasus.cf,v 1.36 94/02/10 12:16:24 rws Exp $ #define OSName UTek 4.0 XCOMM operating system: OSName diff --git a/xc/config/cf/sequent.cf b/xc/config/cf/sequent.cf index 28e1c12ff..a2ab49a55 100644 --- a/xc/config/cf/sequent.cf +++ b/xc/config/cf/sequent.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: fujitsu.cf,v 1.1 94/02/04 19:47:34 rws Exp $ +XCOMM platform: $XConsortium: sequent.cf,v 1.1 94/02/04 21:35:31 rws Exp $ /* * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install * util/scripts/bsdinstall.sh before doing a "make install" diff --git a/xc/config/cf/sgi.cf b/xc/config/cf/sgi.cf index e2b4e37b0..af4b71d72 100644 --- a/xc/config/cf/sgi.cf +++ b/xc/config/cf/sgi.cf @@ -1,14 +1,14 @@ -XCOMM platform: $XConsortium: sgi.cf,v 1.49 95/04/07 18:59:01 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: sgi.cf,v 1.50 95/06/16 20:08:22 kaleb Exp kaleb $ #ifndef OSName -#define OSName IRIX 5.2 +#define OSName IRIX 5.3 #endif XCOMM operating system: OSName #ifndef OSMajorVersion #define OSMajorVersion 5 #endif #ifndef OSMinorVersion -#define OSMinorVersion 2 +#define OSMinorVersion 3 #endif #ifndef OSTeenyVersion #define OSTeenyVersion 0 diff --git a/xc/config/cf/sgiLib.rules b/xc/config/cf/sgiLib.rules index 9664bf040..b70211d25 100644 --- a/xc/config/cf/sgiLib.rules +++ b/xc/config/cf/sgiLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: sgiLib.rules,v 1.10 95/01/16 19:49:35 kaleb Exp kaleb $ +XCOMM $XConsortium: sgiLib.rules,v 1.11 95/04/07 18:59:02 kaleb Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/sgiLib.tmpl b/xc/config/cf/sgiLib.tmpl index f373d6e13..896ac310a 100644 --- a/xc/config/cf/sgiLib.tmpl +++ b/xc/config/cf/sgiLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: $ +XCOMM $XConsortium: sgiLib.tmpl,v 1.1 94/12/12 11:59:22 kaleb Exp $ /* * SGI shared library template diff --git a/xc/config/cf/site.def b/xc/config/cf/site.def index a8589074e..592938050 100644 --- a/xc/config/cf/site.def +++ b/xc/config/cf/site.def @@ -1,4 +1,4 @@ -XCOMM site: $XConsortium: site.def,v 1.145 95/04/24 19:34:21 gildea Exp gildea $ +XCOMM site: $XConsortium: site.def,v 1.146 95/05/06 18:48:59 gildea Exp $ /*************************************************************************** * * diff --git a/xc/config/cf/site.sample b/xc/config/cf/site.sample index 5b4a18750..8eaf32eff 100644 --- a/xc/config/cf/site.sample +++ b/xc/config/cf/site.sample @@ -1,4 +1,4 @@ -XCOMM site: $XConsortium: site.sample,v 1.17 94/12/04 18:50:43 kaleb Exp gildea $ +XCOMM site: $XConsortium: site.sample,v 1.18 95/01/06 19:05:33 gildea Exp $ /*************************************************************************** * * diff --git a/xc/config/cf/sony.cf b/xc/config/cf/sony.cf index 4109afe78..e612a58e6 100644 --- a/xc/config/cf/sony.cf +++ b/xc/config/cf/sony.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: sony.cf,v 1.59 94/11/02 16:03:30 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: sony.cf,v 1.60 95/06/09 21:17:18 kaleb Exp $ #ifdef SonyBsdArchitecture diff --git a/xc/config/cf/sun.cf b/xc/config/cf/sun.cf index 6bfc98bc6..8f212f1ed 100644 --- a/xc/config/cf/sun.cf +++ b/xc/config/cf/sun.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: sun.cf,v 1.143 95/06/09 20:57:00 gildea Exp kaleb $ +XCOMM platform: $XConsortium: sun.cf,v 1.144 95/06/16 20:09:26 kaleb Exp $ #ifdef SVR4Architecture #ifdef i386Architecture diff --git a/xc/config/cf/sunLib.rules b/xc/config/cf/sunLib.rules index f2e330f6b..da34edb0c 100644 --- a/xc/config/cf/sunLib.rules +++ b/xc/config/cf/sunLib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: sunLib.rules,v 1.13 93/09/11 17:58:31 rws Exp $ +XCOMM $XConsortium: sunLib.rules,v 1.14 94/03/28 15:24:43 gildea Exp $ /* * SunOS shared library rules diff --git a/xc/config/cf/sunLib.tmpl b/xc/config/cf/sunLib.tmpl index f7f0a52aa..dfc2f59b8 100644 --- a/xc/config/cf/sunLib.tmpl +++ b/xc/config/cf/sunLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: sunLib.tmpl,v 1.37 95/05/23 14:31:40 matt Exp kaleb $ +XCOMM $XConsortium: sunLib.tmpl,v 1.38 95/07/06 14:06:11 kaleb Exp $ /* * SunOS shared library template diff --git a/xc/config/cf/sv4Lib.rules b/xc/config/cf/sv4Lib.rules index cbf3fd4de..2781f7d05 100644 --- a/xc/config/cf/sv4Lib.rules +++ b/xc/config/cf/sv4Lib.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: sv4Lib.rules,v 1.14 94/04/09 12:00:10 rws Exp kaleb $ +XCOMM $XConsortium: sv4Lib.rules,v 1.15 95/01/16 19:50:38 kaleb Exp $ /* * SVR4 shared library rules diff --git a/xc/config/cf/sv4Lib.tmpl b/xc/config/cf/sv4Lib.tmpl index c3a253ac0..44c14406d 100644 --- a/xc/config/cf/sv4Lib.tmpl +++ b/xc/config/cf/sv4Lib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: sv4Lib.tmpl,v 1.19 93/12/03 10:48:36 kaleb Exp kaleb $ +XCOMM $XConsortium: sv4Lib.tmpl,v 1.20 95/07/06 14:06:11 kaleb Exp $ /* * SVR4 shared library template diff --git a/xc/config/cf/svr4.cf b/xc/config/cf/svr4.cf index 9bcf4c15b..52df67a14 100644 --- a/xc/config/cf/svr4.cf +++ b/xc/config/cf/svr4.cf @@ -1,4 +1,4 @@ -XCOMM $XConsortium: svr4.cf,v 1.13 95/06/09 20:57:00 gildea Exp kaleb $ +XCOMM $XConsortium: svr4.cf,v 1.14 95/06/30 18:21:43 kaleb Exp $ /* * A default OS name */ diff --git a/xc/config/cf/ultrix.cf b/xc/config/cf/ultrix.cf index 7f13f395f..06c4964e3 100644 --- a/xc/config/cf/ultrix.cf +++ b/xc/config/cf/ultrix.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: ultrix.cf,v 1.63 94/03/28 09:11:49 kaleb Exp $ +XCOMM platform: $XConsortium: ultrix.cf,v 1.64 94/04/09 20:44:15 rws Exp $ #define OSName Ultrix-32 4.3 XCOMM operating system: OSName diff --git a/xc/config/cf/usl.cf b/xc/config/cf/usl.cf index e1aae70bc..31ed09bab 100644 --- a/xc/config/cf/usl.cf +++ b/xc/config/cf/usl.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: usl.cf,v 1.37 95/06/30 18:11:39 kaleb Exp kaleb $ +XCOMM platform: $XConsortium: usl.cf,v 1.38 95/09/13 15:01:59 kaleb Exp $ #define OSName UNIX System V/386 Release 4.2 Version 2.0 XCOMM operating system: OSName diff --git a/xc/config/cf/x386.cf b/xc/config/cf/x386.cf index a35aed9d6..ead05a8ca 100644 --- a/xc/config/cf/x386.cf +++ b/xc/config/cf/x386.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: x386.cf,v 1.11 93/10/13 15:32:46 rws Exp gildea $ +XCOMM platform: $XConsortium: x386.cf,v 1.12 95/06/09 21:28:51 gildea Exp $ /***************************************************************************** * Site-specfic parameters * diff --git a/xc/config/cf/xf86.rules b/xc/config/cf/xf86.rules index eac4d34fa..345a0ce1b 100644 --- a/xc/config/cf/xf86.rules +++ b/xc/config/cf/xf86.rules @@ -1,4 +1,4 @@ -XCOMM $XConsortium: xf86.rules,v 1.6 95/01/12 15:41:51 kaleb Exp kaleb $ +XCOMM $XConsortium: xf86.rules,v 1.7 95/01/25 16:34:39 kaleb Exp $ /* * These rules are needed to build the Xfree86 X Servers diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index 3223dc7de..c8d917064 100644 --- a/xc/config/cf/xfree86.cf +++ b/xc/config/cf/xfree86.cf @@ -1,4 +1,4 @@ -XCOMM $XConsortium: xfree86.cf,v 1.8 95/01/23 15:46:04 kaleb Exp kaleb $ +XCOMM $XConsortium: xfree86.cf,v 1.9 95/01/25 16:42:40 kaleb Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. diff --git a/xc/config/imake/Imakefile b/xc/config/imake/Imakefile index b7591588e..56ce08b96 100644 --- a/xc/config/imake/Imakefile +++ b/xc/config/imake/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.5 94/03/29 15:53:59 gildea Exp $ +XCOMM $XConsortium: Imakefile,v 1.6 94/03/29 16:21:51 matt Exp $ DEPLIBS = diff --git a/xc/config/imake/Makefile.ini b/xc/config/imake/Makefile.ini index e62d75b9c..ff39766b9 100644 --- a/xc/config/imake/Makefile.ini +++ b/xc/config/imake/Makefile.ini @@ -1,4 +1,4 @@ -# $XConsortium: Makefile.ini,v 1.19 93/08/17 19:53:01 rws Exp $ +# $XConsortium: Makefile.ini,v 1.20 93/09/04 16:08:40 rws Exp $ # # WARNING WARNING WARNING WARNING WARNING WARNING WARNING # diff --git a/xc/config/imake/imake.c b/xc/config/imake/imake.c index c9cf5c065..0f7dbd633 100644 --- a/xc/config/imake/imake.c +++ b/xc/config/imake/imake.c @@ -1,4 +1,4 @@ -/* $XConsortium: imake.c,v 1.90 94/11/21 17:16:08 kaleb Exp kaleb $ */ +/* $XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $ */ /*************************************************************************** * * @@ -879,7 +879,7 @@ char *ReadLine(tmpfd, tmpfname) initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", - "$XConsortium: imake.c,v 1.90 94/11/21 17:16:08 kaleb Exp kaleb $"); + "$XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $"); } for (p1 = pline; p1 < end; p1++) { diff --git a/xc/config/imake/imake.man b/xc/config/imake/imake.man index 415d7c41c..58464aa9b 100644 --- a/xc/config/imake/imake.man +++ b/xc/config/imake/imake.man @@ -1,4 +1,4 @@ -.\" $XConsortium: imake.man,v 1.26 94/04/17 23:05:13 gildea Exp gildea $ +.\" $XConsortium: imake.man,v 1.27 94/12/13 17:30:46 gildea Exp $ .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining diff --git a/xc/config/imake/imakemdep.h b/xc/config/imake/imakemdep.h index f95683682..89a70b934 100644 --- a/xc/config/imake/imakemdep.h +++ b/xc/config/imake/imakemdep.h @@ -1,4 +1,4 @@ -/* $XConsortium: imakemdep.h,v 1.82 95/01/12 16:27:01 kaleb Exp kaleb $ */ +/* $XConsortium: imakemdep.h,v 1.83 95/04/07 19:47:46 kaleb Exp $ */ /* Copyright (c) 1993, 1994 X Consortium diff --git a/xc/config/makedepend/Imakefile b/xc/config/makedepend/Imakefile index 99517f64a..4c7eb4846 100644 --- a/xc/config/makedepend/Imakefile +++ b/xc/config/makedepend/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.21 94/02/04 21:39:02 rws Exp $ +XCOMM $XConsortium: Imakefile,v 1.22 94/03/29 15:54:05 gildea Exp $ SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o diff --git a/xc/config/makedepend/cpp.ed b/xc/config/makedepend/cpp.ed index 3c633397d..ffa586f54 100644 --- a/xc/config/makedepend/cpp.ed +++ b/xc/config/makedepend/cpp.ed @@ -1,5 +1,5 @@ # -# $XConsortium: cpp.ed,v 1.2 88/09/06 17:53:42 jim Exp $ +# $XConsortium: cpp.ed,v 1.3 89/12/12 12:44:18 jim Exp $ # # $Locker $ # diff --git a/xc/config/makedepend/cppsetup.c b/xc/config/makedepend/cppsetup.c index 7b7bce800..5ed89cadf 100644 --- a/xc/config/makedepend/cppsetup.c +++ b/xc/config/makedepend/cppsetup.c @@ -1,4 +1,4 @@ -/* $XConsortium: cppsetup.c,v 1.12 94/04/13 16:55:45 gildea Exp $ */ +/* $XConsortium: cppsetup.c,v 1.13 94/04/17 20:10:32 gildea Exp kaleb $ */ /* Copyright (c) 1993, 1994 X Consortium @@ -222,7 +222,7 @@ cppsetup(line, filep, inc) { IfParser ip; struct _parse_data pd; - int val = 0; + long val = 0; pd.filep = filep; pd.inc = inc; diff --git a/xc/config/makedepend/def.h b/xc/config/makedepend/def.h index 031a41a22..60477417a 100644 --- a/xc/config/makedepend/def.h +++ b/xc/config/makedepend/def.h @@ -1,4 +1,4 @@ -/* $XConsortium: def.h,v 1.24 94/04/13 16:58:43 gildea Exp $ */ +/* $XConsortium: def.h,v 1.25 94/04/17 20:10:33 gildea Exp $ */ /* Copyright (c) 1993, 1994 X Consortium diff --git a/xc/config/makedepend/ifparser.c b/xc/config/makedepend/ifparser.c index 261a3af8a..22af3fa98 100644 --- a/xc/config/makedepend/ifparser.c +++ b/xc/config/makedepend/ifparser.c @@ -1,5 +1,5 @@ /* - * $XConsortium: ifparser.c,v 1.7 94/01/18 21:30:50 rws Exp gildea $ + * $XConsortium: ifparser.c,v 1.8 95/06/03 00:01:41 gildea Exp kaleb $ * * Copyright 1992 Network Computing Devices, Inc. * @@ -92,16 +92,17 @@ static const char * parse_number (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { SKIPSPACE (cp); if (!isdigit(*cp)) return CALLFUNC(g, handle_error) (g, cp, "number"); -#ifdef WIN32 *valp = strtol(cp, &cp, 0); -#else + /* skip trailing qualifiers */ + while (*cp == 'U' || *cp == 'u' || *cp == 'L' || *cp == 'l') cp++; +#if 0 *valp = atoi (cp); /* EMPTY */ for (cp++; isdigit(*cp); cp++) ; @@ -109,12 +110,43 @@ parse_number (g, cp, valp) return cp; } +static const char * +parse_character (g, cp, valp) + IfParser *g; + const char *cp; + long *valp; +{ + char val; + + SKIPSPACE (cp); + if (*cp == '\\') + switch (cp[1]) { + case 'n': val = '\n'; break; + case 't': val = '\t'; break; + case 'v': val = '\v'; break; + case 'b': val = '\b'; break; + case 'r': val = '\r'; break; + case 'f': val = '\f'; break; + case 'a': val = '\a'; break; + case '\\': val = '\\'; break; + case '?': val = '\?'; break; + case '\'': val = '\''; break; + case '\"': val = '\"'; break; + case 'x': val = (char) strtol (cp + 2, NULL, 16); break; + default: val = (char) strtol (cp + 1, NULL, 8); break; + } + else + val = *cp; + while (*cp != '\'') cp++; + *valp = (long) val; + return cp; +} static const char * parse_value (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { const char *var; @@ -157,6 +189,12 @@ parse_value (g, cp, valp) *valp = 1; /* XXX */ return cp + 1; + case '\'': + DO (cp = parse_character (g, cp + 1, valp)); + if (*cp != '\'') + return CALLFUNC(g, handle_error) (g, cp, "'"); + return cp + 1; + case 'd': if (strncmp (cp, "defined", 7) == 0 && !isalnum(cp[7])) { int paren = 0; @@ -197,9 +235,9 @@ static const char * parse_product (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_value (g, cp, valp)); SKIPSPACE (cp); @@ -228,9 +266,9 @@ static const char * parse_sum (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_product (g, cp, valp)); SKIPSPACE (cp); @@ -254,9 +292,9 @@ static const char * parse_shift (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_sum (g, cp, valp)); SKIPSPACE (cp); @@ -284,9 +322,9 @@ static const char * parse_inequality (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_shift (g, cp, valp)); SKIPSPACE (cp); @@ -320,9 +358,9 @@ static const char * parse_equality (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_inequality (g, cp, valp)); SKIPSPACE (cp); @@ -350,9 +388,9 @@ static const char * parse_band (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_equality (g, cp, valp)); SKIPSPACE (cp); @@ -373,9 +411,9 @@ static const char * parse_bor (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_band (g, cp, valp)); SKIPSPACE (cp); @@ -396,9 +434,9 @@ static const char * parse_land (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_bor (g, cp, valp)); SKIPSPACE (cp); @@ -419,9 +457,9 @@ static const char * parse_lor (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { - int rightval; + long rightval; DO (cp = parse_land (g, cp, valp)); SKIPSPACE (cp); @@ -446,7 +484,7 @@ const char * ParseIfExpression (g, cp, valp) IfParser *g; const char *cp; - int *valp; + long *valp; { return parse_lor (g, cp, valp); } diff --git a/xc/config/makedepend/ifparser.h b/xc/config/makedepend/ifparser.h index 2cd89fb66..367610065 100644 --- a/xc/config/makedepend/ifparser.h +++ b/xc/config/makedepend/ifparser.h @@ -1,5 +1,5 @@ /* - * $XConsortium$ + * $XConsortium: ifparser.h,v 1.1 92/08/22 13:05:39 rws Exp kaleb $ * * Copyright 1992 Network Computing Devices, Inc. * @@ -72,5 +72,11 @@ typedef struct _if_parser { char *data; } IfParser; -char *ParseIfExpression (/* IfParser *, const char *, int * */); +char *ParseIfExpression ( +#ifdef __STDC__ + IfParser *, + const char *, + long * +#endif +); diff --git a/xc/config/makedepend/include.c b/xc/config/makedepend/include.c index 9a5b5e5bb..e6cf1c576 100644 --- a/xc/config/makedepend/include.c +++ b/xc/config/makedepend/include.c @@ -1,4 +1,4 @@ -/* $XConsortium: include.c,v 1.16 94/04/17 20:10:34 gildea Exp gildea $ */ +/* $XConsortium: include.c,v 1.17 94/12/05 19:33:08 gildea Exp $ */ /* Copyright (c) 1993, 1994 X Consortium diff --git a/xc/config/makedepend/main.c b/xc/config/makedepend/main.c index 754cd4fee..1a6a0dc32 100644 --- a/xc/config/makedepend/main.c +++ b/xc/config/makedepend/main.c @@ -1,4 +1,4 @@ -/* $XConsortium: main.c,v 1.83 94/04/17 20:10:36 gildea Exp kaleb $ */ +/* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */ /* Copyright (c) 1993, 1994 X Consortium diff --git a/xc/config/makedepend/mkdepend.man b/xc/config/makedepend/mkdepend.man index f49a9732d..8bc922b09 100644 --- a/xc/config/makedepend/mkdepend.man +++ b/xc/config/makedepend/mkdepend.man @@ -1,4 +1,4 @@ -.\" $XConsortium: mkdepend.man,v 1.15 94/04/17 20:10:37 gildea Exp gildea $ +.\" $XConsortium: mkdepend.man,v 1.16 94/09/02 20:33:09 gildea Exp $ .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a diff --git a/xc/config/makedepend/parse.c b/xc/config/makedepend/parse.c index 888e08e10..cf557c0ba 100644 --- a/xc/config/makedepend/parse.c +++ b/xc/config/makedepend/parse.c @@ -1,4 +1,4 @@ -/* $XConsortium: parse.c,v 1.29 94/04/13 16:54:14 gildea Exp $ */ +/* $XConsortium: parse.c,v 1.30 94/04/17 20:10:38 gildea Exp $ */ /* Copyright (c) 1993, 1994 X Consortium diff --git a/xc/config/makedepend/pr.c b/xc/config/makedepend/pr.c index 76a9de4ac..407b1ec0b 100644 --- a/xc/config/makedepend/pr.c +++ b/xc/config/makedepend/pr.c @@ -1,4 +1,4 @@ -/* $XConsortium: pr.c,v 1.16 94/04/13 16:52:12 gildea Exp $ */ +/* $XConsortium: pr.c,v 1.17 94/04/17 20:10:38 gildea Exp $ */ /* Copyright (c) 1993, 1994 X Consortium diff --git a/xc/config/util/Imakefile b/xc/config/util/Imakefile index 530eaa342..bac7ccf67 100644 --- a/xc/config/util/Imakefile +++ b/xc/config/util/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.8 94/03/29 15:54:11 gildea Exp kaleb $ +XCOMM $XConsortium: Imakefile,v 1.9 95/05/05 17:42:43 kaleb Exp $ #if UseCCMakeDepend MDEP_PROG = makedepend #endif diff --git a/xc/config/util/Makefile.ini b/xc/config/util/Makefile.ini index dd2dd1e71..5b8d1f475 100644 --- a/xc/config/util/Makefile.ini +++ b/xc/config/util/Makefile.ini @@ -1,4 +1,4 @@ -# $XConsortium: Makefile.ini,v 1.1 93/09/30 12:07:40 rws Exp $ +# $XConsortium: Makefile.ini,v 1.2 94/04/17 14:55:28 gildea Exp $ # # A way to get lndir built the first time, before you have imake up # and running. You may well have to specify OSFLAGS=-D<something> to diff --git a/xc/config/util/aminstall.sh b/xc/config/util/aminstall.sh index 7a66e1d7e..6a8def3f3 100644 --- a/xc/config/util/aminstall.sh +++ b/xc/config/util/aminstall.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $XConsortium$ +# $XConsortium: aminstall.sh,v 1.1 94/03/29 15:54:08 gildea Exp $ # aminstall - transfer cross-compiled files to system running Amoeba. # Usage: aminstall binary-directory [-s stksz] unix-source amoeba-dest diff --git a/xc/config/util/bsdinst.sh b/xc/config/util/bsdinst.sh index c64449a3c..5bad13379 100755 --- a/xc/config/util/bsdinst.sh +++ b/xc/config/util/bsdinst.sh @@ -3,7 +3,7 @@ # # This accepts bsd-style install arguments and makes the appropriate calls # to the System V install. -# $XConsortium$ +# $XConsortium: bsdinst.sh,v 1.7 94/12/09 22:51:37 gildea Exp $ flags="" dst="" diff --git a/xc/config/util/checktree.c b/xc/config/util/checktree.c index 3b85b635c..6d477c666 100644 --- a/xc/config/util/checktree.c +++ b/xc/config/util/checktree.c @@ -1,4 +1,4 @@ -/* $XConsortium: checktree.c,v 1.6 94/03/31 11:31:39 gildea Exp $ */ +/* $XConsortium: checktree.c,v 1.7 94/04/17 20:10:40 gildea Exp $ */ /* diff --git a/xc/config/util/chownxterm.c b/xc/config/util/chownxterm.c index 920dd7173..a68e67108 100644 --- a/xc/config/util/chownxterm.c +++ b/xc/config/util/chownxterm.c @@ -1,4 +1,4 @@ -/* $XConsortium: chownxterm.c,v 1.2 94/04/13 17:02:27 gildea Exp $ */ +/* $XConsortium: chownxterm.c,v 1.3 94/04/17 20:10:41 gildea Exp $ */ /* Copyright (c) 1993, 1994 X Consortium diff --git a/xc/config/util/install.sh b/xc/config/util/install.sh index 32a2d3067..33d8e0d89 100755 --- a/xc/config/util/install.sh +++ b/xc/config/util/install.sh @@ -3,7 +3,7 @@ # # install - install a program, script, or datafile # -# $XConsortium: install.sh,v 1.1 88/11/14 09:46:24 jim Exp $ +# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ # # This script is compatible with the BSD install script, but was written # from scratch. diff --git a/xc/config/util/lndir.c b/xc/config/util/lndir.c index a1c4fb09c..9b40d3cca 100644 --- a/xc/config/util/lndir.c +++ b/xc/config/util/lndir.c @@ -1,4 +1,4 @@ -/* $XConsortium: lndir.c,v 1.13 94/04/17 20:10:42 rws Exp kaleb $ */ +/* $XConsortium: lndir.c,v 1.14 95/01/09 20:08:20 kaleb Exp $ */ /* Create shadow link tree (after X11R4 script of the same name) Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */ diff --git a/xc/config/util/lninst.sh b/xc/config/util/lninst.sh deleted file mode 100755 index efdff7970..000000000 --- a/xc/config/util/lninst.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -# -# This accepts bsd-style install arguments and simply makes symbolic links. -# - -flags="" -dst="" -src="" -dostrip="" - -while [ x$1 != x ]; do - case $1 in - -c) shift - continue;; - - -[mog]) flags="$flags $1 $2 " - shift - shift - continue;; - - -s) dostrip="strip" - shift - continue;; - - *) if [ x$src = x ] - then - src=$1 - else - dst=$1 - fi - shift - continue;; - esac -done - -if [ x$src = x ] -then - echo "syminst: no input file specified" - exit 1 -fi - -if [ x$dst = x ] -then - echo "syminst: no destination specified" - exit 1 -fi - -if [ -d $dst ]; then - rm -f $dst/`basename $src` -else - rm -f $dst -fi - -ln -s `pwd`/$src $dst diff --git a/xc/config/util/makestrs.c b/xc/config/util/makestrs.c index 7aec92e80..eab6f2685 100644 --- a/xc/config/util/makestrs.c +++ b/xc/config/util/makestrs.c @@ -1,4 +1,4 @@ -/* $XConsortium: makestrs.c,v 1.8 95/05/22 21:52:49 kaleb Exp kaleb $ */ +/* $XConsortium: makestrs.c,v 1.9 95/06/16 14:17:33 kaleb Exp $ */ /* @@ -254,7 +254,7 @@ static void WriteHeader (tagline, phile, abi) (void) fprintf (f, "%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $XConsortium: makestrs.c,v 1.8 95/05/22 21:52:49 kaleb Exp kaleb $ */", + "/* $XConsortium: makestrs.c,v 1.9 95/06/16 14:17:33 kaleb Exp $ */", "/* This file is automatically generated. */", abistring[abi]); @@ -426,7 +426,7 @@ static void WriteSource(tagline, abi) (void) printf ("%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $XConsortium: makestrs.c,v 1.8 95/05/22 21:52:49 kaleb Exp kaleb $ */", + "/* $XConsortium: makestrs.c,v 1.9 95/06/16 14:17:33 kaleb Exp $ */", "/* This file is automatically generated. */", abistring[abi]); diff --git a/xc/config/util/makestrs.man b/xc/config/util/makestrs.man index 22da33c02..925c88974 100644 --- a/xc/config/util/makestrs.man +++ b/xc/config/util/makestrs.man @@ -1,4 +1,4 @@ -.\" $XConsortium: makestrs.man,v 1.2 95/05/11 22:26:05 kaleb Exp kaleb $ +.\" $XConsortium: makestrs.man,v 1.1 95/05/11 22:30:38 kaleb Exp $ .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a diff --git a/xc/config/util/mdepend.cpp b/xc/config/util/mdepend.cpp index f64b18b01..cc224bfb2 100644 --- a/xc/config/util/mdepend.cpp +++ b/xc/config/util/mdepend.cpp @@ -1,6 +1,6 @@ XCOMM!/bin/sh XCOMM -XCOMM $XConsortium: mdepend.cpp,v 1.11 94/11/21 17:16:52 kaleb Exp gildea $ +XCOMM $XConsortium: mdepend.cpp,v 1.12 94/12/09 22:50:34 gildea Exp $ XCOMM XCOMM Do the equivalent of the 'makedepend' program, but do it right. XCOMM diff --git a/xc/config/util/mergelib.cpp b/xc/config/util/mergelib.cpp index 422b99499..1c8d3ffde 100755 --- a/xc/config/util/mergelib.cpp +++ b/xc/config/util/mergelib.cpp @@ -1,6 +1,6 @@ XCOMM!/bin/sh XCOMM -XCOMM $XConsortium: mergelib.cpp,v 1.3 91/08/22 11:08:08 rws Exp $ +XCOMM $XConsortium: mergelib.cpp,v 1.4 94/04/17 20:10:43 rws Exp $ XCOMM XCOMM Copyright (c) 1989 X Consortium XCOMM diff --git a/xc/config/util/mkdirhier.man b/xc/config/util/mkdirhier.man index c46ffd919..464099608 100644 --- a/xc/config/util/mkdirhier.man +++ b/xc/config/util/mkdirhier.man @@ -1,4 +1,4 @@ -.\" $XConsortium: mkdirhier.man,v 1.6 94/04/13 16:32:05 gildea Exp $ +.\" $XConsortium: mkdirhier.man,v 1.7 94/04/17 20:10:43 gildea Exp $ .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a diff --git a/xc/config/util/mkdirhier.sh b/xc/config/util/mkdirhier.sh index d48d10a74..889094df7 100755 --- a/xc/config/util/mkdirhier.sh +++ b/xc/config/util/mkdirhier.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $XConsortium: mkdirhier.sh,v 1.6 91/08/13 18:13:04 rws Exp $ +# $XConsortium: mkdirhier.sh,v 1.7 94/03/24 15:46:34 gildea Exp $ # Courtesy of Paul Eggert newline=' diff --git a/xc/config/util/mkshadow/Imakefile b/xc/config/util/mkshadow/Imakefile index 96b92a760..38b061412 100644 --- a/xc/config/util/mkshadow/Imakefile +++ b/xc/config/util/mkshadow/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.7 91/07/17 00:46:21 gildea Exp $ +XCOMM $XConsortium: Imakefile,v 1.1 94/04/13 18:44:40 rws Exp $ SRCS = mkshadow.c savedir.c wildmat.c OBJS = mkshadow.o savedir.o wildmat.o diff --git a/xc/config/util/mkshadow/mkshadow.c b/xc/config/util/mkshadow/mkshadow.c index f276ef95d..36f861a71 100644 --- a/xc/config/util/mkshadow/mkshadow.c +++ b/xc/config/util/mkshadow/mkshadow.c @@ -1,4 +1,4 @@ -/* $XConsortium$ */ +/* $XConsortium: mkshadow.c,v 1.1 94/04/13 18:26:53 rws Exp $ */ /* mkshadow.c - make a "shadow copy" of a directory tree with symlinks. Copyright 1990, 1993 Free Software Foundation, Inc. diff --git a/xc/config/util/mkshadow/savedir.c b/xc/config/util/mkshadow/savedir.c index d14787ce6..28ae884c0 100644 --- a/xc/config/util/mkshadow/savedir.c +++ b/xc/config/util/mkshadow/savedir.c @@ -1,4 +1,4 @@ -/* $XConsortium$ */ +/* $XConsortium: savedir.c,v 1.1 94/04/13 18:26:54 rws Exp $ */ /* savedir.c -- save the list of files in a directory in a string Copyright 1990, 1993 Free Software Foundation, Inc. diff --git a/xc/config/util/mkshadow/wildmat.c b/xc/config/util/mkshadow/wildmat.c index 901ac45e9..2e408e902 100644 --- a/xc/config/util/mkshadow/wildmat.c +++ b/xc/config/util/mkshadow/wildmat.c @@ -1,4 +1,4 @@ -/* $XConsortium: wildmat.c,v 1.1 94/04/13 18:26:56 rws Exp $ */ +/* $XConsortium: wildmat.c,v 1.2 94/04/13 18:40:59 rws Exp $ */ /* ** ** Do shell-style pattern matching for ?, \, [], and * characters. diff --git a/xc/config/util/xmkmf.cpp b/xc/config/util/xmkmf.cpp index 87aacfaec..048cf62bd 100644 --- a/xc/config/util/xmkmf.cpp +++ b/xc/config/util/xmkmf.cpp @@ -3,7 +3,7 @@ XCOMM!/bin/sh XCOMM XCOMM make a Makefile from an Imakefile from inside or outside the sources XCOMM -XCOMM $XConsortium: xmkmf.cpp,v 1.20 94/03/28 16:08:04 gildea Exp gildea $ +XCOMM $XConsortium: xmkmf.cpp,v 1.21 94/11/10 21:59:20 gildea Exp $ usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" diff --git a/xc/config/util/xmkmf.man b/xc/config/util/xmkmf.man index 5bfc18065..2bbb0cab9 100644 --- a/xc/config/util/xmkmf.man +++ b/xc/config/util/xmkmf.man @@ -1,4 +1,4 @@ -.\" $XConsortium: xmkmf.man,v 1.5 94/04/13 16:30:14 gildea Exp $ +.\" $XConsortium: xmkmf.man,v 1.6 94/04/17 20:10:44 gildea Exp $ .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a |