--- spim-6.5.orig/lex.yy.c +++ spim-6.5/lex.yy.c @@ -9,7 +9,7 @@ #define YY_FLEX_MINOR_VERSION 5 #include - +#include /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus @@ -22,7 +22,15 @@ #ifdef __cplusplus #include +#ifndef _Win32 #include +#else +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE +extern int isatty YY_PROTO(( int )); +#endif +#endif +#endif /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -474,7 +482,7 @@ #undef yywrap -#line 478 "lex.yy.c" +#line 486 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -574,9 +582,20 @@ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + } #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -628,7 +647,7 @@ #line 78 "scanner.l" -#line 632 "lex.yy.c" +#line 651 "lex.yy.c" if ( yy_init ) { @@ -980,7 +999,7 @@ #line 304 "scanner.l" ECHO; YY_BREAK -#line 984 "lex.yy.c" +#line 1003 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1544,11 +1563,15 @@ } +#ifndef _Win32 +#include +#else #ifndef YY_ALWAYS_INTERACTIVE #ifndef YY_NEVER_INTERACTIVE extern int isatty YY_PROTO(( int )); #endif #endif +#endif #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) --- spim-6.5.orig/Makefile +++ spim-6.5/Makefile @@ -1,121 +1,116 @@ # Makefile generated by imake - do not edit! -# $TOG: imake.c /main/97 1997/06/20 20:23:51 kaleb $ +# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ # ---------------------------------------------------------------------- -# Makefile generated from "Imake.tmpl" and -# $TOG: Imake.tmpl /main/245 1997/05/20 10:05:47 kaleb $ +# Makefile generated from "Imake.tmpl" and +# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ # # # # -# $XFree86: xc/config/cf/Imake.tmpl,v 3.32.2.8 1998/02/08 11:19:24 dawes Exp $ +# $XFree86: xc/config/cf/Imake.tmpl,v 3.116.2.2 2002/09/12 21:04:13 herrb Exp $ # ---------------------------------------------------------------------- all:: .SUFFIXES: .i -# $TOG: Imake.cf /main/28 1997/06/25 08:31:36 barstow $ -# $XFree86: xc/config/cf/Imake.cf,v 3.34.2.4 1998/05/22 16:38:18 dawes Exp $ +# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ + +# $XFree86: xc/config/cf/Imake.cf,v 3.74 2001/11/16 16:47:50 dawes Exp $ + +# Keep cpp from replacing path elements containing i486/i586/i686 + +# for compatibility with 3.3.x # ----------------------------------------------------------------------- # site-specific configuration parameters that need to come before # the platform-specific parameters - edit site.def to change -# site: $XConsortium: site.def /main/revisionist/4 1996/12/31 08:02:07 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.17.2.1 1997/06/22 10:32:21 dawes Exp $ +# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ -# $XFree86: xc/config/cf/xf86site.def,v 3.101.2.15 1998/02/24 19:05:42 hohndel Exp $ +# $XFree86: xc/config/cf/xf86site.def,v 3.179 2002/01/16 18:36:00 dawes Exp $ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change -# platform: $TOG: linux.cf /main/36 1997/06/16 22:21:03 kaleb $ -# platform: $XFree86: xc/config/cf/linux.cf,v 3.57.2.12 1998/03/01 01:57:10 dawes Exp $ +# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + +# platform: $XFree86: xc/config/cf/linux.cf,v 3.175.2.1 2002/09/04 02:38:08 dawes Exp $ + +# operating system: Linux 2.4.20-grsec i686 [ELF] (2.4.20) +# libc: (6.3.1) +# binutils: (213) + +# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.42 2002/01/16 00:39:59 keithp Exp $ -# operating system: Linux 2.0.35 i686 [ELF] (2.0.35) -# libc: (6.0.7) -# binutils: (29) +# $XFree86: xc/config/cf/xfree86.cf,v 3.388 2002/01/03 22:51:54 alanh Exp $ -# $XConsortium: lnxLib.rules /main/13 1996/09/28 16:11:01 rws $ -# $XFree86: xc/config/cf/lnxLib.rules,v 3.28.2.3 1997/06/22 10:32:20 dawes Exp $ +# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ -# $XFree86: xc/config/cf/xfree86.cf,v 3.129.2.22 1998/02/24 19:05:43 hohndel Exp $ +VENDORMANNAME = XFree86 +VENDORMANVERSION = `echo 4 2 1 1 | sed 's/ /./g'` -# $XConsortium: xfree86.cf /main/34 1996/12/06 11:45:18 rws $ +AFB_DEFS = -DUSE_AFB -LINKKITDIR = $(USRLIBDIR)/Server -XF98LINKKITDIR = $(USRLIBDIR)/Server +DRIVERSDKDIR = $(USRLIBDIR)/Server +DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules +DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include XF86SRC = $(SERVERSRC)/hw/xfree86 - XF86ACCELSRC = $(XF86SRC)/accel XF86COMSRC = $(XF86SRC)/common - XF86CONFIGSRC = $(XF86COMSRC) - XF86HWSRC = $(XF86SRC)/common_hw + XF86PARSERSRC = $(XF86SRC)/parser XF86OSSRC = $(XF86SRC)/os-support - VGADRIVERSRC = $(XF86SRC)/vga256/drivers -VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers - VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers - MONODRIVERSRC = $(XF86SRC)/mono/drivers - S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers - S3VDRIVERSRC = $(XF86SRC)/accel/s3_virge/drivers - - XF68SRC = $(SERVERSRC)/hw/xfree68 - XF68COMSRC = $(XF68SRC)/common - XF68CONFIGSRC = $(XF68COMSRC) - XF68OSSRC = $(XF68SRC)/os-support - - XF98SRC = $(SERVERSRC)/hw/xfree98 - XF98ACCELSRC = $(XF98SRC)/accel - XF98COMSRC = $(XF98SRC)/common - XF98CONFIGSRC = $(XF98COMSRC) - XF98HWSRC = $(XF98SRC)/common_hw/generic - XF98HWNECSRC = $(XF98SRC)/common_hw/nec - XF98HWPWSKBSRC = $(XF98SRC)/common_hw/pwskb - XF98HWPWLBSRC = $(XF98SRC)/common_hw/pwlb - XF98HWGA968SRC = $(XF98SRC)/common_hw/ga968 - XF98OSSRC = $(XF98SRC)/os-support - XF98VGADRIVERSRC = $(XF98SRC)/vga256/drivers -XF98VGA16DRIVERSRC = $(XF98SRC)/vga16/drivers - XF98VGA2DRIVERSRC = $(XF98SRC)/vga2/drivers - XF98MONODRIVERSRC = $(XF98SRC)/mono/drivers -XF98NECS3DRIVERSRC = $(XF98SRC)/accel/s3nec/drivers -XF98PWSKBDRIVERSRC = $(XF98SRC)/accel/s3pwskb/drivers - XF98PWLBDRIVERSRC = $(XF98SRC)/accel/s3pwlb/drivers -XF98GA968DRIVERSRC = $(XF98SRC)/accel/s3ga968/drivers - - XFREE86DOCDIR = $(LIBDIR)/doc - XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript - XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html -XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)/Japanese + XF86DRIVERSRC = $(XF86SRC)/drivers + DRIVERSRC = $(XF86DRIVERSRC) -# $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $ -# $XFree86: xc/config/cf/xf86.rules,v 3.16.2.1 1997/05/18 12:00:01 dawes Exp $ + XFREE86DOCDIR = $(DOCDIR) + XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86HTMLDOCDIR = $(DOCHTMLDIR) +XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese + +# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + +# $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ # ---------------------------------------------------------------------- # site-specific configuration parameters that go after # the platform-specific parameters - edit site.def to change -# site: $XConsortium: site.def /main/revisionist/4 1996/12/31 08:02:07 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.17.2.1 1997/06/22 10:32:21 dawes Exp $ +# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files -# rules: $TOG: Imake.rules /main/222 1997/07/17 20:04:40 kaleb $ -# rules: $XFree86: xc/config/cf/Imake.rules,v 3.33.2.7 1998/02/06 09:02:17 dawes Exp $ +# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +# +# +# +# +# rules: $XFree86: xc/config/cf/Imake.rules,v 3.102 2001/12/17 20:00:37 dawes Exp $ _NULLCMD_ = @ echo -n -TKLIBNAME = +GLIDE2INCDIR = /usr/include/glide -TKLIBDIR = +GLIDE3INCDIR = /usr/include/glide3 -TCLLIBNAME = +GLIDE3LIBNAME = glide3 -TCLIBDIR = +TKLIBNAME = tk8.3 + +TKLIBDIR = /usr/lib + +TCLLIBNAME = tcl8.3 + +TCLIBDIR = /usr/lib PATHSEP = / - SHELL = /bin/sh + SHELL = /bin/sh -e TOP = . CURRENT_DIR = . @@ -123,21 +118,37 @@ IMAKE = imake DEPEND = gccmakedep MKDIRHIER = mkdir -p + REVPATH = revpath EXPORTLISTGEN = + RMAN = RmanCmd + RMANOPTIONS = RmanOptions CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util INCROOT = /usr/X11R6/include USRLIBDIR = /usr/X11R6/lib - VARLIBDIR = /var/lib + VARDIR = /var + VARLIBDIR = $(VARDIR)/lib + SYSTEMUSRLIBDIR = /usr/lib + SYSTEMUSRINCDIR = /usr/include SHLIBDIR = /usr/X11R6/lib LINTLIBDIR = $(USRLIBDIR)/lint MANPATH = /usr/X11R6/man MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)1 - LIBMANDIR = $(MANSOURCEPATH)3 - FILEMANDIR = $(MANSOURCEPATH)5 + MANDIR = $(MANSOURCEPATH)$(MANSECT) + SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) + LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT) + FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) + GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) + MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT) + ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) + LOGDIRECTORY = $(VARDIR)/log + + VARRUNDIR = $(VARDIR)/run + + VARDBDIR = $(VARDIR)/lib AR = ar clq BOOTSTRAPCFLAGS = @@ -149,24 +160,27 @@ CXX = c++ CXXFILT = c++filt CXXLIB = - CXXDEBUGFLAGS = -O2 -fno-strength-reduce + CXXDEBUGFLAGS = -g -O2 CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES) + CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(CXXPROJECT_DEFINES) CXXOPTIONS = CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) - CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) COMPRESS = compress GZIPCMD = gzip CPP = /lib/cpp $(STD_CPP_DEFINES) + RAWCPP = /lib/cpp -undef $(STD_CPP_OPTIONS) PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES) INSTALL = install INSTALLFLAGS = -c LD = ld LEX = flex -l + M4 = m4 + M4FLAGS = LEXLIB = -lfl YACC = bison -y CCYACC = bison -y @@ -182,10 +196,34 @@ RANLIBINSTFLAGS = RM = rm -f - MANSUFFIX = 1x - LIBMANSUFFIX = 3x - FILEMANSUFFIX = 5x - TROFF = psroff + PERL = perl + PERLOPTS = + MANSECT = 1 + SYSCALLMANSECT = 2 + LIBMANSECT = 3 + DRIVERMANSECT = 4 + FILEMANSECT = 5 + GAMEMANSECT = 6 + MISCMANSECT = 7 + ADMMANSECT = 8 + MANSRCSECT = s + MANNEWSECT = n + PROJECTMANSUFFIX = x + MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) + SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) + LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = $(DRIVERMANSECT)$(PROJECTMANSUFFIX) + FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) + GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = $(MISCMANSECT)$(PROJECTMANSUFFIX) + ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + MANSRCSUFFIX = man + MANNEWSUFFIX = _man + MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossyscallmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) + + COMPRESSMANCMD = gzip -n + + TROFF = groff -Tps NROFF = nroff MSMACROS = -ms MANMACROS = -man @@ -193,13 +231,25 @@ EQN = eqn NEQN = neqn COL = col + 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_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES) - STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES) + STD_CPP_OPTIONS = -traditional + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES) + STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES) EXTRA_LOAD_FLAGS = EXTRA_LDOPTIONS = EXTRA_LIBRARIES = @@ -218,7 +268,7 @@ PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO - INSTPGMFLAGS = -s + INSTPGMFLAGS = INSTBINFLAGS = -m 0755 INSTUIDFLAGS = -m 4711 @@ -230,12 +280,12 @@ PROJECTROOT = /usr/X11R6 - CDEBUGFLAGS = -O2 -fno-strength-reduce + CDEBUGFLAGS = -g -O2 CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = -L$(USRLIBDIR) LDPOSTLIB = @@ -251,37 +301,51 @@ LDSTRIPFLAGS = -x LDCOMBINEFLAGS = -r DEPENDFLAGS = + DEPEND_DEFINES = -DUSE_MAKEDEPEND # Not sure this belongs here - TKLIBDIR = - TKINCDIR = - TKLIBNAME = + TKLIBDIR = /usr/lib + TKINCDIR = /usr/include + TKLIBNAME = tk8.3 TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) - TCLLIBDIR = - TCLINCDIR = - TCLLIBNAME = + TCLLIBDIR = /usr/lib + TCLINCDIR = /usr/include + TCLLIBNAME = tcl8.3 TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) MACROFILE = linux.cf RM_CMD = $(RM) IMAKE_DEFINES = + IMAKE_WARNINGS = IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) + IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) -# $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $ +# $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 $ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules -# $TOG: X11.tmpl /main/292 1997/05/20 10:05:59 kaleb $ +# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ # # # # -# $XFree86: xc/config/cf/X11.tmpl,v 1.8.2.4 1998/01/23 12:35:08 dawes Exp $ +# $XFree86: xc/config/cf/X11.tmpl,v 1.141.2.1 2002/09/04 02:38:08 dawes Exp $ + +XORGRELSTRING = Release 6.6 +XORGMANNAME = X Version 11 + +VENDORMANNAME = XFree86 +VENDORMANVERSION = `echo 4 2 1 1 | sed 's/ /./g'` + +STICKY_DEFINES = -DHAS_STICKY_DIR_BIT + +FCHOWN_DEFINES = -DHAS_FCHOWN # ----------------------------------------------------------------------- # X Window System make variables; these need to be coordinated with rules @@ -295,6 +359,8 @@ BUILDLIBTOP = ../.. BUILDBINDIR = $(TOP)/exports/bin BUILDBINTOP = ../.. + BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDMODULETOP = $(BUILDLIBTOP)/.. XBUILDINCROOT = $(XTOP)/exports XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 XBUILDINCTOP = ../../.. @@ -302,11 +368,19 @@ INCDIR = $(INCROOT) ADMDIR = /usr/adm LIBDIR = $(USRLIBDIR)/X11 - TOP_X_INCLUDES = -I$(XPROJECTROOT)/include + LIBEXECDIR = /usr/X11R6/libexec + MODULEDIR = $(USRLIBDIR)/modules + TOP_X_INCLUDES = + + ETCX11DIR = /etc/X11 - VARDIR = /var/X11 + CONFDIR = $(ETCX11DIR) + DOCDIR = $(LIBDIR)/doc + DOCHTMLDIR = $(DOCDIR)/html + DOCPSDIR = $(DOCDIR)/PostScript FONTDIR = $(LIBDIR)/fonts + ENCODINGSDIR = $(FONTDIR)/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm XDMVARDIR = $(VARLIBDIR)/xdm @@ -317,15 +391,22 @@ PEXAPIDIR = $(LIBDIR)/PEX LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr - XPRINTDIR = $(LIBDIR) - XAPPLOADDIR = $(LIBDIR)/app-defaults + XPRINTDIR = $(LIBDIR)/xserver + XAPPLOADDIR = /etc/X11/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) - RGB = rgb - FONTC = bdftopcf - MKFONTDIR = mkfontdir + RGB = $(BINDIR)/rgb + FONTC = $(BINDIR)/bdftopcf + MKFONTDIR = $(BINDIR)/mkfontdir + XFTCACHE = $(BINDIR)/xftcache + MKHTMLINDEX = $(BINDIR)/mkhtmlindex + UCS2ANY = $(BINDIR)/ucs2any.pl + BDFTRUNCATE = $(BINDIR)/bdftruncate.pl + UCSMAPPREFIX = $(FONTDIR)/util/map- + + HTMLINDEXCMD = HtmlIndexCmd DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients @@ -335,6 +416,7 @@ PROGRAMSRC = $(TOP)/programs LIBSRC = $(XTOP)/lib FONTSRC = $(XTOP)/fonts + ENCODINGSSRC = $(FONTSRC)/encodings INCLUDESRC = $(BUILDINCROOT)/include XINCLUDESRC = $(INCLUDESRC)/X11 SERVERSRC = $(XTOP)/programs/Xserver @@ -347,18 +429,27 @@ FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions + FTSOURCEDIR = $(TOP)/extras/FreeType + XTTSOURCEDIR = $(TOP)/extras/X-TrueType + MESASRCDIR = $(TOP)/extras/Mesa + OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample + PSWRAPSRC = $(XTOP)/config/pswrap TRANSCOMMSRC = $(LIBSRC)/xtrans TRANS_INCLUDES = -I$(TRANSCOMMSRC) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) + + XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' + VENDORMANDEFS = -D__vendorversion__="\"Version $(VENDORMANVERSION)\" $(VENDORMANNAME)" XENVLIBDIR = $(USRLIBDIR) CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) -# $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $ -# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.9 1996/02/24 04:32:52 dawes Exp $ +# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.14 2001/08/01 00:44:32 tsi Exp $ XLIBSRC = $(LIBSRC)/X11 -SOXLIBREV = 6.1 +SOXLIBREV = 6.2 DEPXONLYLIB = XONLYLIB = -lX11 @@ -368,7 +459,7 @@ XEXTLIBSRC = $(LIBSRC)/Xext -SOXEXTREV = 6.3 +SOXEXTREV = 6.4 DEPEXTENSIONLIB = EXTENSIONLIB = -lXext @@ -407,12 +498,103 @@ LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln - XDPMSLIBSRC = $(LIBSRC)/Xdpms + XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush + +DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a +XXF86RUSHLIB = -lXxf86rush + +LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln + + XVLIBSRC = $(LIBSRC)/Xv + +DEPXVLIB = $(USRLIBDIR)/libXv.a +XVLIB = -lXv + +LINTXV = $(LINTLIBDIR)/llib-lXv.ln + + XVMCLIBSRC = $(LIBSRC)/XvMC + +DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a +XVMCLIB = -lXvMC + +LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln + + XINERAMALIBSRC = $(LIBSRC)/Xinerama + +DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a +XINERAMALIB = -lXinerama + +LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln + + DPSLIBSRC = $(LIBSRC)/dps + +SODPSREV = 1.0 +DEPDPSLIB = +DPSLIB = -ldps + +LINTDPS = $(LINTLIBDIR)/llib-ldps.ln + + DPSTKLIBSRC = $(LIBSRC)/dpstk + +SODPSTKREV = 1.0 +DEPDPSTKLIB = +DPSTKLIB = -ldpstk + +LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln + + PSRESLIBSRC = $(LIBSRC)/psres + +SOPSRESREV = 1.0 +DEPPSRESLIB = +PSRESLIB = -lpsres + +LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln + + GLULIBSRC = $(LIBSRC)/GLU + +SOGLUREV = 1.3 +DEPGLULIB = +GLULIB = -lGLU + +LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln + + GLXLIBSRC = $(LIBSRC)/GL -DEPXDPMSLIB = $(USRLIBDIR)/libXdpms.a -XDPMSLIB = -lXdpms +SOGLREV = 1.2 +DEPGLXLIB = +GLXLIB = -lGL -LINTXDPMS = $(LINTLIBDIR)/llib-lXdpms.ln +LINTGLX = $(LINTLIBDIR)/llib-lGL.ln + + GLWIDGETSRC = $(LIBSRC)/GLw + +DEPGLWLIB = $(USRLIBDIR)/libGLw.a +GLWLIB = -lGLw + +LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln + + XRENDERLIBSRC = $(LIBSRC)/Xrender + +SOXRENDERREV = 1.1 +DEPXRENDERLIB = +XRENDERLIB = -lXrender + +LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln + + XRANDRRLIBSRC = $(LIBSRC)/Xrandr + +SOXRANDRREV = 1.0 +DEPXRANDRLIB = +XRANDRLIB = -lXrandr + +LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln + + XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache + +DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a +XFONTCACHELIB = -lXfontcache + +LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln XAUTHSRC = $(LIBSRC)/Xau @@ -430,12 +612,20 @@ XMUSRC = $(LIBSRC)/Xmu -SOXMUREV = 6.0 +SOXMUREV = 6.2 DEPXMULIB = XMULIB = -lXmu LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln + XMUUSRC = $(LIBSRC)/Xmuu + +SOXMUUREV = 1.0 +DEPXMUULIB = +XMUULIB = -lXmuu + +LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln + OLDXLIBSRC = $(LIBSRC)/oldX DEPOLDXLIB = $(USRLIBDIR)/liboldX.a @@ -473,12 +663,20 @@ AWIDGETSRC = $(LIBSRC)/Xaw -SOXAWREV = 6.1 +SOXAWREV = 7.0 DEPXAWLIB = XAWLIB = -lXaw LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln + AWIDGET6SRC = $(LIBSRC)/Xaw6 + +SOXAW6REV = 6.1 +DEPXAW6LIB = +XAW6LIB = -lXaw + +LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln + XILIBSRC = $(LIBSRC)/Xi SOXINPUTREV = 6.0 @@ -556,18 +754,63 @@ FONTLIBSRC = $(LIBSRC)/font -DEPFONTLIB = $(USRLIBDIR)/libfont.a -FONTLIB = -lfont +DEPFONTLIB = $(USRLIBDIR)/libXfont.a +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln +# +DEPXFONTLIB = $(USRLIBDIR)/libXfont.a +XFONTLIB = -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln -LINTFONT = $(LINTLIBDIR)/llib-lfont.ln + FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs + +DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a +FONTSTUBLIB = -lfntstubs + +LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln + DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) + + FONTENCLIBSRC = $(LIBSRC)/fontenc + +DEPXFONTENCLIB = $(USRLIBDIR)/libfontenc.a +XFONTENCLIB = -lfontenc + +LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln XPMLIBSRC = $(LIBSRC)/Xpm -DEPXPMLIB = $(USRLIBDIR)/libXpm.a +SOXPMREV = 4.11 +DEPXPMLIB = XPMLIB = -lXpm LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln + FREETYPE2LIBSRC = $(LIBSRC)/freetype2 + +SOFREETYPE2REV = 6.2 +DEPFREETYPE2LIB = +FREETYPE2LIB = -lfreetype + +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 + +LINTXFT = $(LINTLIBDIR)/llib-lXft.ln + XKBFILELIBSRC = $(LIBSRC)/xkbfile DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a @@ -575,7 +818,7 @@ LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln - XKBCOMPCMD = xkbcomp + XKBCOMPCMD = $(BINDIR)/xkbcomp XKBUILIBSRC = $(LIBSRC)/xkbui @@ -584,6 +827,14 @@ LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln + XTRAPLIBSRC = $(LIBSRC)/XTrap + +SOXTRAPREV = 6.4 +DEPXTRAPLIB = +XTRAPLIB = -lXTrap + +LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln + DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) DEPLIBS1 = $(DEPLIBS) @@ -703,13 +954,16 @@ YFLAGS = -d -DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) -LOCALLIBS = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB) +DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(DEPXLIB) +LOCALLIBS = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) CDEBUGFLAGS = -g DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_TRAP_HANDLER=$(TRAP_PATH) -DSPIM_VERSION="\"`cat VERSION`\"" SYS_LIBRARIES = -lm +# Use csh, tcsh, or bash, but not sh: +CSH = csh + # # @@ -737,35 +991,79 @@ $(RM) $@ $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LDLIBS) $(EXTRA_LOAD_FLAGS) -clean:: +cleandir:: $(RM) spim_sub xspim_sub: $(XOBJS) $(DEPLIBS) $(RM) $@ $(CCLINK) -o $@ $(LDOPTIONS) $(XOBJS) $(LOCALLIBS) $(LDLIBS) $(SYSLIBS) $(EXTRA_LOAD_FLAGS) -clean:: +cleandir:: $(RM) xspim_sub install:: spim - @if [ -d $(DESTDIR)$(BIN_DIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(BIN_DIR)); fi + @if [ -d $(DESTDIR)$(BIN_DIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(BIN_DIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(BIN_DIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(BIN_DIR)); \ + fi $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) spim $(DESTDIR)$(BIN_DIR)/spim install:: xspim - @if [ -d $(DESTDIR)$(BIN_DIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(BIN_DIR)); fi + @if [ -d $(DESTDIR)$(BIN_DIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(BIN_DIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(BIN_DIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(BIN_DIR)); \ + fi $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xspim $(DESTDIR)$(BIN_DIR)/xspim -install.man:: spim.man - @if [ -d $(DESTDIR)$(MAN_DIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(MAN_DIR)); fi - $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) spim.man $(DESTDIR)$(MAN_DIR)/spim.$(MANSUFFIX) - -install.man:: xspim.man - @if [ -d $(DESTDIR)$(MAN_DIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(MAN_DIR)); fi - $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xspim.man $(DESTDIR)$(MAN_DIR)/xspim.$(MANSUFFIX) +all:: spim.$(MANNEWSUFFIX) + +spim.$(MANNEWSUFFIX): spim.$(MANSRCSUFFIX) + $(RM) $@ + cd `dirname spim` && \ + $(LN) `basename spim.$(MANSRCSUFFIX)` `basename $@` + +cleandir:: + $(RM) spim.$(MANNEWSUFFIX) + +install.man:: spim.$(MANNEWSUFFIX) + @if [ -d $(DESTDIR)$(MAN_DIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(MAN_DIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(MAN_DIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(MAN_DIR)); \ + fi + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) spim.$(MANNEWSUFFIX) $(DESTDIR)$(MAN_DIR)/spim.$(MANSUFFIX) + +all:: xspim.$(MANNEWSUFFIX) + +xspim.$(MANNEWSUFFIX): xspim.$(MANSRCSUFFIX) + $(RM) $@ + cd `dirname xspim` && \ + $(LN) `basename xspim.$(MANSRCSUFFIX)` `basename $@` + +cleandir:: + $(RM) xspim.$(MANNEWSUFFIX) + +install.man:: xspim.$(MANNEWSUFFIX) + @if [ -d $(DESTDIR)$(MAN_DIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(MAN_DIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(MAN_DIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(MAN_DIR)); \ + fi + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xspim.$(MANNEWSUFFIX) $(DESTDIR)$(MAN_DIR)/xspim.$(MANSUFFIX) install:: trap.handler $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) trap.handler $(DESTDIR)$(TRAP_DIR) @@ -795,7 +1093,7 @@ test: spim /bin/rm -f Tests/tt.out std_out new_out @echo - bash -c "./spim -bare -notrap -file Tests/tt.bare.s >& Tests/tt.out" + $(CSH) -c "./spim -bare -notrap -file Tests/tt.bare.s >& Tests/tt.out" tail +6 Tests/tt.bare.OK > std_out tail +6 Tests/tt.out > new_out @echo The next command should not produce any output: @@ -806,7 +1104,7 @@ @if [ ! -f $(TRAP_DIR)/trap.handler ]; then echo "trap_handler not installed. Type: make install"; exit 1; else true; fi @if diff trap.handler $(TRAP_DIR)/trap.handler > /dev/null ; then true ; else echo "Old trap_handler installed. Type: make install" ; exit 1; fi - bash -c "./spim -file Tests/tt.s < Tests/tt.in >& Tests/tt.out" + $(CSH) -c "./spim -file Tests/tt.s < Tests/tt.in >& Tests/tt.out" tail +6 Tests/tt.OK > std_out tail +6 Tests/tt.out > new_out @echo The next command should not produce any output: @@ -819,7 +1117,7 @@ # tt.alu.bare.s needs to be converted in places for big-endian machines. test_bare: - bash -c "./spim -bare -notrap -file Tests/tt.alu.bare.s >& Tests/tt.out" + $(CSH) -c "./spim -bare -notrap -file Tests/tt.alu.bare.s >& Tests/tt.out" tail +6 Tests/tt.alu.bare.OK > std_out tail +6 Tests/tt.out > new_out @echo The next command should not produce any output: @@ -828,7 +1126,7 @@ @echo /bin/rm -f Tests/tt.out std_out new_out - bash -c "./spim -bare -notrap -file Tests/tt.fpu.bare.s >& Tests/tt.out" + $(CSH) -c "./spim -bare -notrap -file Tests/tt.fpu.bare.s >& Tests/tt.out" tail +6 Tests/tt.fpu.bare.OK > std_out tail +6 Tests/tt.out > new_out @echo The next command should not produce any output: @@ -841,10 +1139,10 @@ TAGS: *.c *.h *.l *.y etags *.l *.y *.c *.h -clean:: +cleandir:: rm -f spim xspim *.o y.output core a.out TAGS .spim-made spim.tar.* -very-clean: clean +very-cleandir: cleandir rm -f y.tab.h y.tab.c lex.yy.c spim.tar* spim.shar* Documentation/spim.ps, Documentation/spim.aux Documentation/spim.log Documentation/spim.dvi Tests/tt.s Tests/tt.OK configuration # @@ -1013,9 +1311,15 @@ $(RM) $@ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ +.SUFFIXES: .s + +.c.s: + $(RM) $@ + $(CC) -S $(CFLAGS) $(_NOOP_) $*.c + emptyrule:: -clean:: +cleandir:: $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: @@ -1030,6 +1334,12 @@ man_keywords:: +html_index:: + +clean:: cleandir + +distclean:: cleandir + # ---------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit @@ -1039,8 +1349,8 @@ install.man:: @echo "install.man in $(CURRENT_DIR) done" -install.linkkit:: - @echo "install.linkkit in $(CURRENT_DIR) done" +install.sdk:: + @echo "install.sdk in $(CURRENT_DIR) done" Makefiles:: @@ -1048,6 +1358,9 @@ depend:: +distclean:: + $(RM) Makefile + # ---------------------------------------------------------------------- # dependencies generated by makedepend --- spim-6.5.orig/debian/spim.menu +++ spim-6.5/debian/spim.menu @@ -0,0 +1,4 @@ +?package(spim):needs=X11 section=Apps/Technical\ + title="XSPIM" command="/usr/bin/xspim" +?package(spim):needs=text section=Apps/Technical\ + title="SPIM" command="/usr/bin/spim" --- spim-6.5.orig/debian/changelog +++ spim-6.5/debian/changelog @@ -0,0 +1,85 @@ +spim (6.5-1) unstable; urgency=low + + * New upstream release (Closes: Bug#178264) + * Added libxaw7-dev instead of libxaw-dev to build-depends. It already + depended on xutils so there is no need to add it (Closes: Bug#102515) + + -- Fernando Sanchez Fri, 24 Jan 2003 21:23:48 +0100 + +spim (6.4-2) unstable; urgency=low + + * Added libxaw-dev and xlibs-dev to build-depends (Closes: Bug#139062) + + -- Fernando Sanchez Tue, 19 Mar 2002 16:58:57 +0100 + +spim (6.4-1) unstable; urgency=low + + * New upstream release + + -- Fernando Sanchez Fri, 8 Mar 2002 18:37:26 +0100 + +spim (6.3-1) unstable; urgency=low + + * New upstream release + + -- Fernando Sanchez Wed, 24 Jan 2001 14:05:34 +0100 + +spim (6.2-3) unstable; urgency=low + + * Compiled with current Debian libraries to ensure correct operation + * Changed Standards-Version to 3.0.1 + * Added menu entry for spim and xspim binaries + * Renamed spim man page from spim.1x.gz to spim.1.gz + + -- Fernando Sanchez Sun, 19 Dec 1999 21:48:00 +0100 + +spim (6.2-2) unstable; urgency=low + + * Compiled with current potato libraries + * Packaged following FHS documentation placement rules + + -- Fernando Sanchez Sun, 12 Sep 1999 16:05:08 +0200 + +spim (6.2-1) unstable; urgency=low + + * New maintainer: Fernando Sanchez + * New upstream source + + -- Fernando Sanchez Sat, 13 Feb 1999 19:15:51 +0100 + +spim (6.1-3) frozen non-free; urgency=low + + * Reuploading so that spim can make it out of orphaned. + + -- Jay Kominek Sun, 15 Mar 1998 15:37:43 -0500 + +spim (6.1-2) non-free; urgency=low + + * Included the Tests directory with the package. + + -- Jay Kominek Mon, 9 Mar 1998 17:19:51 -0500 + +spim (6.1-1) non-free; urgency=low + + * New upstream release. + + -- Jay Kominek Fri, 20 Feb 1998 22:24:44 -0500 + +spim (6.0-3) non-free; urgency=low + + * Moved into non-free. (Fixes bug #14956) + + -- Jay Kominek Thu, 20 Nov 1997 15:27:39 -0500 + +spim (6.0-2) unstable; urgency=low + + * Compiled for Libc6. + + -- Jay Kominek Fri, 7 Nov 1997 23:46:19 -0500 + +spim (6.0-1) unstable; urgency=low + + * Initial Release. + + -- Jay Kominek Wed, 3 Sep 1997 17:30:03 -0400 + --- spim-6.5.orig/debian/control +++ spim-6.5/debian/control @@ -0,0 +1,13 @@ +Source: spim +Section: non-free/electronics +Priority: optional +Maintainer: Fernando Sanchez +Build-Depends: debhelper, xutils, xlibs-dev, libxaw7-dev +Standards-Version: 3.5.6.0 + +Package: spim +Architecture: any +Depends: ${shlibs:Depends} +Description: MIPS R2000/R3000 emulator + Emulates a MIPS R2000/R3000 processor in software. + Useful for students who are taught MIPS R2000/R3000 assembly. --- spim-6.5.orig/debian/copyright +++ spim-6.5/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Fernando Sanchez fer@debian.org on +Sun, 14 Feb 1999 13:59:18 +0100. + +It was downloaded from http://www.cs.wisc.edu/~larus/SPIM/ + +Upstream Author: James R. Larus + +Copyright: + +SPIM is copyrighted by James R. Larus and distributed under the +following conditions: + + You may make copies of SPIM for your own use and modify those copies. + + All copies of SPIM must retain my name and copyright notice. + + You may not sell SPIM or distributed SPIM in conjunction with a + commercial product or service without the expressed written consent of + James Larus. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +Note: James Larus has clarified his license in regards to how it relates to +packaging and redistribution. He welcomes the packaging and redistribution +via other media, as long as his copyright is retained and source code is +distributed. --- spim-6.5.orig/debian/dirs +++ spim-6.5/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/man/man1 +usr/lib/spim +usr/lib/spim --- spim-6.5.orig/debian/docs +++ spim-6.5/debian/docs @@ -0,0 +1 @@ +README BLURB Documentation Tests --- spim-6.5.orig/debian/rules +++ spim-6.5/debian/rules @@ -0,0 +1,85 @@ +#!/usr/bin/make -f +# MAde with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + + export CC="gcc" + ./Configure + xmkmf + # Add here commands to compile the package. + $(MAKE) LEXCFLAGS="-O2" CDEBUGFLAGS="-O2" TRAP_DIR=/usr/lib/spim BIN_DIR=/usr/bin MAN_DIR=/usr/share/man + $(MAKE) xspim LEXCFLAGS="-O2" CDEBUGFLAGS="-O2" TRAP_DIR=/usr/lib/spim BIN_DIR=/usr/bin MAN_DIR=/usr/share/man + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + rm -f Tests/tt.s + rm -f Tests/tt.OK + + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp. + $(MAKE) install BIN_DIR=`pwd`/debian/tmp/usr/bin MAN_DIR=`pwd`/debian/tmp/usr/share/man/man1 TRAP_DIR=`pwd`/debian/tmp/usr/lib/spim + $(MAKE) install.man MAN_DIR=`pwd`/debian/tmp/usr/share/man/man1 + mv debian/tmp/usr/share/man/man1/spim.1x debian/tmp/usr/share/man/man1/spim.1 + rmdir debian/tmp/usr/man/man1 + rmdir debian/tmp/usr/man + mv debian/tmp/usr/share/man/man1/xspim.1x debian/tmp/usr/share/man/man1/xspim.1 + install -m644 trap.handler debian/tmp/usr/lib/spim/trap.handler + + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install +# dh_testversion + dh_testdir + dh_testroot + dh_installdocs +# dh_installexamples + dh_installmenu +# dh_installemacsen +# dh_installinit +# dh_installcron + dh_installmanpages +# dh_undocumented + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms +# dh_suidregister + dh_installdeb + dh_shlibdeps + dh_gencontrol +# dh_makeshlibs + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary