Changeset 3449431 in git


Ignore:
Timestamp:
Aug 31, 2011, 2:18:56 AM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
13a8deb045504711d73aa092f40117737cc315a2
Parents:
4a4e294c1281857cdf5d91f50cfa1c1f222226b1
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-31 02:18:56+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:31+01:00
Message:
FIX: tesths.cc should be compiled without -DLIBSINGULAR!
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/makefile

    r4a4e29 r3449431  
    5353CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
    5454CPPFLAGS        = -I${srcdir} -I..  -I${includedir} ${LIBPOLYS_INCLUDES}  ${PYTHON_INCLUDES}
    55 DEFS            = -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
     55DEFSNL          = -DNDEBUG -DOM_NDEBUG
     56DEFS            = ${DEFSNL} -DLIBSINGULAR
    5657LDFLAGS         = -L${srcdir}/lib
    5758LD_DYN_FLAGS    = -ldl -rdynamic
     
    225226all: libSingular_g.a libSingular.a Singular Singularg
    226227
     228tesths.og: %.og: %.cc
     229        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSGNL} -c $< -o $@
     230       
     231tesths.o: %.o: %.cc
     232        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSNL} -c $< -o $@
     233
    227234Singular: tesths.o libSingular.a
    228235        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.o -o $@ -L. -lSingular -L../kernel -lkernel ${LIBPOLYS_LIBS}
     
    256263        @echo "bison, perl and autoconf"
    257264
    258 #dep.
     265#dep. ( manually?!! :((( )
    259266feOpt.h: feOpt.inc
    260 
     267cntrlc.cc: feOpt.inc
     268iparith.cc: iparith.inc
    261269misc_ip.cc: feOpt.h
    262270
     
    267275
    268276
    269 iparith.o :iparith.inc
    270 
    271277##
    272278## miscellanous targets
     
    300306CCM             = gcc -MM -MG -DGENERATE_DEPEND
    301307
    302 DEFSG           =   -DLIBSINGULAR
     308DEFSGNL         =
     309DEFSG           = ${DEFSGNL} -DLIBSINGULAR
    303310
    304311CFLAGSG         = -Wall ${PIPE} ${LIBPOLYS_CFLAGS} ${PYTHON_CFLAGS}
Note: See TracChangeset for help on using the changeset viewer.