Changeset 2649c5 in git


Ignore:
Timestamp:
Sep 12, 2007, 11:31:40 AM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
3952b09109e6bea4c8f045f60329ee2fd1e52cd6
Parents:
ac1aa29db9af55386c48180b044b115e3fbd5e01
Message:
*hannes: path in generated makefiles


git-svn-id: file:///usr/local/Singular/svn/trunk@10297 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
modules/modgen
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • modules/modgen/Makefile.in

    rac1aa29 r2649c5  
    110110        echo "" >> pathnames.h
    111111        echo "#define TOPSRCDIR \"$(topsrcdir)\"" >> pathnames.h
    112         echo "#define LIBDIR    \"$(libdir)\"" >> pathnames.h
    113         echo "#define PREFIX    \"$(prefix)\"" >> pathnames.h
    114         echo "#define EXEC_PREFIX       \"$(exec_prefix)\"" >> pathnames.h
     112        echo "#define SINGUNAME \"$(SINGUNAME)\"" >> pathnames.h
    115113
    116114scanner.cc: scanner.l mod_grammar.h modgen.h
    117         $(LEX) scanner.l > scanner.cc
     115        @if test -r scanner.cc; then \
     116                touch scanner.cc ;\
     117        else \
     118        if test "x${LEX}" = x; then \
     119                echo Error: no lex given, could not rebuilt scanner.cc;\
     120                exit 1; \
     121        fi\
     122        fi
     123        ${LEX} -s -I -t scanner.l > scanner.cc.lmp
     124        cp scanner.cc.lmp scanner.cc
    118125
    119126#       $(LEX) -Pyymod scanner.l > scanner.cc

  • modules/modgen/main.cc

    rac1aa29 r2649c5  
    7777int do_create_makefile = 1;
    7878int do_create_srcdir = 1;
    79 char* inst_dir = EXEC_PREFIX;
     79char* inst_dir = "${SINGULARROOT}/${SINGUNAME}";
    8080
    8181#ifdef IRIX_6

  • modules/modgen/makefile.cc

    rac1aa29 r2649c5  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: makefile.cc,v 1.28 2006-11-09 13:23:43 Singular Exp $ */
     4/* $Id: makefile.cc,v 1.29 2007-09-12 09:31:40 Singular Exp $ */
    55/*
    66* ABSTRACT: lib parsing
    … …  
    9797  fprintf(fp, "CC\t= gcc\n");
    9898  fprintf(fp, "CXX\t= gcc\n");
     99  fprintf(fp, "SINGULARROOT\t= ../..\n");
    99100#warning "PROBLEM: nice place for include file has to be found"
    100   fprintf(fp, "CFLAGS\t= -DNDEBUG -DBUILD_MODULE -I. -I%s/kernel -I%s/Singular -I%s/include\n",PREFIX,PREFIX,EXEC_PREFIX);
    101   fprintf(fp, "DCFLAGS\t= -DBUILD_MODULE -I. -I%s/kernel -I%s/Singular -I%s/include\n",PREFIX,PREFIX,EXEC_PREFIX);
     101  fprintf(fp, "CFLAGS\t= -DNDEBUG -DBUILD_MODULE -I. -I${SINGULARROOT}/kernel -I${SINGULARROOT}/Singular -I${SINGULARROOT}/%s/include\n",SINGUNAME);
     102  fprintf(fp, "DCFLAGS\t= -DBUILD_MODULE -I. -I${SINGULARROOT}/kernel -I${SINGULARROOT}/Singular -I${SINGULARROOT}/%s/include\n",SINGUNAME);
    102103  fprintf(fp, "#LD\t=\n");
    103104  fprintf(fp, "\n");
    104105  fprintf(fp, "instdir          = %s\n", inst_dir );
    105   fprintf(fp, "MKINSTALLDIRS\t\t= %s/modules/mkinstalldirs\n", PREFIX);
     106  fprintf(fp, "MKINSTALLDIRS\t\t= ${SINGULARROOT}/modules/mkinstalldirs\n");
    106107#warning "PROBLEM: do we also install install-sh when installing Singular?"
    107   fprintf(fp, "INSTALL\t\t= %s/Singular/install-sh -c\n", PREFIX);
     108  fprintf(fp, "INSTALL\t\t= ${SINGULARROOT}/Singular/install-sh -c\n");
    108109  fprintf(fp, "INSTALL_PROGRAM\t= ${INSTALL}\n");
    109110  fprintf(fp, "INSTALL_DATA\t= ${INSTALL} -m 644\n");

  • modules/modgen/scanner.cc

    rac1aa29 r2649c5  
    1 #line 2 "scanner.cc"
    21/* A lexical scanner generated by flex */
    32
    43/* Scanner skeleton version:
    5  * $Header: /exports/cvsroot-2/cvsroot/modules/modgen/scanner.cc,v 1.4 2006-12-07 10:12:07 Singular Exp $
     4 * $Header: /exports/cvsroot-2/cvsroot/modules/modgen/scanner.cc,v 1.5 2007-09-12 09:31:40 Singular Exp $
    65 */
    76
    … …  
    1110
    1211#include <stdio.h>
     12#include <unistd.h>
    1313
    1414
    … …  
    2424
    2525#include <stdlib.h>
    26 #include <unistd.h>
    2726
    2827/* Use prototypes in function declarations. */
    … …  
    703702*  Computer Algebra System SINGULAR     *
    704703****************************************/
    705 /* $Id: scanner.cc,v 1.4 2006-12-07 10:12:07 Singular Exp $ */
     704/* $Id: scanner.cc,v 1.5 2007-09-12 09:31:40 Singular Exp $ */
    706705#include <stdio.h>
    707706#include <string.h>
    … …  
    830829#define cstring 20
    831830
    832 #line 833 "scanner.cc"
    833831
    834832/* Macros after this point can all be overridden by user definitions in
    … …  
    991989       static int quote  = 0;  /* " */
    992990
    993 #line 994 "scanner.cc"
    994991
    995992        if ( yy_init )
    … …  
    18561853YY_RULE_SETUP
    18571854#line 543 "scanner.l"
    1858 ECHO;
    1859         YY_BREAK
    1860 #line 1861 "scanner.cc"
     1855YY_FATAL_ERROR( "flex scanner jammed" );
     1856        YY_BREAK
    18611857case YY_STATE_EOF(preamble):
    18621858case YY_STATE_EOF(MODINITIAL):
    … …  
    22562252
    22572253
     2254#ifndef YY_NO_INPUT
    22582255#ifdef __cplusplus
    22592256static int yyinput()
    … …  
    23282325        return c;
    23292326        }
    2330 
     2327#endif /* YY_NO_INPUT */
    23312328
    23322329#ifdef YY_USE_PROTOS
    … …  
    24392436
    24402437
    2441 #ifndef YY_ALWAYS_INTERACTIVE
    2442 #ifndef YY_NEVER_INTERACTIVE
    2443 extern int isatty YY_PROTO(( int ));
    2444 #endif
    2445 #endif
    24462438
    24472439#ifdef YY_USE_PROTOS
Note: See TracChangeset for help on using the changeset viewer.