Changeset 3b8a6e in git


Ignore:
Timestamp:
Mar 29, 2012, 2:36:44 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
Children:
d1eb80a0883d1bde6bec62a010c7dd44e1dce366
Parents:
9f524dff0ae56f9b1800fbdba56cdbb6f6b120b3
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 14:36:44+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 14:42:10+02:00
Message:
removed AM_LDFLAGS from those Makefile.am where a library is built

chg: AM_LDFLAGS -> user variable AMLDFLAGS, which was added manualy to *_LDFLAGS

NOTE: AM_LDFLAGS goes to library dependency in the resulting .la file
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r9f524d r3b8a6e  
    176176# handle all the generated *.inc
    177177
    178 AM_LDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys  $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
    179 
    180178noinst_PROGRAMS = gentable2 gentable1 feOptGen feOptES feOptTS
    181179
    … …  
    213211bin_PROGRAMS = Singular Singularg ESingular TSingular $(optional_Singular_programs)
    214212
     213AMLDFLAGS = -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
     214
    215215Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    216216Singularg_CFLAGS = -g ${PIPE}
    … …  
    231231Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    232232
    233 Singular_LDFLAGS = -static
    234 Singularg_LDFLAGS = -static
     233Singular_LDFLAGS = -static ${AMLDFLAGS}
     234Singularg_LDFLAGS = -static ${AMLDFLAGS}
    235235
    236236
    … …  
    252252Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    253253Singulardg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     254
     255Singulard_LDFLAGS = ${AMLDFLAGS}
     256Singulardg_LDFLAGS = ${AMLDFLAGS}
    254257
    255258
    … …  
    259262ESingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    260263ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO
    261 ESingular_LDFLAGS = -static ${AM_LDFLAGS}  -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
     264ESingular_LDFLAGS = -static ${AMLDFLAGS}
    262265ESingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec
    263266
    … …  
    269272TSingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    270273TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO
    271 TSingular_LDFLAGS = -static ${AM_LDFLAGS}  -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
     274TSingular_LDFLAGS = -static ${AMLDFLAGS}
    272275TSingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec
    273276
    … …  
    286289# # libSingular.la -lnumeric
    287290libparse_LDADD = -lomalloc
    288 libparse_LDFLAGS = -static ${AM_LDFLAGS}
     291libparse_LDFLAGS = -static ${AMLDFLAGS}
    289292# TODO for libparse:
    290293# multiple definition of `category_out': libparse.cc v.s. utils.cc
    … …  
    334337test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    335338
    336 test_s_r_LDFLAGS = -static
    337 test_s_g_LDFLAGS = -static
     339test_s_r_LDFLAGS = -static ${AMLDFLAGS}
     340test_s_g_LDFLAGS = -static ${AMLDFLAGS}
    338341
    339342
    … …  
    355358test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    356359
     360test_d_r_LDFLAGS = ${AMLDFLAGS}
     361test_d_g_LDFLAGS = ${AMLDFLAGS}
     362
    357363#########################################################
    358364

  • dyn_modules/bigintm/Makefile.am

    r9f524d r3b8a6e  
    3030
    3131
    32 AM_LDFLAGS      = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
     32AMLDFLAGS       = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
    3333-L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
    3434
    … …  
    4747bigintm_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    4848
    49 P_PROCS_MODULE_LDFLAGS = -shared -module
    50 P_PROCS_MODULE_LDFLAGSG = -shared -module
     49if ENABLE_P_PROCS_DYNAMIC
     50  P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS} -shared -module
     51  P_PROCS_MODULE_LDFLAGSG = ${AMLDFLAGS} -shared -module
     52else
     53  P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS}
     54  P_PROCS_MODULE_LDFLAGSG = ${AMLDFLAGS}
     55endif
    5156
    5257# Add under Mac OS X: -twolevel_namespace -weak_reference_mismatches weak -undefined dynamic_lookup

  • dyn_modules/syzextra/Makefile.am

    r9f524d r3b8a6e  
    3030
    3131
    32 AM_LDFLAGS      = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
     32AMLDFLAGS       = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
    3333-L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
    3434
    … …  
    4747syzextra_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    4848
    49 P_PROCS_MODULE_LDFLAGS = -shared -module
    50 P_PROCS_MODULE_LDFLAGSG = -shared -module
     49P_PROCS_MODULE_LDFLAGS = -shared -module ${AMLDFLAGS}
     50P_PROCS_MODULE_LDFLAGSG = -shared -module ${AMLDFLAGS}
    5151
    5252# Add under Mac OS X: -twolevel_namespace -weak_reference_mismatches weak -undefined dynamic_lookup

  • factory/Makefile.am

    r9f524d r3b8a6e  
    99AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS} ${OMALLOC_CFLAGS}
    1010
    11 AM_LDFLAGS =  -L${abs_builddir}
    12 
    1311lib_LTLIBRARIES = libfactory.la libfactory_g.la
    1412
    1513libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
    1614libfactory_la_LIBADD     = ${abs_builddir}/libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
    17 libfactory_la_LDFLAGS    = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
     15libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    1816libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
    1917libfactory_g_la_LIBADD   = ${abs_builddir}/libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
    20 libfactory_g_la_LDFLAGS  = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
     18libfactory_g_la_LDFLAGS  = -release ${PACKAGE_VERSION}
    2119
    2220
    … …  
    335333check_PROGRAMS = $(TESTS)
    336334
     335AMLDFLAGS =  -L${abs_builddir}
     336
    337337TESTSSOURCES = test.cc
    338338
    … …  
    352352test_s_r_LDADD = -lfactory $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB)
    353353
    354 test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
    355 test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
     354test_s_r_LDFLAGS = -static ${AMLDFLAGS}
     355test_s_g_LDFLAGS = -static ${AMLDFLAGS}
    356356
    357357test_d_g_SOURCES = $(TESTSSOURCES)
    … …  
    365365test_d_r_LDADD = -lfactory $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB)
    366366
     367test_d_r_LDFLAGS = ${AMLDFLAGS}
     368test_d_g_LDFLAGS = ${AMLDFLAGS}

  • kernel/Makefile.am

    r9f524d r3b8a6e  
    8080endif
    8181
    82 AM_LDFLAGS = -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
     82AMLDFLAGS = -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
    8383
    8484
    … …  
    106106test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    107107
    108 test_s_r_LDFLAGS = -static
    109 test_s_g_LDFLAGS = -static
     108test_s_r_LDFLAGS = -static ${AMLDFLAGS}
     109test_s_g_LDFLAGS = -static ${AMLDFLAGS}
    110110
    111111
    … …  
    125125test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    126126
     127test_d_r_LDFLAGS = ${AMLDFLAGS}
     128test_d_g_LDFLAGS = ${AMLDFLAGS}
    127129
    128130# These files are built first

  • libpolys/coeffs/Makefile.am

    r9f524d r3b8a6e  
    3636
    3737
     38## for testing...
    3839if ENABLE_FACTORY
    3940  USE_FACTORY = -L${top_builddir}/../factory
    … …  
    4243endif
    4344
    44 ## for testing...
    45 AM_LDFLAGS = -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 -L${abs_builddir}
    46 
     45AMLDFLAGS = -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
    4746
    4847TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
    … …  
    9291
    9392
     93test_s_r_LDFLAGS = -static ${AMLDFLAGS}
     94test_s_g_LDFLAGS = -static ${AMLDFLAGS}
    9495
    95 test_s_r_LDFLAGS = -static
    96 test_s_g_LDFLAGS = -static
     96test_d_r_LDFLAGS = ${AMLDFLAGS}
     97test_d_g_LDFLAGS = ${AMLDFLAGS}

  • libpolys/polys/Makefile.am

    r9f524d r3b8a6e  
    1010AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
    1111
    12 AM_LDFLAGS      = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${abs_top_builddir}/../omalloc -L${abs_builddir}
    1312AM_CPPFLAGS     = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${GMP_CFLAGS}
    1413
    … …  
    8887
    8988P_PROCS_MODULE_LDFLAGS = -shared -module
    90 # -L${top_builddir}/coeffs -lcoeffs
    9189P_PROCS_MODULE_LDFLAGSG = -shared -module
    92 # -L${top_builddir}/coeffs -lcoeffs_g
    9390
    9491p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
    … …  
    151148
    152149templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lfindexec
     150templates_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
    153151
    154152templates/p_Procs.inc: templates/p_Procs_Generate
Note: See TracChangeset for help on using the changeset viewer.