Changeset 7c5f743 in git


Ignore:
Timestamp:
Nov 19, 2011, 3:01:59 AM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
cfbfd926d964ae3757235dc9f4f9f63a27e39148
Parents:
584f6b04534bcfa0f21a5d9bfed5be5d5e5ca323
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-19 03:01:59+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-19 03:27:47+01:00
Message:
ADD: try using ${abs_*}-variables in several Makefile.am's
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r584f6b0 r7c5f743  
    175175# handle all the generated *.inc
    176176
    177 AM_LDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/resources -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc
     177AM_LDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys -L${abs_top_builddir}/libpolys/coeffs -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/resources -L${abs_top_builddir}/libpolys/misc $(USE_FACTORY) -L${abs_top_builddir}/omalloc
    178178
    179179noinst_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
    … …  
    270270
    271271feOpt.inc: feOpt
    272         ./feOpt
     272        ${abs_builddir}/feOpt
    273273
    274274feOptES.inc: feOptES
    275         ./feOptES
     275        ${abs_builddir}/feOptES
    276276
    277277feOptTS.inc: feOptTS
    278         ./feOptTS
     278        ${abs_builddir}/feOptTS
    279279
    280280plural_cmd.inc iparith.inc: gentable1
    281         ./gentable1
     281        ${abs_builddir}/gentable1
    282282
    283283# fake rule to fix parallel make http://www.gnu.org/s/hello/manual/automake/Multiple-Outputs.html
    … …  
    285285
    286286mpsr_Tok.inc: gentable2
    287         ./gentable2
    288 
     287        ${abs_builddir}/gentable2
     288

  • libpolys/polys/Makefile.am

    r584f6b0 r7c5f743  
    1010AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
    1111
    12 INCLUDES        = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
    13 AM_LDFLAGS      = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/../omalloc -L${builddir}
     12INCLUDES        = -I${abs_top_srcdir} -I${abs_top_srcdir}/.. -I${abs_top_builddir} -I${abs_top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
     13AM_LDFLAGS      = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${abs_top_builddir}/resources -L${abs_top_builddir}/../omalloc -L${abs_builddir}
    1414
    1515if ENABLE_P_PROCS_STATIC

  • omalloc/Makefile.am

    r584f6b0 r7c5f743  
    11ACLOCAL_AMFLAGS = -I ../m4
    2 AM_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
    32
    43lib_LTLIBRARIES=libomalloc.la libomalloc_g.la
    … …  
    2827EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
    2928
    30 INCLUDES=-I${top_srcdir}/.. -I${top_builddir}/..
     29INCLUDES=-I${abs_top_srcdir}/.. -I${abs_top_builddir}/..
    3130
    3231libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
    … …  
    5655## Test program
    5756##
     57# AM_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
     58
     59
    5860TESTS = omtTest-g omtTest-m omtTest-r
    5961check_PROGRAMS = $(TESTS)
    … …  
    6769omtTest_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    6870omtTest_g_LDADD = -lomalloc_g
     71omtTest_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
     72
    6973
    7074# omtTest_m: libomalloc_g.la
    … …  
    7377omtTest_m_SOURCES  = $(OMTTESTSSOURCES)
    7478omtTest_m_LDADD = -lomalloc_g
     79omtTest_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
    7580
    7681# omtTest_r: libomalloc.la
    … …  
    8085omtTest_r_CFLAGS = -O3
    8186omtTest_r_LDADD = -lomalloc
     87omtTest_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
    8288
Note: See TracChangeset for help on using the changeset viewer.