Changeset 53ca3d in git


Ignore:
Timestamp:
Mar 23, 2011, 5:45:45 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
1b49fffcc09b3cc35d86a2d919252c972d6515eb
Parents:
0145cb4989c3ace04091d0ad6bbda0bb91971b14
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-23 17:45:45+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:12+01:00
Message:
FIX: separate CC Flags for debug/release lib-versions
FIX: config.h should NOT be installed and thus used by public headers
FIX: include local "config.h" before including <misc/auxiliary.h>
Location:
libpolys/misc
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • libpolys/misc/Makefile.am

    r0145cb4 r53ca3d  
    11lib_LIBRARIES=libmisc.a libmisc_g.a
    22
    3 AM_CFLAGS       = -O3 -w -fomit-frame-pointer ${PIPE}
    4 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
    5 AM_CXXFLAGS     = -O3 -w -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
    6 INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
    7 AM_CPPFLAGS     = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     3CXXTEMPLFLAGS      = -fno-implicit-templates --no-exceptions
    84
    9 SOURCES = intvec.cc
     5libmisc_a_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     6libmisc_g_a_CFLAGS = ${PIPE}
    107
    11 libmisc_a_SOURCES = $(SOURCES)
     8libmisc_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     9libmisc_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
     10# -fdiagnostics-show-option
    1211
    13 libmisc_a_includedir=$(includedir)/libpolys/misc
     12libmisc_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     13libmisc_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 libmisc_a_include_HEADERS = auxiliary.h mylimits.h options.h intvec.h
     15INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
    1616
     17SOURCES  = intvec.cc
     18libmisc_a_SOURCES   = $(SOURCES)
    1719libmisc_g_a_SOURCES = $(SOURCES)
    1820
    19 libmisc_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    20 # -fdiagnostics-show-option
     21libmisc_a_includedir  =$(includedir)/libpolys/misc
     22libmisc_g_a_includedir=$(includedir)/libpolys/misc
     23
     24MISCHEADERS  = auxiliary.h mylimits.h options.h intvec.h
     25libmisc_a_include_HEADERS   = $(MISCHEADERS)
     26libmisc_g_a_include_HEADERS = $(MISCHEADERS)
     27
     28
     29

  • libpolys/misc/auxiliary.h

    r0145cb4 r53ca3d  
    1818#define MISC_AUXILIARY_H
    1919
    20 #include "misc/config.h"
    21      
    2220// ----------------- which parts/extensions of Singular to build
    2321#define HAVE_RINGS
     22#define HAVE_PLURAL
    2423
    2524// no factory yet...
    … …  
    3029// -----------------  configure stuff
    3130
    32 /* CPU type: i[3456]86: */
     31/*
     32// CPU type: i[3456]86:
    3333#undef SI_CPU_I386
    34 /* CPU type: sparc: */
     34// CPU type: sparc:
    3535#undef SI_CPU_SPARC
    36 /* CPU type: ppc: */
     36// CPU type: ppc:
    3737#undef SI_CPU_PPC
    38 /* CPU type: IA64: */
     38// CPU type: IA64:
    3939#undef SI_CPU_IA64
    40 /* CPU type: x86_64: */
     40// CPU type: x86_64:
    4141#undef SI_CPU_X86_64
    42 
    43 /* Define sizeof(long) */
     42// Define sizeof(long)
    4443#define SIZEOF_LONG 4
     44*/
     45
     46
    4547
    4648/* Define version as a string */
    … …  
    4951/* Absolute pathname of root directory of Singular source */
    5052#define S_ROOT_DIR ""
    51 
    5253
    5354// ----------------- end of configure stuff

  • libpolys/misc/intvec.cc

    r0145cb4 r53ca3d  
    88#ifndef INTVEC_CC
    99#define INTVEC_CC
     10
     11#include "config.h"
     12#include <misc/auxiliary.h>
     13
    1014// #include <resources/feFopen.h>
    1115#include <misc/intvec.h>
Note: See TracChangeset for help on using the changeset viewer.