Changeset 725e600 in git for Singular/Makefile.in


Ignore:
Timestamp:
Sep 14, 2011, 12:45:48 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
327efa20e70d58adf952cceee8f24ae2a24079c5
Parents:
3426de24a82fe29ddf501d02bcb6bd50a782f43f
Message:
fix tr. 368

git-svn-id: file:///usr/local/Singular/svn/trunk@14381 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.in

    r3426de2 r725e600  
    8787ifneq ($(SINGUNAME),ix86-Win)
    8888LDFLAGS         = -L@prefix@/kernel -L../kernel -lkernel @LDFLAGS@
    89 LDFLAGSG        = -L@prefix@/kernel -L../kernel -lkernel_g @LDFLAGS@
    90 LDFLAGSP        = -L@prefix@/kernel -L../kernel -lkernel_p @LDFLAGS@
     89LDFLAGSG        = -L@prefix@/kernel -L../kernel -lkernel_g @LD_DYN_FLAGS1@ @LDFLAGS@
     90LDFLAGSP        = -L@prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@ @LDFLAGS@
    9191else
    9292## -L/usr/local/lib -L@prefix@/modules/python --> PySingular
    … …  
    9595LDFLAGSP        = -L@prefix@/kernel -L/bin -lkernel_p @LDFLAGS@
    9696endif
    97 LD_DYN_FLAGS    = @LD_DYN_FLAGS@
     97LD_DYN_FLAGS1   = @LD_DYN_FLAGS1@
     98LD_DYN_FLAGS2   = @LD_DYN_FLAGS2@
    9899SFLAGS          = @SFLAGS@
    99100SLDFLAGS        = @SLDFLAGS@
    … …  
    181182GLIBC_DYN_FIX=
    182183else
    183 LDFLAGS  := ${LD_DYN_FLAGS} ${LDFLAGS}
     184LDFLAGS  := ${LD_DYN_FLAGS1} ${LDFLAGS} ${LD_DYN_FLAGS2}
    184185SING_EXEC = Singular
    185186LIBS := ${LIBS} ${PYTHON_LIBS}
    … …  
    752753        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -o Singularg${S_EXT} \
    753754        tesths.cc iparith.og mpsr_Tok.og claptmpl.og $(OBJG) ${LDFLAGSG} ${LIBSG} -lomalloc ../kernel/mmalloc.og \
    754         ${LD_DYN_FLAGS} ${LD_LIBC}
     755        ${LD_DYN_FLAGS2} ${LD_LIBC}
    755756
    756757iparith.og: iparith.inc iparith.cc
    … …  
    832833        $(CXXP) ${CXXFLAGSP} ${CXXTEMPLFLAGSP} ${CPPFLAGS} ${DEFSP} -o Singularp${S_EXT} \
    833834        tesths.cc iparith.op mpsr_Tok.op claptmpl.op $(OBJP) ${LDFLAGSP} ${LIBSP} -lomalloc ../kernel/mmalloc.op \
    834         ${LD_DYN_FLAGS}
     835        ${LD_DYN_FLAGS2}
    835836
    836837iparith.op: iparith.inc iparith.cc
Note: See TracChangeset for help on using the changeset viewer.