Changeset 240fe3 in git


Ignore:
Timestamp:
Jan 2, 2012, 9:56:12 AM (11 years ago)
Author:
Jan Engelhardt <jengelh@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
7d62506924687f1914af2e044e72b7886ce66aa3
Parents:
0560897fe3dd0b7d8eae37d99a3154ebf84cb0cc
git-author:
Jan Engelhardt <jengelh@inai.de>2012-01-02 09:56:12+01:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-12-06 20:20:39+01:00
Message:
build: use simpler relative path specifications

Cosmetic only. It makes the compile lines somewhat shorter.

As for commands, builddir is always ".", so there is no need to use
${abs_builddir} or ${builddir} AFAICS.
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r056089 r240fe3  
    207207endif
    208208
    209 AMLDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
     209AMLDFLAGS = -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/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
    210210
    211211Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    … …  
    221221Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
    222222
    223 Singular_LDADD = libSingular.la ${abs_top_builddir}/numeric/libnumeric.la ${abs_top_builddir}/kernel/libkernel.la ${abs_top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    224 Singularg_LDADD = libSingular_g.la ${abs_top_builddir}/numeric/libnumeric_g.la ${abs_top_builddir}/kernel/libkernel_g.la ${abs_top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     223Singular_LDADD = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     224Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    225225
    226226Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    … …  
    310310########################### TEST #########################
    311311
    312 TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables'
    313 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
     312TESTS_ENVIRONMENT = SINGULARPATH='${top_builddir}/Singular/LIB:${top_srcdir}/Singular/LIB:${top_builddir}/libpolys/polys/.libs:${top_builddir}/factory/gftables'
     313TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${top_builddir}'
    314314
    315315if WANT_DEBUG
    … …  
    370370
    371371feOpt.inc: feOptGen
    372         ${abs_builddir}/feOptGen
     372        ${builddir}/feOptGen
    373373
    374374feOptES.inc: feOptES
    375         ${abs_builddir}/feOptES
     375        ${builddir}/feOptES
    376376
    377377feOptTS.inc: feOptTS
    378         ${abs_builddir}/feOptTS
     378        ${builddir}/feOptTS
    379379
    380380plural_cmd.inc iparith.inc: gentable1
    381         ${abs_builddir}/gentable1
     381        ${builddir}/gentable1
    382382
    383383# # fake rule to fix parallel make http://www.gnu.org/s/hello/manual/automake/Multiple-Outputs.html
    … …  
    385385
    386386
    387 gftables: ${abs_top_srcdir}/factory/gftables
    388         ln -snf ${abs_top_srcdir}/factory/gftables ${abs_builddir}/gftables
    389 
    390 MOD: ${abs_top_builddir}/libpolys/polys/.libs
    391         ln -snf ${abs_top_builddir}/libpolys/polys/.libs/ ${abs_builddir}/MOD
     387gftables: ${top_srcdir}/factory/gftables
     388        ln -snf ${top_srcdir}/factory/gftables ${builddir}/gftables
     389
     390MOD: ${top_builddir}/libpolys/polys/.libs
     391        ln -snf ${top_builddir}/libpolys/polys/.libs/ ${builddir}/MOD

  • dyn_modules/bigintm/Makefile.am

    r056089 r240fe3  
    3131
    3232AMLDFLAGS       =
    33 # -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
    34 # -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
     33# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
     34# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
    3535
    3636

  • dyn_modules/syzextra/Makefile.am

    r056089 r240fe3  
    3131
    3232AMLDFLAGS       =
    33 # -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
    34 # -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
     33# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
     34# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
    3535
    3636

  • factory/Makefile.am

    r056089 r240fe3  
    1818
    1919libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
    20 libfactory_la_LIBADD     = ${abs_builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
     20libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
    2121libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    2222libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
    23 libfactory_g_la_LIBADD   = ${abs_builddir}/libfac/libfac_g.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
     23libfactory_g_la_LIBADD   = ${builddir}/libfac/libfac_g.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
    2424libfactory_g_la_LDFLAGS  = -release ${PACKAGE_VERSION}
    2525
    … …  
    304304check_PROGRAMS = $(TESTS)
    305305
    306 AMLDFLAGS =  -L${abs_builddir}
     306AMLDFLAGS =  -L${builddir}
    307307
    308308TESTSSOURCES = test.cc

  • libpolys/coeffs/Makefile.am

    r056089 r240fe3  
    5151endif
    5252
    53 AMLDFLAGS = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${abs_top_builddir}/../findexec
     53AMLDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
    5454
    5555TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'

  • libpolys/polys/Makefile.am

    r056089 r240fe3  
    155155
    156156templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lfindexec
    157 templates_p_Procs_Generate_LDFLAGS  = -L${abs_builddir} -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${top_builddir}/misc -L${abs_top_builddir}/../omalloc -L${abs_top_builddir}/../findexec
     157templates_p_Procs_Generate_LDFLAGS  = -L${builddir} -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
    158158
    159159templates/p_Procs.inc: templates/p_Procs_Generate

  • omalloc/Makefile.am

    r056089 r240fe3  
    3333EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
    3434
    35 AM_CPPFLAGS =-I${abs_top_srcdir}/.. -I${abs_top_builddir}/..
     35AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
    3636
    3737libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
    … …  
    6767## Test program
    6868##
    69 # AM_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
     69# AM_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
    7070
    7171
    … …  
    9292omtTest_s_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
    9393omtTest_s_g_LDADD   = libomalloc_g.la
    94 omtTest_s_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
     94omtTest_s_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
    9595
    9696omtTest_s_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
    9797omtTest_s_m_SOURCES = $(OMTTESTSSOURCES)
    9898omtTest_s_m_LDADD   = libomalloc_g.la
    99 omtTest_s_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
     99omtTest_s_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
    100100
    101101omtTest_s_r_SOURCES = $(OMTTESTSSOURCES)
    … …  
    103103omtTest_s_r_CFLAGS  = -O3 ${PIPE}
    104104omtTest_s_r_LDADD   = libomalloc.la
    105 omtTest_s_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
     105omtTest_s_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
    106106
    107107
    … …  
    111111omtTest_d_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
    112112omtTest_d_g_LDADD   = libomalloc_g.la
    113 omtTest_d_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
     113omtTest_d_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
    114114
    115115omtTest_d_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
    116116omtTest_d_m_SOURCES = $(OMTTESTSSOURCES)
    117117omtTest_d_m_LDADD   = libomalloc_g.la
    118 omtTest_d_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
     118omtTest_d_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
    119119
    120120omtTest_d_r_SOURCES = $(OMTTESTSSOURCES)
    … …  
    122122omtTest_d_r_CFLAGS  = -O3 ${PIPE}
    123123omtTest_d_r_LDADD   = libomalloc.la
    124 omtTest_d_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
     124omtTest_d_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
Note: See TracChangeset for help on using the changeset viewer.