Changeset d44785 in git


Ignore:
Timestamp:
Sep 27, 2011, 3:15:55 PM (12 years ago)
Author:
Volker Braun <vbraun.name@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
f3fb4d02b80a3234382e5318316d68fb66cc1f08
Parents:
b9e11ba1ccf9ce6f95143f2be5524707ba4e9689
git-author:
Volker Braun <vbraun.name@gmail.com>2011-09-27 15:15:55+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:40+01:00
Message:
Cleaned up Makefile.am to remove superfluous rules
Also, note that -DHAVE_CONFIG_H is defined automatically
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • factory/Makefile.am

    rb9e11ba rd44785  
    9191                parseutil.cc \
    9292                ftmpl_inst.cc \
    93                 factory.h factoryconf.h cplusplus.h
     93                factory.h factoryconf.h
    9494
    9595if WITH_PARSER_FOR_CANONICAL_FORM
    … …  
    322322        ${builddir}/cplusplus > ${builddir}/cplusplus.h
    323323
    324 cf_gmp.h: cplusplus.h
    325 
    326324#ftmpl_inst.o:  ftmpl_inst.cc factoryconf.h factory.h \
    327325#               $(addprefix templates/,$(templatesrc)) \

  • kernel/Makefile.am

    rb9e11ba rd44785  
    2525# -fdiagnostics-show-option
    2626
    27 libkernel_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    28 libkernel_g_a_CPPFLAGS = -DHAVE_CONFIG_H
     27libkernel_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
     28#libkernel_g_a_CPPFLAGS =
    2929
    3030INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
    … …  
    6868        khstd.h kstd1.h \
    6969        fglm.h fglmgauss.h fglmvec.h \
    70   GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h multicnt.h \
     70        GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h \
    7171        eigenval.h units.h \
    7272        fegetopt.h \
    7373        ratgring.h shiftgb.h nc.h \
    74         semic.h \
    7574        gfan.h preimage.h
    7675
    … …  
    103102testg_SOURCES = test.cc
    104103
    105 # testr: libkernel.a
    106 # testg: libkernel_g.a
    107 
    108104testr_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    109105testg_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    110106
    111 testr_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    112 testg_CPPFLAGS = -DHAVE_CONFIG_H
     107testr_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
     108#testg_CPPFLAGS =
    113109
    114110CLEANFILES = $(TESTS)

  • libpolys/coeffs/Makefile.am

    rb9e11ba rd44785  
    2525        gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
    2626        modulop.cc mpr_complex.cc
     27
    2728libcoeffs_a_SOURCES   = $(SOURCES)
    2829libcoeffs_g_a_SOURCES = $(SOURCES)
    29 
    3030
    3131## include_HEADERS = coeffs.h numbers.h
    … …  
    7676# -fdiagnostics-show-option
    7777
    78 testr_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    79 testg_CPPFLAGS = -DHAVE_CONFIG_H
     78testr_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
     79testg_CPPFLAGS =
    8080
    8181#gftables: ${top_srcdir}/../factory/gftables

  • libpolys/misc/Makefile.am

    rb9e11ba rd44785  
    1010# -fdiagnostics-show-option
    1111
    12 libmisc_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    13 libmisc_g_a_CPPFLAGS = -DHAVE_CONFIG_H
     12libmisc_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
     13#libmisc_g_a_CPPFLAGS =
    1414
    1515INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..

  • libpolys/polys/Makefile.am

    rb9e11ba rd44785  
    77NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer --no-rtti
    88NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG
    9 
    10 AM_CPPFLAGS     = -DHAVE_CONFIG_H
    119
    1210AM_CFLAGS       = ${PIPE}
    … …  
    3129
    3230prCopy.inc: prCopy.pl
    33         perl ${srcdir}/prCopy.pl > prCopy.xx && mv prCopy.xx prCopy.inc
    34 
    35 prCopy.cc: prCopy.inc
    36 
     31        perl ${srcdir}/prCopy.pl >  prCopy.inc
    3732
    3833lib_LIBRARIES=libpolys.a libpolys_g.a
    … …  
    5853#       OLD?:
    5954
    60 BUILT_SOURCES = templates/p_Procs.inc
     55BUILT_SOURCES = prCopy.inc templates/p_Procs.inc
    6156
    6257noinst_HEADERS =
    … …  
    7570
    7671
    77 P_PROCS_CPPFLAGS_COMMON = -DHAVE_CONFIG_H -DDYNAMIC_VERSION
     72P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
    7873
    7974p_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}

  • libpolys/resources/Makefile.am

    rb9e11ba rd44785  
    1010# -fdiagnostics-show-option
    1111
    12 libresources_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    13 libresources_g_a_CPPFLAGS = -DHAVE_CONFIG_H
     12libresources_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
     13#libresources_g_a_CPPFLAGS =
    1414
    1515INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..

  • libpolys/tests/Makefile.am

    rb9e11ba rd44785  
    1515
    1616AM_CXXFLAGS = $(AM_CFLAGS) ${CXXTEMPLFLAGS}
    17 
    18 AM_CPPFLAGS = -DHAVE_CONFIG_H
    1917
    2018INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
    … …  
    3836rings_test_LDADD = $(polys_test_LDADD)
    3937
     38
     39BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(rings_test_SOURCES) $(polys_test_SOURCES)
     40
    4041gftables: ${top_srcdir}/../factory/gftables
    4142        ln -snf ${top_srcdir}/../factory/gftables ${builddir}
    … …  
    4344MOD: ${top_builddir}/polys/.libs
    4445        ln -snf ${top_builddir}/polys/.libs/ ${builddir}/MOD
    45 
    46 BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(rings_test_SOURCES) $(polys_test_SOURCES)
    47 
    4846
    4947# How to generate *_runner.cpp
    … …  
    6058        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer ${srcdir}/rings_test.h
    6159
    62 CLEANFILES = simple_test_runner.cpp coeffs_test_runner.cpp polys_test_runner.cpp rings_test_runner.cpp MOD gftables
     60CLEANFILES = $(BUILT_SOURCES)

  • numeric/Makefile.am

    rb9e11ba rd44785  
    1010# -fdiagnostics-show-option
    1111
    12 libnumeric_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    13 libnumeric_g_a_CPPFLAGS = -DHAVE_CONFIG_H
     12libnumeric_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
     13#libnumeric_g_a_CPPFLAGS =
    1414
    1515INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} ${FACTORY_CFLAGS} ${NTL_CFLAGS}
Note: See TracChangeset for help on using the changeset viewer.