--- spim-7.1.orig/Imakefile +++ spim-7.1/Imakefile @@ -44,13 +44,13 @@ # # Full path for directory that will hold the exception handler file: -EXCEPTION_DIR = . +EXCEPTION_DIR = /usr/lib/spim # Full path for the directory that will hold the executable files: -BIN_DIR = /usr/unsup/bin +BIN_DIR = /usr/bin # Full path for the directory that will hold the man files: -MAN_DIR = /var/unsup/man +MAN_DIR = /usr/share/man/man1 # If you have flex, use it instead of lex. If you use flex, define this --- spim-7.1.orig/lex.yy.c +++ spim-7.1/lex.yy.c @@ -1,33 +1,84 @@ -/* A lexical scanner generated by flex */ -/* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ - */ +#line 3 "lex.yy.c" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 31 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ #include +#include #include +#include -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif -#endif +/* end standard C headers. */ +/* flex integer type definitions */ -#ifdef __cplusplus +#ifndef FLEXINT_H +#define FLEXINT_H -#include -#ifndef _WIN32 -#include +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) #endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS +#ifdef __cplusplus /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST @@ -36,35 +87,17 @@ #if __STDC__ -#define YY_USE_PROTOS #define YY_USE_CONST #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -79,71 +112,71 @@ * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE yyrestart(yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 +#endif +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif extern int yyleng; + extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, yytext_ptr ) +#define unput(c) yyunput( c, (yytext_ptr) ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). */ -typedef unsigned int yy_size_t; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef unsigned int yy_size_t; +#endif +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { FILE *yy_input_file; @@ -180,12 +213,16 @@ */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -199,23 +236,33 @@ * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -static YY_BUFFER_STATE yy_current_buffer = 0; +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - int yyleng; /* Points to current character in buffer. */ @@ -228,66 +275,92 @@ */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); - -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) - -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); - -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +static void yyensure_buffer_stack (void ); +static void yy_load_buffer_state (void ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); + +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); #define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ typedef unsigned char YY_CHAR; + FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + typedef int yy_state_type; + +extern int yylineno; + +int yylineno = 1; + extern char *yytext; #define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ + (yytext_ptr) = yy_bp; \ + yyleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 18 #define YY_END_OF_BUFFER 19 -static yyconst short int yy_accept[44] = +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[44] = { 0, 0, 0, 19, 5, 17, 1, 2, 3, 17, 6, 17, 17, 12, 12, 13, 12, 10, 7, 7, 4, @@ -296,7 +369,7 @@ 8, 9, 0 } ; -static yyconst int yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 2, 2, 2, 2, 2, 2, 2, 3, 4, 2, 2, 5, 2, 2, 2, 2, 2, 2, 2, @@ -328,14 +401,14 @@ 2, 2, 2, 2, 2 } ; -static yyconst int yy_meta[26] = +static yyconst flex_int32_t yy_meta[26] = { 0, 1, 1, 1, 2, 1, 1, 1, 3, 4, 1, 1, 1, 1, 5, 6, 6, 1, 1, 1, 1, 6, 5, 1, 6, 5 } ; -static yyconst short int yy_base[50] = +static yyconst flex_int16_t yy_base[50] = { 0, 0, 0, 68, 100, 100, 100, 100, 100, 20, 0, 0, 44, 100, 12, 100, 14, 0, 30, 17, 100, @@ -344,7 +417,7 @@ 0, 50, 100, 75, 81, 85, 91, 93, 35 } ; -static yyconst short int yy_def[50] = +static yyconst flex_int16_t yy_def[50] = { 0, 43, 1, 43, 43, 43, 43, 43, 43, 44, 45, 46, 47, 43, 43, 43, 43, 48, 43, 43, 43, @@ -353,7 +426,7 @@ 49, 43, 0, 43, 43, 43, 43, 43, 43 } ; -static yyconst short int yy_nxt[126] = +static yyconst flex_int16_t yy_nxt[126] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 13, 13, 21, @@ -371,7 +444,7 @@ 43, 43, 43, 43, 43 } ; -static yyconst short int yy_chk[126] = +static yyconst flex_int16_t yy_chk[126] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -392,6 +465,9 @@ static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int yy_flex_debug; +int yy_flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -401,7 +477,6 @@ #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "scanner.l" -#define INITIAL 0 #line 2 "scanner.l" /* SPIM S20 MIPS simulator. Lexical scanner. @@ -475,7 +550,21 @@ #undef yywrap -#line 479 "lex.yy.c" +#line 554 "lex.yy.c" + +#define INITIAL 0 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif /* Macros after this point can all be overridden by user definitions in * section 1. @@ -483,65 +572,30 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int yywrap (void ); #else -extern int yywrap YY_PROTO(( void )); -#endif +extern int yywrap (void ); #endif - -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); #endif + static void yyunput (int c,char *buf_ptr ); + #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif +#ifdef __cplusplus +static int yyinput (void ); #else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 +static int input (void ); #endif -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -550,7 +604,6 @@ #endif /* Copy whatever the last rule matched to the standard output. */ - #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). @@ -563,9 +616,10 @@ */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -588,7 +642,9 @@ errno=0; \ clearerr(yyin); \ } \ - } + }\ +\ + #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -609,12 +665,18 @@ #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif +/* end tables serialization structures and prototypes */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. @@ -631,27 +693,29 @@ #define YY_RULE_SETUP \ YY_USER_ACTION +/** The main scanner function which does all the work. + */ YY_DECL - { +{ register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + #line 76 "scanner.l" -#line 644 "lex.yy.c" +#line 708 "lex.yy.c" - if ( yy_init ) + if ( (yy_init) ) { - yy_init = 0; + (yy_init) = 0; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! yy_start ) - yy_start = 1; /* first start state */ + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ if ( ! yyin ) yyin = stdin; @@ -659,34 +723,36 @@ if ( ! yyout ) yyout = stdout; - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); + } - yy_load_buffer_state(); + yy_load_buffer_state( ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); /* Support of yytext. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); yy_match: do { register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -703,24 +769,22 @@ yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ - switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); goto yy_find_action; case 1: @@ -735,6 +799,7 @@ } YY_BREAK case 2: +/* rule 2 can match eol */ YY_RULE_SETUP #line 87 "scanner.l" { @@ -942,6 +1007,7 @@ } YY_BREAK case 15: +/* rule 15 can match eol */ YY_RULE_SETUP #line 264 "scanner.l" { @@ -955,6 +1021,7 @@ } YY_BREAK case 16: +/* rule 16 can match eol */ YY_RULE_SETUP #line 274 "scanner.l" { @@ -993,33 +1060,33 @@ #line 303 "scanner.l" ECHO; YY_BREAK -#line 997 "lex.yy.c" +#line 1064 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -1029,13 +1096,13 @@ * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -1048,30 +1115,30 @@ yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1082,7 +1149,7 @@ * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -1090,30 +1157,30 @@ else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -1124,8 +1191,7 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ - +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1134,21 +1200,20 @@ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); register int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1168,34 +1233,30 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + size_t num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1208,8 +1269,7 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -1219,35 +1279,35 @@ YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + yyrestart(yyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1255,32 +1315,31 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; return ret_val; - } - +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { + static yy_state_type yy_get_previous_state (void) +{ register yy_state_type yy_current_state; register char *yy_cp; + + yy_current_state = (yy_start); - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 2); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1292,30 +1351,23 @@ } return yy_current_state; - } - +} /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + register char *yy_cp = (yy_c_buf_p); register YY_CHAR yy_c = 2; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1327,80 +1379,73 @@ yy_is_jam = (yy_current_state == 43); return yy_is_jam ? 0 : yy_current_state; - } - +} -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - while ( source > yy_current_buffer->yy_ch_buf ) + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - +#ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { - int c; - *yy_c_buf_p = yy_hold_char; +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -1414,16 +1459,16 @@ */ /* Reset buffer status. */ - yyrestart( yyin ); + yyrestart(yyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) + if ( yywrap( ) ) return EOF; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -1433,90 +1478,92 @@ } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +} +#endif /* ifndef YY_NO_INPUT */ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); } + yy_init_buffer(YY_CURRENT_BUFFER,input_file ); + yy_load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } + (yy_did_buffer_switch_on_eof) = 1; +} +static void yy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1525,84 +1572,75 @@ /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + yy_init_buffer(b,file ); return b; - } - +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * + */ + void yy_delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); - - yy_flex_free( (void *) b ); - } - - -#ifndef _WIN32 -#include -#else -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif -#endif + yyfree((void *) b->yy_ch_buf ); -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif + yyfree((void *) b ); +} +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - { - yy_flush_buffer( b ); +{ + int oerrno = errno; + + yy_flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} - { - if ( ! b ) +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void yy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -1619,29 +1657,121 @@ b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + yyensure_buffer_stack(); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void yypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; } +} +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -1655,47 +1785,42 @@ b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + yy_switch_to_buffer(b ); return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif +} +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param str a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str ) +{ + + return yy_scan_bytes(yy_str,strlen(yy_str) ); +} -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = len + 2; - buf = (char *) yy_flex_alloc( n ); + buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -1704,7 +1829,7 @@ buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = yy_scan_buffer(buf,n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -1714,148 +1839,164 @@ b->yy_is_our_buffer = 1; return b; - } -#endif - +} -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 #endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); - - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); +/* Redefine yyless() so it works in section 3 code. */ - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = (yy_hold_char); \ + (yy_c_buf_p) = yytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) - yy_start_stack[yy_start_stack_ptr++] = YY_START; +/* Accessor methods (get/set functions) to struct members. */ - BEGIN(new_state); - } -#endif +/** Get the current line number. + * + */ +int yyget_lineno (void) +{ + + return yylineno; +} +/** Get the input stream. + * + */ +FILE *yyget_in (void) +{ + return yyin; +} -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); +/** Get the output stream. + * + */ +FILE *yyget_out (void) +{ + return yyout; +} - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif +/** Get the length of the current token. + * + */ +int yyget_leng (void) +{ + return yyleng; +} +/** Get the current token. + * + */ -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif +char *yyget_text (void) +{ + return yytext; +} -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif +/** Set the current line number. + * @param line_number + * + */ +void yyset_lineno (int line_number ) +{ + + yylineno = line_number; +} -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) -#else -static void yy_fatal_error( msg ) -char msg[]; -#endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * in_str ) +{ + yyin = in_str ; +} +void yyset_out (FILE * out_str ) +{ + yyout = out_str ; +} +int yyget_debug (void) +{ + return yy_flex_debug; +} -/* Redefine yyless() so it works in section 3 code. */ +void yyset_debug (int bdebug ) +{ + yy_flex_debug = bdebug ; +} -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state(); + } + + /* Destroy the stack itself. */ + yyfree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + return 0; +} -/* Internal utility routines. */ +/* + * Internal utility routines. + */ #ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ register int i; - for ( i = 0; i < n; ++i ) + for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { +static int yy_flex_strlen (yyconst char * s ) +{ register int n; - for ( n = 0; s[n]; ++n ) + for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { +void *yyalloc (yy_size_t size ) +{ return (void *) malloc( size ); - } +} -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *yyrealloc (void * ptr, yy_size_t size ) +{ /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1864,28 +2005,31 @@ * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); - } +} -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } +void yyfree (void * ptr ) +{ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ +} -#if YY_MAIN -int main() - { - yylex(); - return 0; - } +#define YYTABLES_NAME "yytables" + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +/* #undef yytext_ptr */ +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL #endif #line 303 "scanner.l" + void @@ -2269,3 +2413,4 @@ return ((char *) r); } } + --- spim-7.1.orig/debian/dirs +++ spim-7.1/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/man/man1 +usr/lib/spim --- spim-7.1.orig/debian/docs +++ spim-7.1/debian/docs @@ -0,0 +1 @@ +README BLURB Documentation Tests --- spim-7.1.orig/debian/rules +++ spim-7.1/debian/rules @@ -0,0 +1,88 @@ +#!/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 + rm -f Tests/tt.endian.s + + 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 DESTDIR=`pwd`/debian/tmp 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 DESTDIR=`pwd`/debian/spim + #$(MAKE) install.man MAN_DIR=`pwd`/debian/tmp/usr/share/man/man1 + $(MAKE) install.man DESTDIR=`pwd`/debian/spim + mv debian/spim/usr/share/man/man1/spim.1x debian/spim/usr/share/man/man1/spim.1 + #rmdir debian/tmp/usr/man/man1 + #rmdir debian/tmp/usr/man + mv debian/spim/usr/share/man/man1/xspim.1x debian/spim/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_installman +# 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 --- spim-7.1.orig/debian/spim.menu +++ spim-7.1/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-7.1.orig/debian/copyright +++ spim-7.1/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-7.1.orig/debian/postinst.debhelper +++ spim-7.1/debian/postinst.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_installmenu +if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then + update-menus +fi +# End automatically added section --- spim-7.1.orig/debian/postrm.debhelper +++ spim-7.1/debian/postrm.debhelper @@ -0,0 +1,3 @@ +# Automatically added by dh_installmenu +if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi +# End automatically added section --- spim-7.1.orig/debian/substvars +++ spim-7.1/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libice6 | xlibs (>> 4.1.0), libsm6 | xlibs (>> 4.1.0), libx11-6 | xlibs (>> 4.1.0), libxaw7 (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), libxmu6 | xlibs (>> 4.1.0), libxpm4 | xlibs (>> 4.1.0), libxt6 | xlibs (>> 4.1.0) --- spim-7.1.orig/debian/compat +++ spim-7.1/debian/compat @@ -0,0 +1 @@ +4 --- spim-7.1.orig/debian/control +++ spim-7.1/debian/control @@ -0,0 +1,13 @@ +Source: spim +Section: non-free/electronics +Priority: optional +Maintainer: Fernando Sanchez +Build-Depends: debhelper (>= 4), flex, xutils, libx11-dev, libxaw7-dev +Standards-Version: 3.6.2 + +Package: spim +Architecture: any +Depends: ${shlibs:Depends} ${misc: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-7.1.orig/debian/changelog +++ spim-7.1/debian/changelog @@ -0,0 +1,109 @@ +spim (7.1-1ubuntu2) dapper; urgency=low + + * Fix xspim segfault. Patch from Gentoo (spim-7.1-font.patch) + * Adjusted Build-Depends for modularized Xorg + + -- Sebastian Dröge Fri, 4 Nov 2005 13:14:18 +0100 + +spim (7.1-1ubuntu1) dapper; urgency=low + + * Fix compilation with gcc 4.0 + + -- Sebastian Dröge Fri, 4 Nov 2005 12:59:33 +0100 + +spim (7.1-1) unstable; urgency=low + + * New upstream version (Closes: Bug#271608) + * Added Build-Depends on flex and debhelper (>= 4) + * Created debian/compat (V4) + * Updated Standards-Version to 3.6.2 + * Fixed unquoted strings in spim.menu + * Switched to dh_installman instead of dh_installmanpages + + -- Fernando Sanchez Sun, 3 Jul 2005 16:25:11 +0200 + +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-7.1.orig/Makefile +++ spim-7.1/Makefile @@ -2,13 +2,13 @@ # $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ # ---------------------------------------------------------------------- -# Makefile generated from "Imake.tmpl" and +# 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.116.2.1 2002/09/04 02:38:08 dawes Exp $ +# $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $ # ---------------------------------------------------------------------- all:: @@ -17,7 +17,9 @@ # $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 $ +# $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $ + +# Keep cpp from replacing path elements containing i486/i586/i686 # ----------------------------------------------------------------------- # site-specific configuration parameters that need to come before @@ -25,27 +27,31 @@ # site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ +# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ -# $XFree86: xc/config/cf/xf86site.def,v 3.179 2002/01/16 18:36:00 dawes Exp $ +# $XFree86: xc/config/cf/xf86site.def,v 3.182 2002/10/11 01:40:22 dawes Exp $ # ---------------------------------------------------------------------- -# platform-specific configuration parameters - edit sun.cf to change - -# platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $ +# platform-specific configuration parameters - edit linux.cf to change -# platform: $XFree86: xc/config/cf/sun.cf,v 3.61.2.1 2002/09/04 02:38:08 dawes Exp $ +# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -# operating system: SunOS 5.8 Generic_117350-04 sun4u (5.8.0) +# platform: $XFree86: xc/config/cf/linux.cf,v 3.201.2.1 2003/03/13 04:10:40 tsi Exp $ -# $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +# operating system: Linux 2.4.24-server-up-p4 i686 [ELF] (2.4.24) +# libc: (6.3.2) +# binutils: (215) -# $XFree86: xc/config/cf/svr4.cf,v 3.46 2002/01/15 22:59:23 dawes Exp $ +# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $ -# $XFree86: xc/config/cf/xfree86.cf,v 3.388 2002/01/03 22:51:54 alanh Exp $ +# $XFree86: xc/config/cf/xfree86.cf,v 3.439.2.2 2003/04/23 19:55:19 herrb Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ +VENDORMANNAME = XFree86 +VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + AFB_DEFS = -DUSE_AFB DRIVERSDKDIR = $(USRLIBDIR)/Server @@ -68,37 +74,13 @@ # $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ -# $Xorg: sv4Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - -# $XFree86: xc/config/cf/sv4Lib.rules,v 3.8 2001/05/28 02:42:25 tsi Exp $ - -# $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: $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 $ - - UWDEFS = -DUW $(AFSDEFS) $(KRB5DEFS) - -LDSTATICFLAGS = StaticLinkFlags -LDDYNAMICFLAGS = DynamicLinkFlags - -UWXDMDIR = /usr/adm/xdm - -XMISCDIR = /s/xmisc-1.0 - - XPMROOT = /s/xpm-3.4k - - XPMLIBDIR = $(XPMROOT)/lib - XPMBINDIR = $(XPMROOT)/bin - XPMMANDIR = $(XPMROOT)/man - XPMINCDIR = $(XPMROOT)/include +# site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files @@ -107,70 +89,88 @@ # # # -# rules: $XFree86: xc/config/cf/Imake.rules,v 3.102 2001/12/17 20:00:37 dawes Exp $ +# rules: $XFree86: xc/config/cf/Imake.rules,v 3.114 2003/03/19 01:49:23 dawes Exp $ -GLIDE2INCDIR = + _NULLCMD_ = @ echo -n -GLIDE3INCDIR = +GLIDE2INCDIR = /usr/include/glide -GLIDE3LIBNAME = +GLIDE3INCDIR = /usr/include/glide3 -TKLIBNAME = tk8.3 +GLIDE3LIBNAME = glide3 -TKLIBDIR = /s/tcl-8.3.3/lib +TKLIBNAME = tk8.4 -TCLLIBNAME = tcl8.3 +TKLIBDIR = /usr/lib -TCLIBDIR = /s/tcl-8.3.3/lib +TCLLIBNAME = tcl8.4 + +TCLIBDIR = /usr/lib PATHSEP = / - SHELL = /bin/sh + SHELL = /bin/sh -e TOP = . CURRENT_DIR = . IMAKE = imake DEPEND = gccmakedep + MKDIRHIER = mkdir -p REVPATH = revpath - EXPORTLISTGEN = exportlistgen - RMAN = rman - RMANOPTIONS = -f HTML + EXPORTLISTGEN = + RMAN = RmanCmd + RMANBASENAME = rman + RMANOPTIONS = RmanOptions CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/util - INCROOT = /s/XFree86-4.2.1/@sys/include - USRLIBDIR = /s/XFree86-4.2.1/@sys/lib + INCROOT = /usr/X11R6/include + USRLIBDIR = /usr/X11R6/lib VARDIR = /var VARLIBDIR = $(VARDIR)/lib SYSTEMUSRLIBDIR = /usr/lib SYSTEMUSRINCDIR = /usr/include - SHLIBDIR = /s/XFree86-4.2.1/@sys/lib + SHLIBDIR = /usr/X11R6/lib LINTLIBDIR = $(USRLIBDIR)/lint - MANPATH = /s/XFree86-4.2.1/@sys/man + MANPATH = /usr/X11R6/man MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)1 - LIBMANDIR = $(MANSOURCEPATH)3 - FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSUFFIX) - MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX) - DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX) + MANDIR = $(MANSOURCEPATH)$(MANSECT) + SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) + LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT) + FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) + GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) + MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT) + ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) + ICONDIR = /usr/X11R6/lib/X11/icons + XCURSORPATH = ~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons LOGDIRECTORY = $(VARDIR)/log - AR = /usr/ccs/bin/ar cqs + VARRUNDIR = $(VARDIR)/run + + VARDBDIR = $(VARDIR)/lib + + AR = ar clq + +# Nice try but useless: make will inherit BOOTSTRAPCFLAGS +# from top Makefile BOOTSTRAPCFLAGS = - CC = gcc - AS = /usr/ccs/bin/as + + CC = gcc -m32 + AS = gcc -m32 -c -x assembler .SUFFIXES: .cc - CXX = g++ + CXX = c++ -m32 + CXXFILT = c++filt CXXLIB = - CXXDEBUGFLAGS = -O2 + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ $(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) $(DEFINES) $(CXXEXTRA_DEFINES) @@ -178,45 +178,70 @@ COMPRESS = compress GZIPCMD = gzip - CPP = /usr/ccs/lib/cpp $(STD_CPP_DEFINES) - RAWCPP = /usr/ccs/lib/cpp -undef $(STD_CPP_OPTIONS) - PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES) - MKDIRHIER = sinstall mkdir -p - INSTALL = sinstall /usr/ucb/install + CPP = /usr/bin/cpp $(STD_CPP_DEFINES) + RAWCPP = /usr/bin/cpp -undef $(STD_CPP_OPTIONS) + PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) + INSTALL = install INSTALLFLAGS = -c - LD = /usr/ccs/bin/ld - LEX = /usr/ccs/bin/lex + + LD = gcc -m32 -nostdlib + + LEX = flex -l M4 = m4 M4FLAGS = - LEXLIB = -ll - YACC = /usr/ccs/bin/yacc - CCYACC = /usr/ccs/bin/yacc + LEXLIB = -lfl + YACC = bison -y + CCYACC = bison -y + LINT = lint - LINTLIBFLAG = -o - LINTOPTS = -bh + + LINTLIBFLAG = -C + LINTOPTS = -axz LN = ln -s - MAKE = /usr/ccs/bin/make + MAKE = make MV = mv -f CP = cp + RANLIB = ranlib + + RANLIBINSTFLAGS = + RM = rm -f PERL = perl PERLOPTS = - MANSUFFIX = 1x - LIBMANSUFFIX = 3x - FILEMANSUFFIX = 4 - MISCMANSUFFIX = 5 - DRIVERMANSUFFIX = 7 + + 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__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) + MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = gzip -n - TROFF = troff -Tps + TROFF = groff -Tps NROFF = nroff + + HTMLROFF = groff -Thtml + MSMACROS = -ms MANMACROS = -man TBL = tbl @@ -224,24 +249,32 @@ NEQN = neqn COL = col COLFLAGS = -b - MODCC = gcc - MODCPP = /usr/ccs/lib/cpp + + MODCC = gcc -m32 + + MODCPP = /usr/bin/cpp MODCFLAGS = $(CFLAGS) - MODAS = /usr/ccs/bin/as + MODAS = gcc -m32 -c -x assembler MODASFLAGS = - MODLD = /usr/ccs/bin/ld + + MODLD = gcc -m32 -nostdlib + MODLDFLAGS = MODLDCOMBINEFLAGS = -r - MODAR = /usr/ccs/bin/ar cqs + MODAR = ar clq + MODRANLIB = ranlib - STD_INCLUDES = -I$(XPMINCDIR) - STD_CPP_OPTIONS = - STD_CPP_DEFINES = -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ $(PROJECT_DEFINES) - STD_DEFINES = -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ $(PROJECT_DEFINES) + DVIPS = dvips + LATEX = latex + + STD_INCLUDES = + STD_CPP_OPTIONS = -traditional + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES) + STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES) EXTRA_LOAD_FLAGS = EXTRA_LDOPTIONS = - EXTRA_LIBRARIES = -lsocket -lnsl + EXTRA_LIBRARIES = TAGS = ctags PARALLELMFLAGS = @@ -249,13 +282,13 @@ SHAREDCODEDEF = SHLIBDEF = - SHLIBLDFLAGS = -G -z text + SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) PICFLAGS = -fPIC CXXPICFLAGS = -fPIC - PROTO_DEFINES = + PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO INSTPGMFLAGS = @@ -265,65 +298,58 @@ INSTINCFLAGS = -m 0444 INSTMANFLAGS = -m 0444 INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -g sys -m 2711 + INSTKMEMFLAGS = -m 4711 - PROJECTROOT = /s/XFree86-4.2.1/@sys + PROJECTROOT = /usr/X11R6 - CDEBUGFLAGS = -O2 - CCOPTIONS = -DNO_ASM + CDEBUGFLAGS = -g -O2 -fno-strict-aliasing + CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) $(SELINUX_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(SELINUX_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = -L$(USRLIBDIR) + LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) LDPOSTLIB = - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(SELINUX_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SELINUX_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - CCENVSETUP = LD_RUN_PATH=$(USRLIBDIRPATH) - CCLINK = $(CCENVSETUP) $(CC) + CCLINK = $(CC) - CXXENVSETUP = LD_RUN_PATH=$(USRLIBDIRPATH) - CXXLINK = $(CXXENVSETUP) $(CXX) + CXXLINK = $(CXX) LDSTRIPFLAGS = -x LDCOMBINEFLAGS = -r DEPENDFLAGS = - DEPEND_DEFINES = -DUSE_MAKEDEPEND + DEPEND_DEFINES = # Not sure this belongs here - TKLIBDIR = /s/tcl-8.3.3/lib - TKINCDIR = /s/tcl-8.3.3/include - TKLIBNAME = tk8.3 + TKLIBDIR = /usr/lib + TKINCDIR = /usr/include + TKLIBNAME = tk8.4 TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) - TCLLIBDIR = /s/tcl-8.3.3/lib - TCLINCDIR = /s/tcl-8.3.3/include - TCLLIBNAME = tcl8.3 + TCLLIBDIR = /usr/lib + TCLINCDIR = /usr/include + TCLLIBNAME = tcl8.4 TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) - MACROFILE = sun.cf + MACROFILE = linux.cf RM_CMD = $(RM) IMAKE_DEFINES = + IMAKE_WARNINGS = -Wundef IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -DUseInstalledMotif=0 -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) - -# $Xorg: Motif.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ + 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.6 2001/01/17 16:22:31 dawes Exp $ -# $Xorg: Motif.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules # $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ @@ -331,13 +357,13 @@ # # # -# $XFree86: xc/config/cf/X11.tmpl,v 1.141.2.1 2002/09/04 02:38:08 dawes Exp $ +# $XFree86: xc/config/cf/X11.tmpl,v 1.196.2.3 2003/10/08 17:56:30 eich Exp $ XORGRELSTRING = Release 6.6 XORGMANNAME = X Version 11 VENDORMANNAME = XFree86 -VENDORMANVERSION = Version `echo 4 2 1 | sed 's/ /./g'` +VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` STICKY_DEFINES = -DHAS_STICKY_DIR_BIT @@ -347,7 +373,7 @@ # X Window System make variables; these need to be coordinated with rules XTOP = $(TOP) - BINDIR = /s/XFree86-4.2.1/@sys/bin + BINDIR = /usr/X11R6/bin BUILDINCROOT = $(TOP)/exports BUILDINCDIR = $(BUILDINCROOT)/include BUILDINCTOP = ../.. @@ -363,18 +389,19 @@ XBUILDBINDIR = $(XBUILDINCROOT)/bin INCDIR = $(INCROOT) ADMDIR = /usr/adm - LIBDIR = $(USRLIBDIR)/X11 - LIBEXECDIR = /s/XFree86-4.2.1/@sys/libexec + LIBDIR = /usr/X11R6/lib/X11 + LIBEXECDIR = /usr/X11R6/libexec MODULEDIR = $(USRLIBDIR)/modules TOP_X_INCLUDES = - ETCX11DIR = /s/XFree86-4.2.1/@sys/etc + ETCX11DIR = /etc/X11 - CONFDIR = $(VARDIR) + CONFDIR = $(ETCX11DIR) DOCDIR = $(LIBDIR)/doc DOCHTMLDIR = $(DOCDIR)/html DOCPSDIR = $(DOCDIR)/PostScript + DOCPDFDIR = $(DOCDIR)/PDF FONTDIR = $(LIBDIR)/fonts ENCODINGSDIR = $(FONTDIR)/encodings XINITDIR = $(LIBDIR)/xinit @@ -388,7 +415,7 @@ LBXPROXYDIR = $(LIBDIR)/lbxproxy PROXYMANAGERDIR = $(LIBDIR)/proxymngr XPRINTDIR = $(LIBDIR)/xserver - XAPPLOADDIR = $(LIBDIR)/app-defaults + XAPPLOADDIR = /etc/X11/app-defaults FONTCFLAGS = -t INSTAPPFLAGS = $(INSTDATFLAGS) @@ -396,13 +423,13 @@ RGB = $(BINDIR)/rgb FONTC = $(BINDIR)/bdftopcf MKFONTDIR = $(BINDIR)/mkfontdir - XFTCACHE = $(BINDIR)/xftcache MKHTMLINDEX = $(BINDIR)/mkhtmlindex - UCS2ANY = $(BINDIR)/ucs2any.pl - BDFTRUNCATE = $(BINDIR)/bdftruncate.pl + UCS2ANY = $(BINDIR)/ucs2any + BDFTRUNCATE = $(BINDIR)/bdftruncate UCSMAPPREFIX = $(FONTDIR)/util/map- + XCURSORGEN = $(BINDIR)/xcursorgen - HTMLINDEXCMD = $(MKHTMLINDEX) + HTMLINDEXCMD = HtmlIndexCmd DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients @@ -432,32 +459,16 @@ PSWRAPSRC = $(XTOP)/config/pswrap TRANSCOMMSRC = $(LIBSRC)/xtrans TRANS_INCLUDES = -I$(TRANSCOMMSRC) - CONNECTION_FLAGS = -DTCPCONN -DUNIXCONN -DLOCALCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' - VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" + VENDORMANDEFS = -D__vendorversion__="\"$(VENDORMANVERSION)\" $(VENDORMANNAME)" XENVLIBDIR = $(USRLIBDIR) - CLIENTENVSETUP = LD_LIBRARY_PATH=$(MOTIFENVLIBDIR):$(XENVLIBDIR) - -# $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - -# $XFree86: xc/config/cf/sunLib.tmpl,v 3.12 2001/01/17 16:38:49 dawes Exp $ - -ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const + CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) -UNSHARED_CXXLIB = -static -lC - -# $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - -# $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.5 2001/01/17 16:38:50 dawes Exp $ - -XMULIBONLY = -lXmu - -REGEXSYSLIB = -lgen -DYNLIBSYSLIB = -ldl - -IAFSYSLIB = +# $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 @@ -519,7 +530,8 @@ XVLIBSRC = $(LIBSRC)/Xv -DEPXVLIB = $(USRLIBDIR)/libXv.a +SOXVREV = 1.0 +DEPXVLIB = XVLIB = -lXv LINTXV = $(LINTLIBDIR)/llib-lXv.ln @@ -538,6 +550,13 @@ LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln + XRESLIBSRC = $(LIBSRC)/XRes + +DEPXRESLIB = $(USRLIBDIR)/libXRes.a +XRESLIB = -lXRes + +LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln + DPSLIBSRC = $(LIBSRC)/dps SODPSREV = 1.0 @@ -585,22 +604,29 @@ LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln - XRENDERLIBSRC = $(LIBSRC)/Xrender - -SOXRENDERREV = 1.1 +XRENDERDIR = /usr +XRENDERLIBDIR = /usr/lib +XRENDERINCDIR = /usr/include +XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender DEPXRENDERLIB = -XRENDERLIB = -lXrender -LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln +XRENDERINCLUDES = -I$(XRENDERINCDIR) XRANDRRLIBSRC = $(LIBSRC)/Xrandr -SOXRANDRREV = 1.0 +SOXRANDRREV = 2.0 DEPXRANDRLIB = XRANDRLIB = -lXrandr LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln +XCURSORDIR = /usr +XCURSORLIBDIR = /usr/lib +XCURSORINCDIR = /usr/include +XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor + +XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES) + XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a @@ -640,8 +666,7 @@ OLDXLIBSRC = $(LIBSRC)/oldX -SOOLDXREV = 6.0 -DEPOLDXLIB = +DEPOLDXLIB = $(USRLIBDIR)/liboldX.a OLDXLIB = -loldX LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln @@ -767,14 +792,12 @@ FONTLIBSRC = $(LIBSRC)/font -SOFONTREV = 1.4 -DEPFONTLIB = +DEPFONTLIB = $(USRLIBDIR)/libXfont.a FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln # -SOFONTREV = 1.4 -DEPXFONTLIB = +DEPXFONTLIB = $(USRLIBDIR)/libXfont.a XFONTLIB = -lXfont LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln @@ -786,7 +809,7 @@ LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FONTFT2LIB) FONTENCLIBSRC = $(LIBSRC)/fontenc @@ -803,28 +826,70 @@ LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln - FREETYPE2LIBSRC = $(LIBSRC)/freetype2 - -SOFREETYPE2REV = 6.2 -DEPFREETYPE2LIB = -FREETYPE2LIB = -lfreetype +FREETYPE2DIR = /usr +FREETYPE2LIBDIR = /usr/lib +FREETYPE2INCDIR = /usr/include/freetype2 -LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln +FREETYPE2LIB = -lfreetype -FREETYPE2DIR = /s/freetype-2.1.2 -FREETYPE2LIBDIR = /s/freetype-2.1.2/lib -FREETYPE2INCDIR = /s/freetype-2.1.2/include/freetype2 FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype FREETYPE2DEFINES = -DFREETYPE2 - XFTLIBSRC = $(LIBSRC)/Xft + EXPATLIBSRC = $(LIBSRC)/expat + +SOEXPATREV = 1.0 +DEPEXPATLIB = +EXPATLIB = -lexpat -SOXFTREV = 1.1 -DEPXFTLIB = -XFTLIB = -lXft +LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln -LINTXFT = $(LINTLIBDIR)/llib-lXft.ln +EXPATDIR = /usr +EXPATLIBDIR = /usr/lib +EXPATINCDIR = /usr/include + +EXPATINCLUDES = + +EXPATLIB = -lexpat + +EXPATDEFINES = -DEXPAT + + XFT1LIBSRC = $(LIBSRC)/Xft1 + +SOXFT1REV = 1.1 +DEPXFT1LIB = +XFT1LIB = -lXft + +LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln + +XFTDIR = /usr +XFTLIBDIR = /usr/lib +XFTINCDIR = /usr/include +XFTLIB = -L$(XFTLIBDIR) -lXft + +XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES) + +FONTCONFIGDIR = /usr +FONTCONFIGLIBDIR = /usr/lib +FONTCONFIGINCDIR = /usr/include/fontconfig +FONTCONFIGBINDIR = /usr/bin + +FONTCONFIGLIB = -lfontconfig + +FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) + +FCCACHE = $(FONTCONFIGBINDIR)/fc-cache + +FONTCONFIGDEFINES = -DFONTCONFIG + +LIBPNGINCDIR = /usr/include + +LIBPNGINC= + +LIBPNGDIR = /usr +LIBPNGLIBDIR = /usr/lib +LIBPNGINCDIR = /usr/include + +LIBPNGLIB = -lpng XKBFILELIBSRC = $(LIBSRC)/xkbfile @@ -863,106 +928,18 @@ DEPLIBS9 = $(DEPLIBS) DEPLIBS10 = $(DEPLIBS) - MTOP = $(TOP) -TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC) - - UIL_INCLUDES = -I$(USRINCDIR)/uil - - MOTIFENVLIBDIR = $(MPROJECTROOT)/lib - - USRINCDIR = /s/XFree86-4.2.1/@sys/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 - - MPROJECTROOT = /s/motif-2.1.10 - - UIL = uil - DEPUIL = $(BINDIR)/uil - - XMEXTRA_LIBS = - -SOXMREV = 2.1 -DEPXMLIB = -XMLIB = -lXm - -LINTXM = $(LINTLIBDIR)/llib-lXm.ln - -SOMRMREV = 2.1 -DEPMRESOURCELIB = -MRESOURCELIB = -lMrm - -LINTMRESOURCE = $(LINTLIBDIR)/llib-lMrm.ln - -SOUILREV = 2.1 -DEPUILLIB = -UILLIB = -lUil - -LINTUIL = $(LINTLIBDIR)/llib-lUil.ln - -SOMCOMMONREV = 2.1 -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) $(DEPXPLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) +XMULIBONLY = -lXmu +XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) CONFIGDIR = $(LIBDIR)/config - USRLIBDIRPATH = /s/tcl-8.3.3/lib:/s/freetype-2.1.2/lib:/s/zlib-1.1.4-2/lib:/s/xpm-3.4k/lib:/s/XFree86-4.2.1/lib - LDPRELIBS = -L$(USRLIBDIR) -L$(MPROJECTROOT)/lib -L$(XPMLIBDIR) - LDPOSTLIBS = -L$(MPROJECTROOT)/lib - TOP_INCLUDES = -I$(INCROOT) $(TOP_MOTIF_INCLUDES) $(TOP_X_INCLUDES) - PROJECT_DEFINES = -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST + USRLIBDIRPATH = $(USRLIBDIR) + LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPOSTLIBS = + TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) + PROJECT_DEFINES = -CXXPROJECT_DEFINES = -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST +CXXPROJECT_DEFINES = # ---------------------------------------------------------------------- # start of Imakefile @@ -1011,13 +988,13 @@ # # Full path for directory that will hold the exception handler file: -EXCEPTION_DIR = . +EXCEPTION_DIR = /usr/lib/spim # Full path for the directory that will hold the executable files: -BIN_DIR = /usr/unsup/bin +BIN_DIR = /usr/bin # Full path for the directory that will hold the man files: -MAN_DIR = /var/unsup/man +MAN_DIR = /usr/share/man/man1 # If you have flex, use it instead of lex. If you use flex, define this # variable and set LEXFLAGS. @@ -1106,111 +1083,65 @@ install:: spim @if [ -d $(DESTDIR)$(BIN_DIR) ]; then \ - set +x; \ + set +x; \ else \ - if [ -h $(DESTDIR)$(BIN_DIR) ]; then \ - (set -x; rm -f $(DESTDIR)$(BIN_DIR)); \ - fi; \ - (set -x; $(MKDIRHIER) $(DESTDIR)$(BIN_DIR)); \ + 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; \ + set +x; \ else \ - if [ -h $(DESTDIR)$(BIN_DIR) ]; then \ - (set -x; rm -f $(DESTDIR)$(BIN_DIR)); \ - fi; \ - (set -x; $(MKDIRHIER) $(DESTDIR)$(BIN_DIR)); \ + 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 -all:: spim.$(MANSUFFIX).html - -spim.$(MANSUFFIX).html: spim.$(MANNEWSUFFIX) - $(RM) spim.$(MANSUFFIX).html spim.$(MANSUFFIX)-html - $(RMAN) $(RMANOPTIONS) < spim.$(MANNEWSUFFIX) \ - > spim.$(MANSUFFIX)-html && $(MV) spim.$(MANSUFFIX)-html $@ - -install.man:: spim.$(MANSUFFIX).html - @if [ -d $(DESTDIR)$(DOCHTMLDIR) ]; then \ - set +x; \ - else \ - if [ -h $(DESTDIR)$(DOCHTMLDIR) ]; then \ - (set -x; rm -f $(DESTDIR)$(DOCHTMLDIR)); \ - fi; \ - (set -x; $(MKDIRHIER) $(DESTDIR)$(DOCHTMLDIR)); \ - fi - @(SUF=`expr $(MANSUFFIX) \: '\(.\)'`; \ - set -x; \ - $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) spim.$(MANSUFFIX).html $(DESTDIR)$(DOCHTMLDIR)/spim.$$SUF.html) - -cleandir:: - $(RM) spim.$(MANSUFFIX).html spim.$(MANSUFFIX)-html - all:: spim.$(MANNEWSUFFIX) spim.$(MANNEWSUFFIX): spim.$(MANSRCSUFFIX) $(RM) $@ cd `dirname spim` && \ - $(LN) `basename spim.$(MANSRCSUFFIX)` `basename $@` + $(LN) `basename spim.$(MANSRCSUFFIX)` `basename $@` cleandir:: $(RM) spim.$(MANNEWSUFFIX) install.man:: spim.$(MANNEWSUFFIX) @if [ -d $(DESTDIR)$(MAN_DIR) ]; then \ - set +x; \ + set +x; \ else \ - if [ -h $(DESTDIR)$(MAN_DIR) ]; then \ - (set -x; rm -f $(DESTDIR)$(MAN_DIR)); \ - fi; \ - (set -x; $(MKDIRHIER) $(DESTDIR)$(MAN_DIR)); \ + 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.$(MANSUFFIX).html - -xspim.$(MANSUFFIX).html: xspim.$(MANNEWSUFFIX) - $(RM) xspim.$(MANSUFFIX).html xspim.$(MANSUFFIX)-html - $(RMAN) $(RMANOPTIONS) < xspim.$(MANNEWSUFFIX) \ - > xspim.$(MANSUFFIX)-html && $(MV) xspim.$(MANSUFFIX)-html $@ - -install.man:: xspim.$(MANSUFFIX).html - @if [ -d $(DESTDIR)$(DOCHTMLDIR) ]; then \ - set +x; \ - else \ - if [ -h $(DESTDIR)$(DOCHTMLDIR) ]; then \ - (set -x; rm -f $(DESTDIR)$(DOCHTMLDIR)); \ - fi; \ - (set -x; $(MKDIRHIER) $(DESTDIR)$(DOCHTMLDIR)); \ - fi - @(SUF=`expr $(MANSUFFIX) \: '\(.\)'`; \ - set -x; \ - $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xspim.$(MANSUFFIX).html $(DESTDIR)$(DOCHTMLDIR)/xspim.$$SUF.html) - -cleandir:: - $(RM) xspim.$(MANSUFFIX).html xspim.$(MANSUFFIX)-html - all:: xspim.$(MANNEWSUFFIX) xspim.$(MANNEWSUFFIX): xspim.$(MANSRCSUFFIX) $(RM) $@ cd `dirname xspim` && \ - $(LN) `basename xspim.$(MANSRCSUFFIX)` `basename $@` + $(LN) `basename xspim.$(MANSRCSUFFIX)` `basename $@` cleandir:: $(RM) xspim.$(MANNEWSUFFIX) install.man:: xspim.$(MANNEWSUFFIX) @if [ -d $(DESTDIR)$(MAN_DIR) ]; then \ - set +x; \ + set +x; \ else \ - if [ -h $(DESTDIR)$(MAN_DIR) ]; then \ - (set -x; rm -f $(DESTDIR)$(MAN_DIR)); \ - fi; \ - (set -x; $(MKDIRHIER) $(DESTDIR)$(MAN_DIR)); \ + 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) @@ -1285,22 +1216,17 @@ etags *.l *.y *.c *.h cleandir:: - rm -f spim xspim *.o y.output core a.out TAGS \ - .spim-made spim.tar.* + rm -f spim xspim *.o y.output core a.out TAGS .spim-made spim.tar.* 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 + 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 # -TAR_FILES = Configure BLURB README Imakefile Makefile.std *.c *.h *.y *.l \ - exceptions.s Tests/tt.* VERSION Documentation spim.man xspim.man +TAR_FILES = Configure BLURB README Imakefile Makefile.std *.c *.h *.y *.l exceptions.s Tests/tt.* VERSION Documentation spim.man xspim.man Documentation/spim.ps: Documentation/spim.tex - cd Documentation; latex spim.tex; latex spim.tex; dvips -D 300 spim.dvi; \ - rm -f spim.aux spim.log spim.dvi + cd Documentation; latex spim.tex; latex spim.tex; dvips -D 300 spim.dvi; rm -f spim.aux spim.log spim.dvi tar: Documentation/spim.ps mkdir Hide @@ -1458,13 +1384,13 @@ .c.i: $(RM) $@ - $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ + $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ .SUFFIXES: .s .c.s: $(RM) $@ - $(CC) -S $(CFLAGS) $(_NOOP_) $*.c + $(CC) -S $(CFLAGS) $(_NOOP_) $*.c emptyrule:: @@ -1482,10 +1408,8 @@ $(TAGS) -xw *.[ch] > TAGS man_keywords:: - catman -M $(DESTDIR)$(MANPATH) -w html_index:: - $(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR) clean:: cleandir @@ -1510,7 +1434,7 @@ depend:: distclean:: - $(RM) Makefile + $(RM) Makefile Makefile.dep # ---------------------------------------------------------------------- # dependencies generated by makedepend --- spim-7.1.orig/spim.c +++ spim-7.1/spim.c @@ -111,7 +111,7 @@ /* Non-zero => load standard exception handler */ static int load_exception_handler = 1; -static char *exception_file_name = DEFAULT_EXCEPTION_HANDLER; +char *exception_file_name = DEFAULT_EXCEPTION_HANDLER; static int console_state_saved; #ifdef USE_TERMIOS static struct termios saved_console_state; --- spim-7.1.orig/xspim.c +++ spim-7.1/xspim.c @@ -416,7 +416,7 @@ toplevel = XtAppInitialize (&app_context, "Xspim", options, XtNumber (options), &argc, argv, - fallback_resources, NULL, ZERO); + NULL, NULL, ZERO); if (argc >= 0 && argv[argc] != NULL && argv[argc][0] == '-') syntax (argv[0]); /* Bad command line argument */