diff -rc nistnet.2.0.12/Config nistnet.2.0.12-deterministic/Config *** nistnet.2.0.12/Config Mon Jun 10 22:12:02 2002 --- nistnet.2.0.12-deterministic/Config Mon Oct 27 12:59:35 2003 *************** *** 9,15 **** .EXPORT_ALL_VARIABLES: # 1. This should point to the top of the Linux kernel source tree: ! TOPDIR = /usr/src/linux HPATH = $(TOPDIR)/include # 2. Device node names and major numbers -- edit here and recompile if needed --- 9,15 ---- .EXPORT_ALL_VARIABLES: # 1. This should point to the top of the Linux kernel source tree: ! TOPDIR = /lib/modules/2.4.20/build HPATH = $(TOPDIR)/include # 2. Device node names and major numbers -- edit here and recompile if needed *************** *** 29,35 **** # a. By default, we include ECN (explicit congestion notification) setting # support, but not COS (class of service) selection support. Change them # here if you wish. ! ECN = -DCONFIG_ECN COS = # -DCONFIG_COS # b. How do you want to do bandwidth delays? Bandwidth delays amount to --- 29,35 ---- # a. By default, we include ECN (explicit congestion notification) setting # support, but not COS (class of service) selection support. Change them # here if you wish. ! ECN = # -DCONFIG_ECN COS = # -DCONFIG_COS # b. How do you want to do bandwidth delays? Bandwidth delays amount to diff -rc nistnet.2.0.12/Makefile nistnet.2.0.12-deterministic/Makefile *** nistnet.2.0.12/Makefile Fri Jun 7 19:56:16 2002 --- nistnet.2.0.12-deterministic/Makefile Mon Oct 27 12:59:35 2003 *************** *** 11,21 **** .EXPORT_ALL_VARIABLES: # This should point to the top of the Linux kernel source tree: ! TOPDIR = /usr/src/linux HPATH = $(TOPDIR)/include # The order here is important!! ! SUB_DIRS = math lib cli monitor kernel man #include $(TOPDIR)/.config --- 11,22 ---- .EXPORT_ALL_VARIABLES: # This should point to the top of the Linux kernel source tree: ! TOPDIR = /usr/usr/linux HPATH = $(TOPDIR)/include # The order here is important!! ! SUB_DIRS = math lib cli kernel man ! # monitor #include $(TOPDIR)/.config diff -rc nistnet.2.0.12/cli/cnistnet.c nistnet.2.0.12-deterministic/cli/cnistnet.c *** nistnet.2.0.12/cli/cnistnet.c Tue Mar 13 23:10:48 2001 --- nistnet.2.0.12-deterministic/cli/cnistnet.c Mon Oct 27 12:59:35 2003 *************** *** 49,54 **** --- 49,56 ---- [--dup dup_percentage[/dup_correlation]]\n\ [--bandwidth bandwidth]\n\ [--drd drdmin drdmax [drdcongest]]\n\ + [--cdrop constant_drop_rate]\n\ + [--qlen queuelen]\n\ -r src[:port[.prot]] dest[:port[.prot]] [cos] remove\n\ -s src[:port[.prot]] dest[:port[.prot]] [cos] see stats\n\ -S src[:port[.prot]] dest[:port[.prot]] [cos] see stats continuously\n\ *************** *** 246,251 **** --- 248,291 ---- } int + readcdrop(struct addparam *addargs, int optind, int argc, char *argv[]) + { + double dvalue; + int last_index=optind; + + if (optind >= argc || !isfloat(argv[optind], &dvalue)) + Usage(6); + addargs->cdrop = dvalue; + /* Now check for whether dropcorr specified */ + + /* if (optind+1 < argc && isfloat(argv[optind+1], &dvalue)) { + addargs->dropcorr = readcorr(&argv[optind+1], argv[optind], 1); + last_index = optind+1; + } else { + addargs->dropcorr = readcorr(NULL, argv[optind], 1); + last_index = optind; + }*/ + + return last_index; + } + + int + readqueuelen(struct addparam *addargs, int optind, int argc, char *argv[]) + { + int value; + int last_index=optind; + + if (optind >= argc || !isinteger(argv[optind], &value)) + Usage(12); + if (value < 0) { + fprintf(stderr, "Queuelen cannot be negative\n"); + Usage(13); + } + addargs->queuelen = value; + return last_index; + } + + int readdup(struct addparam *addargs, int optind, int argc, char *argv[]) { double dvalue; *************** *** 377,382 **** --- 417,426 ---- #define OPTION_FLUSH 16 {"help", 0, 0, 'h'}, #define OPTION_HELP 17 + {"cdrop", 0, 0, 0}, + #define OPTION_CDROP 18 + {"qlen", 0, 0, 0}, + #define OPTION_QUEUELEN 19 }; static struct srcdestprot sdpargs; static struct addparam addargs; *************** *** 409,414 **** --- 453,464 ---- break; case OPTION_DROP: optind = readdrop(&addargs, optind, argc, argv); + break; + case OPTION_CDROP: + optind = readcdrop(&addargs, optind, argc, argv); + break; + case OPTION_QUEUELEN: + optind = readqueuelen(&addargs, optind, argc, argv); break; case OPTION_DUP: optind = readdup(&addargs, optind, argc, argv); diff -rc nistnet.2.0.12/include/nistnet.h nistnet.2.0.12-deterministic/include/nistnet.h *** nistnet.2.0.12/include/nistnet.h Mon Jul 23 21:24:18 2001 --- nistnet.2.0.12-deterministic/include/nistnet.h Mon Oct 27 12:59:35 2003 *************** *** 18,23 **** --- 18,25 ---- unsigned int delay; /* mean delay on packets in microseconds */ unsigned int delsigma; /* standard deviation on delay in usecs */ unsigned int bandwidth; /* max bandwidth (bytes/sec) on this pair */ + unsigned int queuelen; /* max queuelen (packets) on this pair */ + unsigned int cdrop; /* constant drop rate */ unsigned long qsize; /* unused; here only for compatibility */ /* We actually implement the simpler DRD algorithm rather than RED, diff -rc nistnet.2.0.12/include/nistnet_table.h nistnet.2.0.12-deterministic/include/nistnet_table.h *** nistnet.2.0.12/include/nistnet_table.h Wed Mar 14 15:57:11 2001 --- nistnet.2.0.12-deterministic/include/nistnet_table.h Mon Oct 27 12:59:35 2003 *************** *** 85,90 **** --- 85,92 ---- struct lin_hitstats lteStats; /* Destructuring defines */ #define lteBandwidth lteStats.hitreq.bandwidth + #define lteQueuelen lteStats.hitreq.queuelen + #define lteCdrop lteStats.hitreq.cdrop #define lteDRDCongestion lteStats.hitreq.drd_congestion #define lteDRDMax lteStats.hitreq.drd_max #define lteDRDMin lteStats.hitreq.drd_min diff -rc nistnet.2.0.12/include/nistnetutil.h nistnet.2.0.12-deterministic/include/nistnetutil.h *** nistnet.2.0.12/include/nistnetutil.h Thu Feb 15 17:22:52 2001 --- nistnet.2.0.12-deterministic/include/nistnetutil.h Mon Oct 27 12:59:35 2003 *************** *** 19,27 **** --- 19,29 ---- double dup; /* dup percentage (0-100) */ double dupcorr; int bandwidth; /* bandwidth in bytes/second */ + int queuelen; /* queuelen in packets */ int drdmin; int drdmax; int drdcongest; + double cdrop; }; struct addparamstring { /* the string form of the above */ *************** *** 33,41 **** --- 35,45 ---- char * sdup; char * sdupcorr; char * sbandwidth; + char * squeuelen; char * sdrdmin; char * sdrdmax; char * sdrdcongest; + char * scdrop; }; #define ARG_SOURCE 0 *************** *** 53,61 **** --- 57,67 ---- int util_parsehitname(struct srcdestprot *sdpargs, int argtype, char *name); int util_printhitname(struct srcdestprot *sdpargs, int argtype, char *name); int util_readbandwidth(struct addparam *addargs, struct addparamstring *stringargs, int print); + int util_readqueuelen(struct addparam *addargs, struct addparamstring *stringargs, int print); int util_readdelay(struct addparam *addargs, struct addparamstring *stringargs, int print); int util_readdrd(struct addparam *addargs, struct addparamstring *stringargs, int print); int util_readdrop(struct addparam *addargs, struct addparamstring *stringargs, int print); + int util_readcdrop(struct addparam *addargs, struct addparamstring *stringargs, int print); int util_readdup(struct addparam *addargs, struct addparamstring *stringargs, int print); int util_readhit(void); int util_readnistnet(int donum, int timeout); diff -rc nistnet.2.0.12/kernel/knistnet.c nistnet.2.0.12-deterministic/kernel/knistnet.c *** nistnet.2.0.12/kernel/knistnet.c Thu May 16 20:18:36 2002 --- nistnet.2.0.12-deterministic/kernel/knistnet.c Mon Oct 27 12:59:35 2003 *************** *** 648,662 **** * * Return 1 if packet is to be dropped, 0 otherwise. */ int packet_drop(NistnetTablePtr tableme, int *use_drd, int *use_ecn) { struct lin_hitstats *hitme; int value; ! hitme = &tableme->ltEntry.lteStats; *use_drd=0; *use_ecn=0; if (hitme->hitreq.drd_max) { /* using DRD */ unsigned int stretch = DRDLIMIT/(hitme->hitreq.drd_max-hitme->hitreq.drd_min); --- 648,690 ---- * * Return 1 if packet is to be dropped, 0 otherwise. */ + int packet_drop(NistnetTablePtr tableme, int *use_drd, int *use_ecn) { struct lin_hitstats *hitme; int value; ! // static int jdrop=0; ! static int tfirst=1; ! static struct timeval t1; ! struct timeval t2; ! hitme = &tableme->ltEntry.lteStats; *use_drd=0; *use_ecn=0; + + // dropnu pokud je v queue vic jak queuelen paketu + if(hitme->hitreq.queuelen && hitme->qlen>hitme->hitreq.queuelen) return 1; + // cdrop=0 nic + // cdrop>0 kazdych cdrop us packet pryc + if(tfirst) { + tfirst=0; + fixed_gettimeofday(&t1); + } + if(hitme->hitreq.cdrop) { + fixed_gettimeofday(&t2); + if(timeval_diff(&t2,&t1)>=hitme->hitreq.cdrop) { + // timeval_add(&t1,hitme->hitreq.cdrop); // pri malym intervalu to muze spadnout do dropovani na 100% + t1=t2; + return 1; + } + /* jdrop++; + if(jdrop>=hitme->hitreq.cdrop) { + jdrop=0; + return 1; + } */ + } + if (hitme->hitreq.drd_max) { /* using DRD */ unsigned int stretch = DRDLIMIT/(hitme->hitreq.drd_max-hitme->hitreq.drd_min); diff -rc nistnet.2.0.12/lib/nistnetutil.c nistnet.2.0.12-deterministic/lib/nistnetutil.c *** nistnet.2.0.12/lib/nistnetutil.c Tue Mar 13 23:10:23 2001 --- nistnet.2.0.12-deterministic/lib/nistnetutil.c Mon Oct 27 12:59:35 2003 *************** *** 118,124 **** delay %s (sigma %s corr %s),\n\ bandwidth %s, drop %s (corr %s),\n\ dup %s (corr %s),\n\ ! drdmin %s, drdmax %s, drdcongest %s\n", who->src, who->srcport ? who->srcport : "0", who->dest, --- 118,126 ---- delay %s (sigma %s corr %s),\n\ bandwidth %s, drop %s (corr %s),\n\ dup %s (corr %s),\n\ ! drdmin %s, drdmax %s, drdcongest %s\n\ ! cdrop %s\n\ ! queuelen %s\n", who->src, who->srcport ? who->srcport : "0", who->dest, *************** *** 128,134 **** what->sdelay, what->sdelsigma, what->sdelcorr, what->sbandwidth, what->sdrop, what->sdropcorr, what->sdup, what->sdupcorr, ! what->sdrdmin, what->sdrdmax, what->sdrdcongest); ret = util_stringtonistnet(who, what, addme, timeout); if (ret < 0 && print) herror("util_addnistnet: can't convert"); --- 130,137 ---- what->sdelay, what->sdelsigma, what->sdelcorr, what->sbandwidth, what->sdrop, what->sdropcorr, what->sdup, what->sdupcorr, ! what->sdrdmin, what->sdrdmax, what->sdrdcongest, ! what->scdrop,what->squeuelen); ret = util_stringtonistnet(who, what, addme, timeout); if (ret < 0 && print) herror("util_addnistnet: can't convert"); *************** *** 154,160 **** delay %8.6f (sigma %8.6f corr %8.6f),\n\ bandwidth %d, drop %8.6f (corr %8.6f),\n\ dup %8.6f (corr %8.6f),\n\ ! drdmin %d, drdmax %d, drdcongest %d\n", who->src, who->srcport ? who->srcport : "0", who->dest, --- 157,165 ---- delay %8.6f (sigma %8.6f corr %8.6f),\n\ bandwidth %d, drop %8.6f (corr %8.6f),\n\ dup %8.6f (corr %8.6f),\n\ ! drdmin %d, drdmax %d, drdcongest %d\n\ ! cdrop %8.6f\n\ ! queuelen %d\n", who->src, who->srcport ? who->srcport : "0", who->dest, *************** *** 164,170 **** what->delay, what->delsigma, what->delcorr, what->bandwidth, what->drop, what->dropcorr, what->dup, what->dupcorr, ! what->drdmin, what->drdmax, what->drdcongest); ret = util_binstringtonistnet(who, what, addme, timeout); if (ret < 0 && print) herror("util_binaddnistnet: can't convert"); --- 169,176 ---- what->delay, what->delsigma, what->delcorr, what->bandwidth, what->drop, what->dropcorr, what->dup, what->dupcorr, ! what->drdmin, what->drdmax, what->drdcongest, ! what->cdrop,what->queuelen); ret = util_binstringtonistnet(who, what, addme, timeout); if (ret < 0 && print) herror("util_binaddnistnet: can't convert"); *************** *** 348,353 **** --- 354,367 ---- if (littleguy.lteDropCorrelate) printf("/%s", what.sdropcorr); } + /* CDrop */ + if (littleguy.lteCdrop) { + printf(" --cdrop %s", what.scdrop); + } + /* Queuelen */ + if (littleguy.lteQueuelen) { + printf(" --qlen %s", what.squeuelen); + } /* Dup */ if (littleguy.lteDup) { printf(" --dup %s", what.sdup); *************** *** 771,776 **** --- 785,820 ---- } int + util_readcdrop(struct addparam *addargs, struct addparamstring *stringargs, int print) + { + double dvalue; + + if (!util_isfloat(stringargs->scdrop, &dvalue)) + return -1; + if (dvalue < 0 || dvalue > 100) { + if (print) fprintf(stderr, "Drop percentage must be between 0 and 100\n"); + return -1; + } + addargs->cdrop = dvalue; + return 0; + } + + int + util_readqueuelen(struct addparam *addargs, struct addparamstring *stringargs, int print) + { + int value; + + if (!util_isinteger(stringargs->squeuelen, &value)) + return -1; + if (value < 0) { + if (print) fprintf(stderr, "Queuelen cannot be negative\n"); + return -1; + } + addargs->queuelen = value; + return 0; + } + + int util_readdup(struct addparam *addargs, struct addparamstring *stringargs, int print) { double dvalue; *************** *** 882,887 **** --- 926,933 ---- /* The rest are OK as is */ tonistnet->lteBandwidth = what->bandwidth; + tonistnet->lteQueuelen = what->queuelen; + tonistnet->lteCdrop = what->cdrop; tonistnet->lteDRDMin = what->drdmin; tonistnet->lteDRDMax = what->drdmax; tonistnet->lteDRDCongestion = what->drdcongest; *************** *** 1008,1013 **** --- 1054,1061 ---- util_readdrop(&binwhat, what, print)+ util_readdup(&binwhat, what, print)+ util_readbandwidth(&binwhat, what, print)+ + util_readqueuelen(&binwhat, what, print)+ + util_readcdrop(&binwhat,what,print)+ util_readdrd(&binwhat, what, print); MakeDistributedStats(binwhat.delay*MILLITOMU, binwhat.delsigma*MILLITOMU, binwhat.delcorr, *************** *** 1024,1029 **** --- 1072,1079 ---- /* The rest are OK as is */ tonistnet->lteBandwidth = binwhat.bandwidth; + tonistnet->lteQueuelen = binwhat.queuelen; + tonistnet->lteCdrop = binwhat.cdrop; tonistnet->lteDRDMin = binwhat.drdmin; tonistnet->lteDRDMax = binwhat.drdmax; tonistnet->lteDRDCongestion = binwhat.drdcongest; *************** *** 1186,1191 **** --- 1236,1243 ---- what->sdupcorr = malsprintf("%7.6f", corr); what->sbandwidth = malsprintf("%d", nistnet->lteBandwidth); + what->squeuelen = malsprintf("%d", nistnet->lteQueuelen); + what->scdrop = malsprintf("%5.4f", nistnet->lteCdrop); what->sdrdmin = malsprintf("%d", nistnet->lteDRDMin); what->sdrdmax = malsprintf("%d", nistnet->lteDRDMax); *************** *** 1221,1226 **** --- 1273,1281 ---- what->dupcorr = corr; what->bandwidth = nistnet->lteBandwidth; + what->queuelen = nistnet->lteQueuelen; + what->cdrop = nistnet->lteCdrop; + what->drdmin = nistnet->lteDRDMin; what->drdmax = nistnet->lteDRDMax; what->drdcongest = nistnet->lteDRDCongestion; Only in nistnet.2.0.12/monitor/Frame-1.0: Framedemo diff -rc nistnet.2.0.12/monitor/Frame-1.0/Makefile nistnet.2.0.12-deterministic/monitor/Frame-1.0/Makefile *** nistnet.2.0.12/monitor/Frame-1.0/Makefile Mon Jun 10 22:11:51 2002 --- nistnet.2.0.12-deterministic/monitor/Frame-1.0/Makefile Mon Oct 27 12:59:35 2003 *************** *** 2,8 **** # $Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ # ---------------------------------------------------------------------- ! # Makefile generated from "Imake.tmpl" and # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ # # --- 2,8 ---- # $Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ # ---------------------------------------------------------------------- ! # Makefile generated from "Imake.tmpl" and # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ # # *************** *** 17,23 **** # $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ ! # $XFree86: xc/config/cf/Imake.cf,v 3.67 2001/04/18 17:13:58 dawes Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 --- 17,23 ---- # $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ ! # $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/18 16:13:17 dawes Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 *************** *** 29,53 **** # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ ! # $XFree86: xc/config/cf/xf86site.def,v 3.173 2001/04/05 19:29:36 dawes Exp $ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change # platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! # platform: $XFree86: xc/config/cf/linux.cf,v 3.165.2.1 2001/06/01 02:24:14 dawes Exp $ ! # operating system: Linux 2.4.12 i686 [ELF] (2.4.12) ! # libc: (6.2.3) ! # binutils: (31) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ ! # $XFree86: xc/config/cf/xfree86.cf,v 3.360.2.1 2001/05/22 21:25:40 dawes Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ --- 29,53 ---- # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $ ! # $XFree86: xc/config/cf/xf86site.def,v 3.172 2001/02/26 18:27:56 dawes Exp $ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change # platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! # platform: $XFree86: xc/config/cf/linux.cf,v 3.165 2001/04/19 19:54:43 dawes Exp $ ! # operating system: Linux 2.4.20 i686 [ELF] (2.4.20) ! # libc: (6.2.5) ! # binutils: (32) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ ! # $XFree86: xc/config/cf/xfree86.cf,v 3.360 2001/05/19 00:26:41 dawes Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ *************** *** 71,77 **** # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ ! # $XFree86: xc/config/cf/xf86.rules,v 3.33 2001/01/17 16:38:51 dawes Exp $ # ---------------------------------------------------------------------- # site-specific configuration parameters that go after --- 71,77 ---- # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ ! # $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $ # ---------------------------------------------------------------------- # site-specific configuration parameters that go after *************** *** 79,85 **** # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files --- 79,85 ---- # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files *************** *** 88,108 **** # # # ! # rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawes Exp $ _NULLCMD_ = @ echo -n ! GLIDE2INCDIR = ! GLIDE3INCDIR = ! GLIDE3LIBNAME = ! TKLIBNAME = tk TKLIBDIR = /usr/lib ! TCLLIBNAME = tcl TCLIBDIR = /usr/lib --- 88,108 ---- # # # ! # rules: $XFree86: xc/config/cf/Imake.rules,v 3.94.2.1 2001/07/28 15:06:39 dawes Exp $ _NULLCMD_ = @ echo -n ! GLIDE2INCDIR = /usr/include/glide ! GLIDE3INCDIR = /usr/include/glide3 ! GLIDE3LIBNAME = glide3 ! TKLIBNAME = tk8.3 TKLIBDIR = /usr/lib ! TCLLIBNAME = tcl8.3 TCLIBDIR = /usr/lib *************** *** 117,124 **** MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = ! RMAN = rman ! RMANOPTIONS = -f HTML CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util --- 117,124 ---- MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = ! RMAN = RmanCmd ! RMANOPTIONS = RmanOptions CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util *************** *** 199,205 **** DRIVERMANSUFFIX = 4 MANSRCSUFFIX = man MANNEWSUFFIX = _man ! MANDEFS = -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = gzip -n --- 199,205 ---- DRIVERMANSUFFIX = 4 MANSRCSUFFIX = man MANNEWSUFFIX = _man ! MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = gzip -n *************** *** 214,227 **** COLFLAGS = -b MODCC = gcc MODCPP = /lib/cpp ! MODCFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREAD_CFLAGS) $(ALLDEFINES) MODAS = as MODASFLAGS = MODLD = ld MODLDFLAGS = MODLDCOMBINEFLAGS = -r MODAR = ar clq ! MODRANLIB = STD_INCLUDES = STD_CPP_OPTIONS = -traditional --- 214,230 ---- COLFLAGS = -b MODCC = gcc MODCPP = /lib/cpp ! MODCFLAGS = $(CFLAGS) MODAS = as MODASFLAGS = MODLD = ld MODLDFLAGS = MODLDCOMBINEFLAGS = -r MODAR = ar clq ! MODRANLIB = ranlib ! ! DVIPS = dvips ! LATEX = latex STD_INCLUDES = STD_CPP_OPTIONS = -traditional *************** *** 283,293 **** # Not sure this belongs here TKLIBDIR = /usr/lib TKINCDIR = /usr/include ! TKLIBNAME = tk TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) TCLLIBDIR = /usr/lib TCLINCDIR = /usr/include ! TCLLIBNAME = tcl TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) MACROFILE = linux.cf --- 286,296 ---- # Not sure this belongs here TKLIBDIR = /usr/lib TKINCDIR = /usr/include ! TKLIBNAME = tk8.3 TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) TCLLIBDIR = /usr/lib TCLINCDIR = /usr/include ! TCLLIBNAME = tcl8.3 TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) MACROFILE = linux.cf *************** *** 300,316 **** ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) - # $TOG: Motif.rules /main/4 1998/02/06 10:53:37 kaleb $ - - # $Id: LessTif.rules,v 1.2 2000/08/29 21:59:19 dannybackx Exp $ - # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ ! # $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ ! ! # $TOG: Motif.tmpl /main/5 1998/02/06 10:53:46 kaleb $ ! ! # $Id: LessTif.tmpl.in,v 1.3 2001/03/26 19:12:10 amai Exp $ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules --- 303,311 ---- 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ ! # $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules *************** *** 319,331 **** # # # ! # $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.3 2001/06/01 02:24:14 dawes Exp $ XORGRELSTRING = Release 6.5 XORGMANNAME = X Version 11 VENDORMANNAME = XFree86 ! VENDORMANVERSION = Version 4.1.0 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT --- 314,326 ---- # # # ! # $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.2 2001/05/29 18:21:57 dawes Exp $ XORGRELSTRING = Release 6.5 XORGMANNAME = X Version 11 VENDORMANNAME = XFree86 ! VENDORMANVERSION = Version 4.1.0.1 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT *************** *** 376,382 **** LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver ! XAPPLOADDIR = $(LIBDIR)/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) --- 371,377 ---- LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver ! XAPPLOADDIR = /etc/X11/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) *************** *** 390,396 **** BDFTRUNCATE = $(BINDIR)/bdftruncate.pl UCSMAPPREFIX = $(FONTDIR)/util/map- ! HTMLINDEXCMD = $(MKHTMLINDEX) DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients --- 385,391 ---- BDFTRUNCATE = $(BINDIR)/bdftruncate.pl UCSMAPPREFIX = $(FONTDIR)/util/map- ! HTMLINDEXCMD = HtmlIndexCmd DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients *************** *** 426,432 **** VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' XENVLIBDIR = $(USRLIBDIR) ! CLIENTENVSETUP = LD_LIBRARY_PATH=$(MOTIFENVLIBDIR):$(XENVLIBDIR) # $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ --- 421,427 ---- VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' XENVLIBDIR = $(USRLIBDIR) ! CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) # $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ *************** *** 723,736 **** FONTLIBSRC = $(LIBSRC)/font ! SOFONTREV = 1.3 ! DEPFONTLIB = FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln # ! SOFONTREV = 1.3 ! DEPXFONTLIB = XFONTLIB = -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln --- 718,729 ---- FONTLIBSRC = $(LIBSRC)/font ! DEPFONTLIB = $(USRLIBDIR)/libXfont.a FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln # ! DEPXFONTLIB = $(USRLIBDIR)/libXfont.a XFONTLIB = -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln *************** *** 760,771 **** LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln ! FREETYPE2INCLUDES=$(TOP_X_INCLUDES)/freetype2 ! FREETYPE2DEFINES=-DFREETYPE2 XFTLIBSRC = $(LIBSRC)/Xft ! SOXFTREV = 1.0 DEPXFTLIB = XFTLIB = -lXft --- 753,768 ---- LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln ! FREETYPE2DIR = /usr ! FREETYPE2LIBDIR = /usr/lib ! FREETYPE2INCDIR = /usr/include/freetype2 ! FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) ! FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype ! FREETYPE2DEFINES = -DFREETYPE2 XFTLIBSRC = $(LIBSRC)/Xft ! SOXFTREV = 1.1 DEPXFTLIB = XFTLIB = -lXft *************** *** 800,906 **** DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) - MTOP = $(TOP) - TOP_MOTIF_INCLUDES = - - UIL_INCLUDES = -I$(USRINCDIR)/uil - - MOTIFENVLIBDIR = $(USRLIBDIR) - - USRINCDIR = /usr/X11R6/include - UIDDIR = $(LIBDIR)/uid - TESTSRC = $(MTOP)/tests - TESTLIB = $(TESTSRC)/lib - GENERALSRCLIB = $(TESTSRC)/General/lib - GENERALSRCBIN = $(TESTSRC)/General/bin - MANUALSRCLIB = $(TESTSRC)/Manual/lib - MANUALSRCBIN = $(TESTSRC)/Manual/bin - AUTOSRCLIB = $(TESTSRC)/Auto/lib - AUTOSRCBIN = $(TESTSRC)/Auto/bin - COMMONPP = $(GENERALSRCBIN)/Commonpp - GENRUN = $(GENERALSRCBIN)/Genrun - MANRUN = $(GENERALSRCBIN)/Manrun - - TESTCOMSRC = $(MANUALSRCLIB)/Common - - BUILDDOCDIR = $(BUILDINCROOT)/doc - BUILDLOCDIR = $(BUILDINCROOT)/localized - - MTOOLKITSRC = $(TOOLKITSRC) - - MINCLUDESRC = $(MTOP)/include - MDOCSRC = $(MTOP)/doc - MLOCSRC = $(MTOP)/localized - - MLIBSRC = $(MTOP)/lib - MCLIENTSRC = $(MTOP)/clients - MDEMOSRC = $(MTOP)/demos - MWIDGETSRC = $(MLIBSRC)/Xm - MRESOURCESRC = $(MLIBSRC)/Mrm - UILSRC = $(MCLIENTSRC)/uil - - UIL = uil - DEPUIL = $(BINDIR)/uil - - XMEXTRA_LIBS = - - SOXMREV = 2.0 - DEPXMLIB = - XMLIB = -lXm - - LINTXM = $(LINTLIBDIR)/llib-lXm.ln - - SOMRMREV = 2.0 - DEPMRESOURCELIB = - MRESOURCELIB = -lMrm - - LINTMRESOURCE = $(LINTLIBDIR)/llib-lMrm.ln - - SOUILREV = 2.0 - DEPUILLIB = - UILLIB = -lUil - - LINTUIL = $(LINTLIBDIR)/llib-lUil.ln - - SOMCOMMONREV = 2.0 - DEPTESTCOMLIB = - TESTCOMLIB = -lMCommon - - LINTTESTCOM = $(LINTLIBDIR)/llib-lMCommon.ln - - TESTUILCOMLIB = $(TESTCOMSRC)/libMCommonUil.a - - LINTMRESOURCE = $(MRESOURCESRC)/libMrm.a - LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln - LINTXMTOOL = $(MTOOLKITSRC)/llib-lXt.ln - LINTUILLIB = $(UILSRC)/llib-lUil.ln - - YACCFLAGS = - UILFLAGS = - GENCATFLAGS = - GENCAT = gencat $(GENCATFLAGS) - MKCATTOOL = $(MLOCSRC)/util/mkcatdefs - - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut *.Dat - - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) ! LDPRELIBS = -L$(USRLIBDIR) LDPOSTLIBS = ! TOP_INCLUDES = $(TOP_MOTIF_INCLUDES) -I$(INCROOT) $(TOP_X_INCLUDES) ! PROJECT_DEFINES = -DNO_MESSAGE_CATALOG ! CXXPROJECT_DEFINES = -DNO_MESSAGE_CATALOG # ---------------------------------------------------------------------- # start of Imakefile --- 797,814 ---- DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) ! LDPRELIBS = -L$(USRLIBDIR) LDPOSTLIBS = ! TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) ! PROJECT_DEFINES = ! CXXPROJECT_DEFINES = # ---------------------------------------------------------------------- # start of Imakefile *************** *** 926,933 **** $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) install:: framedemo ! @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ ! else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) framedemo $(DESTDIR)$(BINDIR)/framedemo depend:: --- 834,847 ---- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) install:: framedemo ! @if [ -d $(DESTDIR)$(BINDIR) ]; then \ ! set +x; \ ! else \ ! if [ -h $(DESTDIR)$(BINDIR) ]; then \ ! (set -x; rm -f $(DESTDIR)$(BINDIR)); \ ! fi; \ ! (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \ ! fi $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) framedemo $(DESTDIR)$(BINDIR)/framedemo depend:: *************** *** 972,978 **** man_keywords:: html_index:: - $(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR) clean:: cleandir --- 886,891 ---- Only in nistnet.2.0.12-deterministic/monitor/Frame-1.0: Makefile.bak diff -rc nistnet.2.0.12/monitor/Imakefile nistnet.2.0.12-deterministic/monitor/Imakefile *** nistnet.2.0.12/monitor/Imakefile Mon Jun 10 22:11:49 2002 --- nistnet.2.0.12-deterministic/monitor/Imakefile Mon Oct 27 12:59:35 2003 *************** *** 25,31 **** # 2. -lXaw3d - default choice, ok appearance, but odd mouse behavior # 3. -lXaw - original Xaw widget set, for the hardcore only # Set your choice here: ! OURXAWLIB = -lneXtaw # Recursive stuff #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' --- 25,31 ---- # 2. -lXaw3d - default choice, ok appearance, but odd mouse behavior # 3. -lXaw - original Xaw widget set, for the hardcore only # Set your choice here: ! OURXAWLIB = -lXaw # Recursive stuff #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' diff -rc nistnet.2.0.12/monitor/Makefile nistnet.2.0.12-deterministic/monitor/Makefile *** nistnet.2.0.12/monitor/Makefile Mon Jun 10 22:11:50 2002 --- nistnet.2.0.12-deterministic/monitor/Makefile Mon Oct 27 12:59:35 2003 *************** *** 2,8 **** # $Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ # ---------------------------------------------------------------------- ! # Makefile generated from "Imake.tmpl" and # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ # # --- 2,8 ---- # $Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ # ---------------------------------------------------------------------- ! # Makefile generated from "Imake.tmpl" and # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ # # *************** *** 17,23 **** # $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ ! # $XFree86: xc/config/cf/Imake.cf,v 3.67 2001/04/18 17:13:58 dawes Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 --- 17,23 ---- # $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ ! # $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/18 16:13:17 dawes Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 *************** *** 29,53 **** # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ ! # $XFree86: xc/config/cf/xf86site.def,v 3.173 2001/04/05 19:29:36 dawes Exp $ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change # platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! # platform: $XFree86: xc/config/cf/linux.cf,v 3.165.2.1 2001/06/01 02:24:14 dawes Exp $ ! # operating system: Linux 2.4.12 i686 [ELF] (2.4.12) ! # libc: (6.2.3) ! # binutils: (31) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ ! # $XFree86: xc/config/cf/xfree86.cf,v 3.360.2.1 2001/05/22 21:25:40 dawes Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ --- 29,53 ---- # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $ ! # $XFree86: xc/config/cf/xf86site.def,v 3.172 2001/02/26 18:27:56 dawes Exp $ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change # platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! # platform: $XFree86: xc/config/cf/linux.cf,v 3.165 2001/04/19 19:54:43 dawes Exp $ ! # operating system: Linux 2.4.20 i686 [ELF] (2.4.20) ! # libc: (6.2.5) ! # binutils: (32) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ ! # $XFree86: xc/config/cf/xfree86.cf,v 3.360 2001/05/19 00:26:41 dawes Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ *************** *** 71,77 **** # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ ! # $XFree86: xc/config/cf/xf86.rules,v 3.33 2001/01/17 16:38:51 dawes Exp $ # ---------------------------------------------------------------------- # site-specific configuration parameters that go after --- 71,77 ---- # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ ! # $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $ # ---------------------------------------------------------------------- # site-specific configuration parameters that go after *************** *** 79,85 **** # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files --- 79,85 ---- # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files *************** *** 88,108 **** # # # ! # rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawes Exp $ _NULLCMD_ = @ echo -n ! GLIDE2INCDIR = ! GLIDE3INCDIR = ! GLIDE3LIBNAME = ! TKLIBNAME = tk TKLIBDIR = /usr/lib ! TCLLIBNAME = tcl TCLIBDIR = /usr/lib --- 88,108 ---- # # # ! # rules: $XFree86: xc/config/cf/Imake.rules,v 3.94.2.1 2001/07/28 15:06:39 dawes Exp $ _NULLCMD_ = @ echo -n ! GLIDE2INCDIR = /usr/include/glide ! GLIDE3INCDIR = /usr/include/glide3 ! GLIDE3LIBNAME = glide3 ! TKLIBNAME = tk8.3 TKLIBDIR = /usr/lib ! TCLLIBNAME = tcl8.3 TCLIBDIR = /usr/lib *************** *** 117,124 **** MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = ! RMAN = rman ! RMANOPTIONS = -f HTML CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util --- 117,124 ---- MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = ! RMAN = RmanCmd ! RMANOPTIONS = RmanOptions CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util *************** *** 199,205 **** DRIVERMANSUFFIX = 4 MANSRCSUFFIX = man MANNEWSUFFIX = _man ! MANDEFS = -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = gzip -n --- 199,205 ---- DRIVERMANSUFFIX = 4 MANSRCSUFFIX = man MANNEWSUFFIX = _man ! MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = gzip -n *************** *** 214,227 **** COLFLAGS = -b MODCC = gcc MODCPP = /lib/cpp ! MODCFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREAD_CFLAGS) $(ALLDEFINES) MODAS = as MODASFLAGS = MODLD = ld MODLDFLAGS = MODLDCOMBINEFLAGS = -r MODAR = ar clq ! MODRANLIB = STD_INCLUDES = STD_CPP_OPTIONS = -traditional --- 214,230 ---- COLFLAGS = -b MODCC = gcc MODCPP = /lib/cpp ! MODCFLAGS = $(CFLAGS) MODAS = as MODASFLAGS = MODLD = ld MODLDFLAGS = MODLDCOMBINEFLAGS = -r MODAR = ar clq ! MODRANLIB = ranlib ! ! DVIPS = dvips ! LATEX = latex STD_INCLUDES = STD_CPP_OPTIONS = -traditional *************** *** 283,293 **** # Not sure this belongs here TKLIBDIR = /usr/lib TKINCDIR = /usr/include ! TKLIBNAME = tk TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) TCLLIBDIR = /usr/lib TCLINCDIR = /usr/include ! TCLLIBNAME = tcl TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) MACROFILE = linux.cf --- 286,296 ---- # Not sure this belongs here TKLIBDIR = /usr/lib TKINCDIR = /usr/include ! TKLIBNAME = tk8.3 TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) TCLLIBDIR = /usr/lib TCLINCDIR = /usr/include ! TCLLIBNAME = tcl8.3 TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) MACROFILE = linux.cf *************** *** 300,316 **** ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) - # $TOG: Motif.rules /main/4 1998/02/06 10:53:37 kaleb $ - - # $Id: LessTif.rules,v 1.2 2000/08/29 21:59:19 dannybackx Exp $ - # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ ! # $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ ! ! # $TOG: Motif.tmpl /main/5 1998/02/06 10:53:46 kaleb $ ! ! # $Id: LessTif.tmpl.in,v 1.3 2001/03/26 19:12:10 amai Exp $ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules --- 303,311 ---- 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ ! # $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules *************** *** 319,331 **** # # # ! # $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.3 2001/06/01 02:24:14 dawes Exp $ XORGRELSTRING = Release 6.5 XORGMANNAME = X Version 11 VENDORMANNAME = XFree86 ! VENDORMANVERSION = Version 4.1.0 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT --- 314,326 ---- # # # ! # $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.2 2001/05/29 18:21:57 dawes Exp $ XORGRELSTRING = Release 6.5 XORGMANNAME = X Version 11 VENDORMANNAME = XFree86 ! VENDORMANVERSION = Version 4.1.0.1 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT *************** *** 376,382 **** LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver ! XAPPLOADDIR = $(LIBDIR)/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) --- 371,377 ---- LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver ! XAPPLOADDIR = /etc/X11/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) *************** *** 390,396 **** BDFTRUNCATE = $(BINDIR)/bdftruncate.pl UCSMAPPREFIX = $(FONTDIR)/util/map- ! HTMLINDEXCMD = $(MKHTMLINDEX) DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients --- 385,391 ---- BDFTRUNCATE = $(BINDIR)/bdftruncate.pl UCSMAPPREFIX = $(FONTDIR)/util/map- ! HTMLINDEXCMD = HtmlIndexCmd DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients *************** *** 426,432 **** VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' XENVLIBDIR = $(USRLIBDIR) ! CLIENTENVSETUP = LD_LIBRARY_PATH=$(MOTIFENVLIBDIR):$(XENVLIBDIR) # $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ --- 421,427 ---- VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' XENVLIBDIR = $(USRLIBDIR) ! CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) # $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ *************** *** 723,736 **** FONTLIBSRC = $(LIBSRC)/font ! SOFONTREV = 1.3 ! DEPFONTLIB = FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln # ! SOFONTREV = 1.3 ! DEPXFONTLIB = XFONTLIB = -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln --- 718,729 ---- FONTLIBSRC = $(LIBSRC)/font ! DEPFONTLIB = $(USRLIBDIR)/libXfont.a FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln # ! DEPXFONTLIB = $(USRLIBDIR)/libXfont.a XFONTLIB = -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln *************** *** 760,771 **** LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln ! FREETYPE2INCLUDES=$(TOP_X_INCLUDES)/freetype2 ! FREETYPE2DEFINES=-DFREETYPE2 XFTLIBSRC = $(LIBSRC)/Xft ! SOXFTREV = 1.0 DEPXFTLIB = XFTLIB = -lXft --- 753,768 ---- LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln ! FREETYPE2DIR = /usr ! FREETYPE2LIBDIR = /usr/lib ! FREETYPE2INCDIR = /usr/include/freetype2 ! FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) ! FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype ! FREETYPE2DEFINES = -DFREETYPE2 XFTLIBSRC = $(LIBSRC)/Xft ! SOXFTREV = 1.1 DEPXFTLIB = XFTLIB = -lXft *************** *** 800,906 **** DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) - MTOP = $(TOP) - TOP_MOTIF_INCLUDES = - - UIL_INCLUDES = -I$(USRINCDIR)/uil - - MOTIFENVLIBDIR = $(USRLIBDIR) - - USRINCDIR = /usr/X11R6/include - UIDDIR = $(LIBDIR)/uid - TESTSRC = $(MTOP)/tests - TESTLIB = $(TESTSRC)/lib - GENERALSRCLIB = $(TESTSRC)/General/lib - GENERALSRCBIN = $(TESTSRC)/General/bin - MANUALSRCLIB = $(TESTSRC)/Manual/lib - MANUALSRCBIN = $(TESTSRC)/Manual/bin - AUTOSRCLIB = $(TESTSRC)/Auto/lib - AUTOSRCBIN = $(TESTSRC)/Auto/bin - COMMONPP = $(GENERALSRCBIN)/Commonpp - GENRUN = $(GENERALSRCBIN)/Genrun - MANRUN = $(GENERALSRCBIN)/Manrun - - TESTCOMSRC = $(MANUALSRCLIB)/Common - - BUILDDOCDIR = $(BUILDINCROOT)/doc - BUILDLOCDIR = $(BUILDINCROOT)/localized - - MTOOLKITSRC = $(TOOLKITSRC) - - MINCLUDESRC = $(MTOP)/include - MDOCSRC = $(MTOP)/doc - MLOCSRC = $(MTOP)/localized - - MLIBSRC = $(MTOP)/lib - MCLIENTSRC = $(MTOP)/clients - MDEMOSRC = $(MTOP)/demos - MWIDGETSRC = $(MLIBSRC)/Xm - MRESOURCESRC = $(MLIBSRC)/Mrm - UILSRC = $(MCLIENTSRC)/uil - - UIL = uil - DEPUIL = $(BINDIR)/uil - - XMEXTRA_LIBS = - - SOXMREV = 2.0 - DEPXMLIB = - XMLIB = -lXm - - LINTXM = $(LINTLIBDIR)/llib-lXm.ln - - SOMRMREV = 2.0 - DEPMRESOURCELIB = - MRESOURCELIB = -lMrm - - LINTMRESOURCE = $(LINTLIBDIR)/llib-lMrm.ln - - SOUILREV = 2.0 - DEPUILLIB = - UILLIB = -lUil - - LINTUIL = $(LINTLIBDIR)/llib-lUil.ln - - SOMCOMMONREV = 2.0 - DEPTESTCOMLIB = - TESTCOMLIB = -lMCommon - - LINTTESTCOM = $(LINTLIBDIR)/llib-lMCommon.ln - - TESTUILCOMLIB = $(TESTCOMSRC)/libMCommonUil.a - - LINTMRESOURCE = $(MRESOURCESRC)/libMrm.a - LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln - LINTXMTOOL = $(MTOOLKITSRC)/llib-lXt.ln - LINTUILLIB = $(UILSRC)/llib-lUil.ln - - YACCFLAGS = - UILFLAGS = - GENCATFLAGS = - GENCAT = gencat $(GENCATFLAGS) - MKCATTOOL = $(MLOCSRC)/util/mkcatdefs - - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut *.Dat - - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) ! LDPRELIBS = -L$(USRLIBDIR) LDPOSTLIBS = ! TOP_INCLUDES = $(TOP_MOTIF_INCLUDES) -I$(INCROOT) $(TOP_X_INCLUDES) ! PROJECT_DEFINES = -DNO_MESSAGE_CATALOG ! CXXPROJECT_DEFINES = -DNO_MESSAGE_CATALOG # ---------------------------------------------------------------------- # start of Imakefile --- 797,814 ---- DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) ! LDPRELIBS = -L$(USRLIBDIR) LDPOSTLIBS = ! TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) ! PROJECT_DEFINES = ! CXXPROJECT_DEFINES = # ---------------------------------------------------------------------- # start of Imakefile *************** *** 931,937 **** # 2. -lXaw3d - default choice, ok appearance, but odd mouse behavior # 3. -lXaw - original Xaw widget set, for the hardcore only # Set your choice here: ! OURXAWLIB = -lneXtaw # Recursive stuff --- 839,845 ---- # 2. -lXaw3d - default choice, ok appearance, but odd mouse behavior # 3. -lXaw - original Xaw widget set, for the hardcore only # Set your choice here: ! OURXAWLIB = -lXaw # Recursive stuff *************** *** 1032,1039 **** $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) install:: xnistnet ! @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ ! else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xnistnet $(DESTDIR)$(BINDIR)/xnistnet depend:: --- 940,953 ---- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) install:: xnistnet ! @if [ -d $(DESTDIR)$(BINDIR) ]; then \ ! set +x; \ ! else \ ! if [ -h $(DESTDIR)$(BINDIR) ]; then \ ! (set -x; rm -f $(DESTDIR)$(BINDIR)); \ ! fi; \ ! (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \ ! fi $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xnistnet $(DESTDIR)$(BINDIR)/xnistnet depend:: *************** *** 1081,1087 **** man_keywords:: html_index:: - $(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR) clean:: cleandir --- 995,1000 ---- Only in nistnet.2.0.12-deterministic/monitor: Makefile.bak diff -rc nistnet.2.0.12/monitor/TextField-1.01/Makefile nistnet.2.0.12-deterministic/monitor/TextField-1.01/Makefile *** nistnet.2.0.12/monitor/TextField-1.01/Makefile Mon Jun 10 22:11:50 2002 --- nistnet.2.0.12-deterministic/monitor/TextField-1.01/Makefile Mon Oct 27 12:59:35 2003 *************** *** 17,23 **** # $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ ! # $XFree86: xc/config/cf/Imake.cf,v 3.67 2001/04/18 17:13:58 dawes Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 --- 17,23 ---- # $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ ! # $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/18 16:13:17 dawes Exp $ # Keep cpp from replacing path elements containing i486/i586/i686 *************** *** 29,53 **** # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ ! # $XFree86: xc/config/cf/xf86site.def,v 3.173 2001/04/05 19:29:36 dawes Exp $ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change # platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! # platform: $XFree86: xc/config/cf/linux.cf,v 3.165.2.1 2001/06/01 02:24:14 dawes Exp $ ! # operating system: Linux 2.4.12 i686 [ELF] (2.4.12) ! # libc: (6.2.3) ! # binutils: (31) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ ! # $XFree86: xc/config/cf/xfree86.cf,v 3.360.2.1 2001/05/22 21:25:40 dawes Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ --- 29,53 ---- # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $ ! # $XFree86: xc/config/cf/xf86site.def,v 3.172 2001/02/26 18:27:56 dawes Exp $ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change # platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! # platform: $XFree86: xc/config/cf/linux.cf,v 3.165 2001/04/19 19:54:43 dawes Exp $ ! # operating system: Linux 2.4.20 i686 [ELF] (2.4.20) ! # libc: (6.2.5) ! # binutils: (32) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ ! # $XFree86: xc/config/cf/xfree86.cf,v 3.360 2001/05/19 00:26:41 dawes Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ *************** *** 71,77 **** # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ ! # $XFree86: xc/config/cf/xf86.rules,v 3.33 2001/01/17 16:38:51 dawes Exp $ # ---------------------------------------------------------------------- # site-specific configuration parameters that go after --- 71,77 ---- # $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ ! # $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $ # ---------------------------------------------------------------------- # site-specific configuration parameters that go after *************** *** 79,85 **** # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files --- 79,85 ---- # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ ! # site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files *************** *** 88,108 **** # # # ! # rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawes Exp $ _NULLCMD_ = @ echo -n ! GLIDE2INCDIR = ! GLIDE3INCDIR = ! GLIDE3LIBNAME = ! TKLIBNAME = tk TKLIBDIR = /usr/lib ! TCLLIBNAME = tcl TCLIBDIR = /usr/lib --- 88,108 ---- # # # ! # rules: $XFree86: xc/config/cf/Imake.rules,v 3.94.2.1 2001/07/28 15:06:39 dawes Exp $ _NULLCMD_ = @ echo -n ! GLIDE2INCDIR = /usr/include/glide ! GLIDE3INCDIR = /usr/include/glide3 ! GLIDE3LIBNAME = glide3 ! TKLIBNAME = tk8.3 TKLIBDIR = /usr/lib ! TCLLIBNAME = tcl8.3 TCLIBDIR = /usr/lib *************** *** 117,124 **** MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = ! RMAN = rman ! RMANOPTIONS = -f HTML CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util --- 117,124 ---- MKDIRHIER = mkdir -p REVPATH = revpath EXPORTLISTGEN = ! RMAN = RmanCmd ! RMANOPTIONS = RmanOptions CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util *************** *** 199,205 **** DRIVERMANSUFFIX = 4 MANSRCSUFFIX = man MANNEWSUFFIX = _man ! MANDEFS = -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = gzip -n --- 199,205 ---- DRIVERMANSUFFIX = 4 MANSRCSUFFIX = man MANNEWSUFFIX = _man ! MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = gzip -n *************** *** 214,227 **** COLFLAGS = -b MODCC = gcc MODCPP = /lib/cpp ! MODCFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREAD_CFLAGS) $(ALLDEFINES) MODAS = as MODASFLAGS = MODLD = ld MODLDFLAGS = MODLDCOMBINEFLAGS = -r MODAR = ar clq ! MODRANLIB = STD_INCLUDES = STD_CPP_OPTIONS = -traditional --- 214,230 ---- COLFLAGS = -b MODCC = gcc MODCPP = /lib/cpp ! MODCFLAGS = $(CFLAGS) MODAS = as MODASFLAGS = MODLD = ld MODLDFLAGS = MODLDCOMBINEFLAGS = -r MODAR = ar clq ! MODRANLIB = ranlib ! ! DVIPS = dvips ! LATEX = latex STD_INCLUDES = STD_CPP_OPTIONS = -traditional *************** *** 283,293 **** # Not sure this belongs here TKLIBDIR = /usr/lib TKINCDIR = /usr/include ! TKLIBNAME = tk TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) TCLLIBDIR = /usr/lib TCLINCDIR = /usr/include ! TCLLIBNAME = tcl TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) MACROFILE = linux.cf --- 286,296 ---- # Not sure this belongs here TKLIBDIR = /usr/lib TKINCDIR = /usr/include ! TKLIBNAME = tk8.3 TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) TCLLIBDIR = /usr/lib TCLINCDIR = /usr/include ! TCLLIBNAME = tcl8.3 TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) MACROFILE = linux.cf *************** *** 300,316 **** ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) - # $TOG: Motif.rules /main/4 1998/02/06 10:53:37 kaleb $ - - # $Id: LessTif.rules,v 1.2 2000/08/29 21:59:19 dannybackx Exp $ - # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ ! # $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ ! ! # $TOG: Motif.tmpl /main/5 1998/02/06 10:53:46 kaleb $ ! ! # $Id: LessTif.tmpl.in,v 1.3 2001/03/26 19:12:10 amai Exp $ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules --- 303,311 ---- 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) # $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ ! # $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules *************** *** 319,331 **** # # # ! # $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.3 2001/06/01 02:24:14 dawes Exp $ XORGRELSTRING = Release 6.5 XORGMANNAME = X Version 11 VENDORMANNAME = XFree86 ! VENDORMANVERSION = Version 4.1.0 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT --- 314,326 ---- # # # ! # $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.2 2001/05/29 18:21:57 dawes Exp $ XORGRELSTRING = Release 6.5 XORGMANNAME = X Version 11 VENDORMANNAME = XFree86 ! VENDORMANVERSION = Version 4.1.0.1 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT *************** *** 376,382 **** LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver ! XAPPLOADDIR = $(LIBDIR)/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) --- 371,377 ---- LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver ! XAPPLOADDIR = /etc/X11/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) *************** *** 390,396 **** BDFTRUNCATE = $(BINDIR)/bdftruncate.pl UCSMAPPREFIX = $(FONTDIR)/util/map- ! HTMLINDEXCMD = $(MKHTMLINDEX) DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients --- 385,391 ---- BDFTRUNCATE = $(BINDIR)/bdftruncate.pl UCSMAPPREFIX = $(FONTDIR)/util/map- ! HTMLINDEXCMD = HtmlIndexCmd DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients *************** *** 426,432 **** VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' XENVLIBDIR = $(USRLIBDIR) ! CLIENTENVSETUP = LD_LIBRARY_PATH=$(MOTIFENVLIBDIR):$(XENVLIBDIR) # $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ --- 421,427 ---- VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' XENVLIBDIR = $(USRLIBDIR) ! CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) # $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ *************** *** 723,736 **** FONTLIBSRC = $(LIBSRC)/font ! SOFONTREV = 1.3 ! DEPFONTLIB = FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln # ! SOFONTREV = 1.3 ! DEPXFONTLIB = XFONTLIB = -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln --- 718,729 ---- FONTLIBSRC = $(LIBSRC)/font ! DEPFONTLIB = $(USRLIBDIR)/libXfont.a FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln # ! DEPXFONTLIB = $(USRLIBDIR)/libXfont.a XFONTLIB = -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln *************** *** 760,771 **** LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln ! FREETYPE2INCLUDES=$(TOP_X_INCLUDES)/freetype2 ! FREETYPE2DEFINES=-DFREETYPE2 XFTLIBSRC = $(LIBSRC)/Xft ! SOXFTREV = 1.0 DEPXFTLIB = XFTLIB = -lXft --- 753,768 ---- LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln ! FREETYPE2DIR = /usr ! FREETYPE2LIBDIR = /usr/lib ! FREETYPE2INCDIR = /usr/include/freetype2 ! FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) ! FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype ! FREETYPE2DEFINES = -DFREETYPE2 XFTLIBSRC = $(LIBSRC)/Xft ! SOXFTREV = 1.1 DEPXFTLIB = XFTLIB = -lXft *************** *** 800,906 **** DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) - MTOP = $(TOP) - TOP_MOTIF_INCLUDES = - - UIL_INCLUDES = -I$(USRINCDIR)/uil - - MOTIFENVLIBDIR = $(USRLIBDIR) - - USRINCDIR = /usr/X11R6/include - UIDDIR = $(LIBDIR)/uid - TESTSRC = $(MTOP)/tests - TESTLIB = $(TESTSRC)/lib - GENERALSRCLIB = $(TESTSRC)/General/lib - GENERALSRCBIN = $(TESTSRC)/General/bin - MANUALSRCLIB = $(TESTSRC)/Manual/lib - MANUALSRCBIN = $(TESTSRC)/Manual/bin - AUTOSRCLIB = $(TESTSRC)/Auto/lib - AUTOSRCBIN = $(TESTSRC)/Auto/bin - COMMONPP = $(GENERALSRCBIN)/Commonpp - GENRUN = $(GENERALSRCBIN)/Genrun - MANRUN = $(GENERALSRCBIN)/Manrun - - TESTCOMSRC = $(MANUALSRCLIB)/Common - - BUILDDOCDIR = $(BUILDINCROOT)/doc - BUILDLOCDIR = $(BUILDINCROOT)/localized - - MTOOLKITSRC = $(TOOLKITSRC) - - MINCLUDESRC = $(MTOP)/include - MDOCSRC = $(MTOP)/doc - MLOCSRC = $(MTOP)/localized - - MLIBSRC = $(MTOP)/lib - MCLIENTSRC = $(MTOP)/clients - MDEMOSRC = $(MTOP)/demos - MWIDGETSRC = $(MLIBSRC)/Xm - MRESOURCESRC = $(MLIBSRC)/Mrm - UILSRC = $(MCLIENTSRC)/uil - - UIL = uil - DEPUIL = $(BINDIR)/uil - - XMEXTRA_LIBS = - - SOXMREV = 2.0 - DEPXMLIB = - XMLIB = -lXm - - LINTXM = $(LINTLIBDIR)/llib-lXm.ln - - SOMRMREV = 2.0 - DEPMRESOURCELIB = - MRESOURCELIB = -lMrm - - LINTMRESOURCE = $(LINTLIBDIR)/llib-lMrm.ln - - SOUILREV = 2.0 - DEPUILLIB = - UILLIB = -lUil - - LINTUIL = $(LINTLIBDIR)/llib-lUil.ln - - SOMCOMMONREV = 2.0 - DEPTESTCOMLIB = - TESTCOMLIB = -lMCommon - - LINTTESTCOM = $(LINTLIBDIR)/llib-lMCommon.ln - - TESTUILCOMLIB = $(TESTCOMSRC)/libMCommonUil.a - - LINTMRESOURCE = $(MRESOURCESRC)/libMrm.a - LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln - LINTXMTOOL = $(MTOOLKITSRC)/llib-lXt.ln - LINTUILLIB = $(UILSRC)/llib-lUil.ln - - YACCFLAGS = - UILFLAGS = - GENCATFLAGS = - GENCAT = gencat $(GENCATFLAGS) - MKCATTOOL = $(MLOCSRC)/util/mkcatdefs - - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut *.Dat - - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) ! LDPRELIBS = -L$(USRLIBDIR) LDPOSTLIBS = ! TOP_INCLUDES = $(TOP_MOTIF_INCLUDES) -I$(INCROOT) $(TOP_X_INCLUDES) ! PROJECT_DEFINES = -DNO_MESSAGE_CATALOG ! CXXPROJECT_DEFINES = -DNO_MESSAGE_CATALOG # ---------------------------------------------------------------------- # start of Imakefile --- 797,814 ---- DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) XMULIBONLY = -lXmu XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config USRLIBDIRPATH = $(USRLIBDIR) ! LDPRELIBS = -L$(USRLIBDIR) LDPOSTLIBS = ! TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) ! PROJECT_DEFINES = ! CXXPROJECT_DEFINES = # ---------------------------------------------------------------------- # start of Imakefile *************** *** 997,1003 **** man_keywords:: html_index:: - $(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR) clean:: cleandir --- 905,910 ---- Only in nistnet.2.0.12-deterministic/monitor/TextField-1.01: Makefile.bak