Ticket #13325: eclib-am.patch

File eclib-am.patch, 6.3 KB (added by jpflori, 7 years ago)

Patch to am files.

  • libsrc/Makefile.am

    old new  
    11## Process this file with automake to produce Makefile.in
    22
    33AM_CPPFLAGS = $(NTL_CFLAGS) $(PARI_CFLAGS) $(GMP_CFLAGS) -DNTL_ALL -DUSE_PARI_FACTORING -DNEW_OP_ORDER
    4 LIBADD      = $(NTL_LIBS) $(PARI_LIBS) $(GMP_LIBS)
     4LIB      = $(NTL_LIBS) $(PARI_LIBS) $(GMP_LIBS)
    55
    66lib_LTLIBRARIES = libec.la
    77
  • progs/Makefile.am

    old new  
    11## Process this file with automake to produce Makefile.in
    22
    33AM_CPPFLAGS     = -I$(top_srcdir)/libsrc $(NTL_CFLAGS) $(PARI_CFLAGS) $(GMP_CFLAGS) -DNTL_ALL
    4 LDADD           = $(top_builddir)/libsrc/libec.la $(PARI_LIBS) $(NTL_LIBS) $(GMP_LIBS)
     4LIBS            = $(top_builddir)/libsrc/libec.la $(PARI_LIBS) $(NTL_LIBS) $(GMP_LIBS)
     5
     6check_run = ./$(prog)$(EXEEXT) < $(test_input_dir)/$(prog).in > $(prog).testout 2>/dev/null && diff $(prog).testout $(test_output_dir)/$(prog).out || exit $$?
    57
    68test_input_dir = $(srcdir)/in
    79test_output_dir = $(srcdir)/out
    810
    911################ PROCS (conics & cubics programs) #################
    1012
    11 PROCS_PROGS =  solve_conic solve_legendre reduce_cubics list_cubics
    12 procs_progs: $(PROCS_PROGS)
     13PROCS_PROGS = solve_conic solve_legendre reduce_cubics list_cubics
     14procs_progs: $(addsuffix $(EXEEXT), $(PROCS_PROGS))
    1315
    1416solve_conic_SOURCES=solve_conic.cc
    1517solve_legendre_SOURCES=solve_legendre.cc
    1618reduce_cubics_SOURCES=reduce_cubics.cc
    1719list_cubics_SOURCES=list_cubics.cc
    1820
     21PROCS_PROGS_CHECK = solve_conic solve_legendre reduce_cubics list_cubics
    1922check_procs: procs_progs
    2023        @echo Checking conics and cubics programs...
    21         ./solve_conic < $(test_input_dir)/solve_conic.in > solve_conic.testout && diff solve_conic.testout $(test_output_dir)/solve_conic.out
    22         ./solve_legendre < $(test_input_dir)/solve_legendre.in > solve_legendre.testout && diff solve_legendre.testout $(test_output_dir)/solve_legendre.out
    23         ./reduce_cubics < $(test_input_dir)/reduce_cubics.in > reduce_cubics.testout && diff reduce_cubics.testout $(test_output_dir)/reduce_cubics$(OBJ_SUF).out
    24         ./list_cubics < $(test_input_dir)/list_cubics.in > list_cubics.testout && diff list_cubics.testout $(test_output_dir)/list_cubics.out
     24        $(foreach prog, $(PROCS_PROGS_CHECK), $(check_run);)
    2525
    2626################ QCURVES (elliptic curves programs, excluding two-descent) #################
    2727
    2828QCURVES_PROGS = point_search indep_test
    29 qcurves_progs: $(QCURVES_PROGS)
     29qcurves_progs: $(addsuffix $(EXEEXT), $(QCURVES_PROGS))
    3030
    3131point_search_SOURCES=point_search.cc
    3232indep_test_SOURCES=indep_test.cc
    3333
     34QCURVES_PROGS_CHECK = point_search indep_test
    3435check_qcurves: qcurves_progs
    3536        @echo Checking qcurves programs...
    36         ./point_search < $(test_input_dir)/point_search.in > point_search.testout 2>/dev/null && diff point_search.testout $(test_output_dir)/point_search.out
    37         ./indep_test < $(test_input_dir)/indep_test.in > indep_test.testout 2>/dev/null && diff indep_test.testout $(test_output_dir)/indep_test.out
     37        $(foreach prog, $(QCURVES_PROGS_CHECK), $(check_run);)
    3838
    3939################ QCURVES (elliptic curves two-descent programs) #################
    4040
    4141QRANK_PROGS = mwrank reduce_quartics quartic_points
    42 qrank_progs: $(QRANK_PROGS)
     42qrank_progs: $(addsuffix $(EXEEXT), $(QRANK_PROGS))
    4343
    4444mwrank_SOURCES=mwrank.cc
    4545reduce_quartics_SOURCES=reduce_quartics.cc
    4646quartic_points_SOURCES=quartic_points.cc
    4747
     48QRANK_PROGS_CHECK = mwrank reduce_quartics quartic_points
    4849check_qrank: qrank_progs
    4950        @echo Checking qrank programs...
    50         ./mwrank < $(test_input_dir)/mwrank.in > mwrank.testout 2>/dev/null && diff mwrank.testout $(test_output_dir)/mwrank.out
    51         ./reduce_quartics < $(test_input_dir)/reduce_quartics.in > reduce_quartics.testout 2>/dev/null && diff reduce_quartics.testout $(test_output_dir)/reduce_quartics.out
    52         ./quartic_points < $(test_input_dir)/quartic_points.in > quartic_points.testout 2>/dev/null && diff quartic_points.testout $(test_output_dir)/quartic_points.out
     51        $(foreach prog, $(QRANK_PROGS_CHECK), $(check_run);)
    5352        rm -f PRIMES 1
    5453
    5554################ G0N (modular symbols programs) #################
    5655
    5756G0N_PROGS = h1bsd h1curve pcurve nfhpcurve nfhpmcurve h1clist checkap h1bsdcurisog nfcount ecnf h1first moreap qexp
    58 g0n_progs: $(G0N_PROGS)
     57g0n_progs: $(addsuffix $(EXEEXT), $(G0N_PROGS))
    5958
    6059# NB aplist, checkgens and tnfd are not currently tested in check_g0n
    6160
     
    7675# This is the name of a directory which will be used for newform
    7776# input/output in the "make check" tests and removed afterwards.
    7877
    79 export NF_DIR:=nftmp
    80 
     78NF_DIR = nftmp
     79G0N_PROGS_CHECK = ecnf nfhpcurve nfhpmcurve h1first h1clist h1bsdcurisog qexp
    8180check_g0n:  g0n_progs
    8281        @echo Checking g0n programs...
    8382        rm -rf $(NF_DIR)
    8483        mkdir $(NF_DIR)
    85         ./ecnf < $(test_input_dir)/ecnf.in 2>/dev/null > ecnf.testout && diff ecnf.testout $(test_output_dir)/ecnf.out
    86         ./nfhpcurve < $(test_input_dir)/nfhpcurve.in > nfhpcurve.testout 2>/dev/null && diff nfhpcurve.testout $(test_output_dir)/nfhpcurve.out
    87         ./nfhpmcurve < $(test_input_dir)/nfhpmcurve.in > nfhpmcurve.testout 2>/dev/null && diff nfhpmcurve.testout $(test_output_dir)/nfhpmcurve.out
    88         ./h1first < $(test_input_dir)/h1first.in 2>/dev/null > h1first.testout && diff h1first.testout $(test_output_dir)/h1first.out
    89         ./h1clist < $(test_input_dir)/h1clist.in > h1clist.testout 2>/dev/null && diff h1clist.testout $(test_output_dir)/h1clist.out
    90         ./h1bsdcurisog < $(test_input_dir)/h1bsdcurisog.in > h1bsdcurisog.testout 2>/dev/null && diff h1bsdcurisog.testout $(test_output_dir)/h1bsdcurisog.out
     84        $(foreach prog, $(G0N_PROGS_CHECK), $(check_run);)
    9185        echo 0 25 1 `seq 50 60` 0 | ./nfhpcurve > /dev/null 2>/dev/null
    92         ./qexp < $(test_input_dir)/qexp.in > qexp.testout 2>/dev/null && diff qexp.testout $(test_output_dir)/qexp.out
    9386        rm -rf $(NF_DIR)
    9487
    9588#################################################################################
    9689
    97 progs: procs_progs qcurves_progs qrank_progs g0n_progs
    98 all: progs
    9990check: check_procs check_qcurves check_qrank check_g0n
    10091        rm -f *.testout PRIMES 1
    10192
    10293if ALLPROGS
    10394bin_PROGRAMS=$(PROCS_PROGS) $(QCURVES_PROGS) $(QRANK_PROGS) $(G0N_PROGS)
    10495else
    105 noinst_PROGRAMS=$(PROCS_PROGS) $(QCURVES_PROGS) $(QRANK_PROGS) $(G0N_PROGS)
    106 bin_PROGRAMS=mwrank
     96bin_PROGRAMS=mwrank$(EXEEXT)
    10797endif
    10898
    10999# We list here the directories in and out which contain the test input