Changeset eb76e8 in git


Ignore:
Timestamp:
Oct 10, 2013, 12:30:34 AM (9 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
69fb2b9df531140ea7a7aa2fb3854b73fd800a4df51434bec7fe9322fca45e898f4552bae3a5afa0
Parents:
6b0790a2c085eb3d0fba7545317c2c74469dd868
Message:
fix: AMLDFLAGS -> AM_LDFLAGS
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r6b0790a reb76e8  
    2626
    2727AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H  -DGIT_VERSION='"$(GIT_VERSION)"'
    28 AMLDFLAGS = -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}/resources
     28AM_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/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
    2929
    3030########################### Dynamic Modules... #########################
    … …  
    5656
    5757pyobject_la_LIBS    = $(PYTHON_EXTRA_LIBS)
    58 pyobject_la_LDFLAGS = ${AMLDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) $(PYTHON_LSPEC) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
     58pyobject_la_LDFLAGS = ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) $(PYTHON_LSPEC) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    5959###  -export-dynamic -shared -module -avoid-version (add to all DMs?)
    6060
    … …  
    207207# nodist_libSingular_g_la_SOURCES = iparith.inc
    208208
    209 libSingular_la_LDFLAGS    =  -release ${PACKAGE_VERSION} ${AMLDFLAGS} ${EMBED_PYOBJECT} \
     209libSingular_la_LDFLAGS    =  -release ${PACKAGE_VERSION} ${AM_LDFLAGS} ${EMBED_PYOBJECT} \
    210210-lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \
    211211$(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    … …  
    285285# Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    286286
    287 Singular_LDFLAGS = -static ${AMLDFLAGS}
    288 # Singularg_LDFLAGS = -static ${AMLDFLAGS}
     287Singular_LDFLAGS = -static ${AM_LDFLAGS}
     288# Singularg_LDFLAGS = -static ${AM_LDFLAGS}
    289289
    290290
    … …  
    312312# Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    313313
    314 Singulard_LDFLAGS = ${AMLDFLAGS}
    315 # Singulardg_LDFLAGS = ${AMLDFLAGS}
     314Singulard_LDFLAGS = ${AM_LDFLAGS}
     315# Singulardg_LDFLAGS = ${AM_LDFLAGS}
    316316
    317317
    … …  
    322322#ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO
    323323ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
    324 ESingular_LDFLAGS = -static ${AMLDFLAGS}
     324ESingular_LDFLAGS = -static ${AM_LDFLAGS}
    325325ESingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
    326326
    … …  
    333333#TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO
    334334TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
    335 TSingular_LDFLAGS = -static ${AMLDFLAGS}
     335TSingular_LDFLAGS = -static ${AM_LDFLAGS}
    336336TSingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
    337337
    … …  
    351351# # libSingular.la -lnumeric
    352352libparse_LDADD = -lomalloc
    353 libparse_LDFLAGS = -static ${AMLDFLAGS}
     353libparse_LDFLAGS = -static ${AM_LDFLAGS}
    354354# TODO for libparse:
    355355# multiple definition of `category_out': libparse.cc v.s. utils.cc
    … …  
    419419#test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    420420
    421 test_s_r_LDFLAGS = -static ${AMLDFLAGS}
    422 #test_s_g_LDFLAGS = -static ${AMLDFLAGS}
     421test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
     422#test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
    423423
    424424
    … …  
    442442# test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    443443
    444 #test_d_r_LDFLAGS = ${AMLDFLAGS}
    445 # test_d_g_LDFLAGS = ${AMLDFLAGS}
     444#test_d_r_LDFLAGS = ${AM_LDFLAGS}
     445# test_d_g_LDFLAGS = ${AM_LDFLAGS}
    446446
    447447#########################################################

  • dyn_modules/bigintm/Makefile.am

    r6b0790a reb76e8  
    3737
    3838
    39 AMLDFLAGS       = -release ${PACKAGE_VERSION}
     39AM_LDFLAGS      = -release ${PACKAGE_VERSION}
    4040# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
    4141# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
    … …  
    6060
    6161if ENABLE_P_PROCS_DYNAMIC
    62   P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
     62  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    6363else
    64   P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS}
     64  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS}
    6565endif
    6666

  • dyn_modules/callgfanlib/Makefile.am

    r6b0790a reb76e8  
    2828$(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS)
    2929
    30 AMLDFLAGS       = -release ${PACKAGE_VERSION}
     30AM_LDFLAGS      = -release ${PACKAGE_VERSION}
    3131#  -L${abs_top_builddir}/gfanlib/
    3232# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
    … …  
    5353
    5454if ENABLE_P_PROCS_DYNAMIC
    55   P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
     55  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    5656else
    57   P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS}
     57  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS}
    5858endif
    5959

  • dyn_modules/callpolymake/Makefile.am

    r6b0790a reb76e8  
    1212POLYMAKE_CFLAGS = -fexceptions
    1313
    14 AMLDFLAGS       = -release ${PACKAGE_VERSION} ${PM_LDFLAGS}
     14AM_LDFLAGS      = -release ${PACKAGE_VERSION} ${PM_LDFLAGS}
    1515
    1616SOURCES = polymake_conversion.cc polymake_documentation.cc polymake_wrapper.cc
    … …  
    2929
    3030if ENABLE_P_PROCS_DYNAMIC
    31   P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS} -shared -module
     31  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -shared -module
    3232else
    33   P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS}
     33  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS}
    3434endif
    3535

  • dyn_modules/syzextra/Makefile.am

    r6b0790a reb76e8  
    4040
    4141
    42 AMLDFLAGS = ${GOOGLE_PERFTOOL_LDFLAGS} -release ${PACKAGE_VERSION}
     42AM_LDFLAGS = ${GOOGLE_PERFTOOL_LDFLAGS} -release ${PACKAGE_VERSION}
    4343
    4444# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
    … …  
    6161#syzextra_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    6262
    63 P_PROCS_MODULE_LDFLAGS = ${AMLDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
     63P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    6464# Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    6565

  • factory/Makefile.am

    r6b0790a reb76e8  
    310310check_PROGRAMS = $(TESTS)
    311311
    312 AMLDFLAGS =  -L${builddir}
     312AM_LDFLAGS =  -L${builddir}
    313313
    314314TESTSSOURCES = test.cc
    … …  
    329329test_s_r_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB)
    330330
    331 test_s_r_LDFLAGS = -static ${AMLDFLAGS}
    332 # test_s_g_LDFLAGS = -static ${AMLDFLAGS}
     331test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
     332# test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
    333333
    334334# test_d_g_SOURCES = $(TESTSSOURCES)
    … …  
    342342test_d_r_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB)
    343343
    344 test_d_r_LDFLAGS = ${AMLDFLAGS}
    345 # test_d_g_LDFLAGS = ${AMLDFLAGS}
     344test_d_r_LDFLAGS = ${AM_LDFLAGS}
     345# test_d_g_LDFLAGS = ${AM_LDFLAGS}

  • kernel/Makefile.am

    r6b0790a reb76e8  
    9090endif
    9191
    92 AMLDFLAGS = -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}/resources
     92AM_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}/resources
    9393
    9494
    … …  
    121121test_s_r_CPPFLAGS = ${AM_CPPFLAGS}
    122122
    123 test_s_r_LDFLAGS = -static ${AMLDFLAGS}
    124 # test_s_g_LDFLAGS = -static ${AMLDFLAGS}
     123test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
     124# test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
    125125
    126126
    … …  
    141141test_d_r_CPPFLAGS = ${AM_CPPFLAGS}
    142142
    143 test_d_r_LDFLAGS = ${AMLDFLAGS}
    144 # test_d_g_LDFLAGS = ${AMLDFLAGS}
     143test_d_r_LDFLAGS = ${AM_LDFLAGS}
     144# test_d_g_LDFLAGS = ${AM_LDFLAGS}
    145145
    146146# These files are built first

  • libpolys/coeffs/Makefile.am

    r6b0790a reb76e8  
    5757endif
    5858
    59 AMLDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources
     59AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources
    6060
    6161TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
    … …  
    111111
    112112
    113 test_s_r_LDFLAGS = -static ${AMLDFLAGS}
    114 # test_s_g_LDFLAGS = -static ${AMLDFLAGS}
     113test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
     114# test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
    115115
    116 test_d_r_LDFLAGS = ${AMLDFLAGS}
    117 # test_d_g_LDFLAGS = ${AMLDFLAGS}
     116test_d_r_LDFLAGS = ${AM_LDFLAGS}
     117# test_d_g_LDFLAGS = ${AM_LDFLAGS}
Note: See TracChangeset for help on using the changeset viewer.