Changeset 1361


Ignore:
Timestamp:
May 19, 2009 10:34:56 PM (11 years ago)
Author:
bradbell
Message:

trunk: Simplify top level makefile.

makefile.am: simplify using pattern matching and mkdir -p option.
makefile.in: automatic changes generated by automake.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/makefile.am

    r1338 r1361  
    2222myincludedir = $(includedir)/$(postfix_dir)
    2323nobase_myinclude_HEADERS =  \
    24         cppad/TrackNewDel.h \
    25         cppad/SpeedTest.h \
    26         cppad/Runge45.h \
    27         cppad/Rosen34.h \
    28         cppad/RombergOne.h \
    29         cppad/RombergMul.h \
    30         cppad/PowInt.h \
    31         cppad/Poly.h \
    32         cppad/OdeGearControl.h \
    33         cppad/OdeGear.h \
    34         cppad/OdeErrControl.h \
    35         cppad/NearEqual.h \
    36         cppad/LuSolve.h \
    37         cppad/LuInvert.h \
    38         cppad/LuFactor.h \
    39         cppad/ErrorHandler.h \
    40         cppad/CppAD_vector.h \
    41         cppad/CppAD.h \
    42         cppad/CheckSimpleVector.h \
    43         cppad/CheckNumericType.h \
    44         cppad/config.h \
    45         cppad/check_numeric_type.hpp \
    46         cppad/check_simple_vector.hpp \
    47         cppad/cppad.hpp \
    48         cppad/declare.hpp \
    49         cppad/vector.hpp \
    50         cppad/error_handler.hpp \
    51         cppad/lu_factor.hpp \
    52         cppad/lu_invert.hpp \
    53         cppad/lu_solve.hpp \
    54         cppad/nan.hpp \
    55         cppad/near_equal.hpp \
    56         cppad/ode_err_control.hpp \
    57         cppad/ode_gear.hpp \
    58         cppad/ode_gear_control.hpp \
    59         cppad/poly.hpp \
    60         cppad/pow_int.hpp \
    61         cppad/romberg_one.hpp \
    62         cppad/romberg_mul.hpp \
    63         cppad/rosen_34.hpp \
    64         cppad/runge_45.hpp \
    65         cppad/speed_test.hpp \
    66         cppad/std_math_unary.hpp \
    67         cppad/track_new_del.hpp \
    68         cppad/local/ad.hpp \
    69         cppad/local/ad_binary.hpp \
    70         cppad/local/ad_copy.hpp \
    71         cppad/local/ad_fun.hpp \
    72         cppad/local/ad_tape.hpp \
    73         cppad/local/ad_valued.hpp \
    74         cppad/local/abort_recording.hpp \
    75         cppad/local/abs.hpp \
    76         cppad/local/abs_op.hpp \
    77         cppad/local/acos_op.hpp \
    78         cppad/local/add.hpp \
    79         cppad/local/add_eq.hpp \
    80         cppad/local/add_op.hpp \
    81         cppad/local/arithmetic.hpp \
    82         cppad/local/asin_op.hpp \
    83         cppad/local/atan2.hpp \
    84         cppad/local/atan_op.hpp \
    85         cppad/local/base_complex.hpp \
    86         cppad/local/bender_quad.hpp \
    87         cppad/local/bool_fun.hpp \
    88         cppad/local/bool_fun_link.hpp \
    89         cppad/local/bool_valued.hpp \
    90         cppad/local/cap_taylor.hpp \
    91         cppad/local/compare.hpp \
    92         cppad/local/compute_assign.hpp \
    93         cppad/local/cond_exp.hpp \
    94         cppad/local/convert.hpp \
    95         cppad/local/cppad_assert.hpp \
    96         cppad/local/declare_ad.hpp \
    97         cppad/local/default.hpp \
    98         cppad/local/define.hpp \
    99         cppad/local/dependent.hpp \
    100         cppad/local/discrete.hpp \
    101         cppad/local/div.hpp \
    102         cppad/local/div_eq.hpp \
    103         cppad/local/div_op.hpp \
    104         cppad/local/drivers.hpp \
    105         cppad/local/equal_op_seq.hpp \
    106         cppad/local/erf.hpp \
    107         cppad/local/exp_op.hpp \
    108         cppad/local/for_one.hpp \
    109         cppad/local/for_two.hpp \
    110         cppad/local/for_jac_sweep.hpp \
    111         cppad/local/for_sparse_jac.hpp \
    112         cppad/local/forward.hpp \
    113         cppad/local/forward_sweep.hpp \
    114         cppad/local/forward0sweep.hpp \
    115         cppad/local/fun_check.hpp \
    116         cppad/local/fun_eval.hpp \
    117         cppad/local/fun_construct.hpp \
    118         cppad/local/hessian.hpp \
    119         cppad/local/identical.hpp \
    120         cppad/local/independent.hpp \
    121         cppad/local/integer.hpp \
    122         cppad/local/jacobian.hpp \
    123         cppad/local/log_op.hpp \
    124         cppad/local/lu_ratio.hpp \
    125         cppad/local/math_other.hpp \
    126         cppad/local/mul.hpp \
    127         cppad/local/mul_eq.hpp \
    128         cppad/local/mul_op.hpp \
    129         cppad/local/omp_max_thread.hpp \
    130         cppad/local/op.hpp \
    131         cppad/local/op_code.hpp \
    132         cppad/local/ordered.hpp \
    133         cppad/local/output.hpp \
    134         cppad/local/par_var.hpp \
    135         cppad/local/pow.hpp \
    136         cppad/local/preprocessor.hpp \
    137         cppad/local/print_for.hpp \
    138         cppad/local/near_equal_ext.hpp \
    139         cppad/local/reverse.hpp \
    140         cppad/local/rev_hes_sweep.hpp \
    141         cppad/local/rev_jac_sweep.hpp \
    142         cppad/local/rev_one.hpp \
    143         cppad/local/rev_sparse_jac.hpp \
    144         cppad/local/rev_sparse_hes.hpp \
    145         cppad/local/rev_two.hpp \
    146         cppad/local/reverse_sweep.hpp \
    147         cppad/local/sin_cos.hpp \
    148         cppad/local/sparse.hpp \
    149         cppad/local/sparse_hessian.hpp \
    150         cppad/local/sparse_jacobian.hpp \
    151         cppad/local/sqrt_op.hpp \
    152         cppad/local/std_math_ad.hpp \
    153         cppad/local/sub.hpp \
    154         cppad/local/sub_eq.hpp \
    155         cppad/local/sub_op.hpp \
    156         cppad/local/tape_link.hpp \
    157         cppad/local/recorder.hpp \
    158         cppad/local/player.hpp \
    159         cppad/local/test_vector.hpp \
    160         cppad/local/user_ad.hpp \
    161         cppad/local/unary_minus.hpp \
    162         cppad/local/unary_plus.hpp \
    163         cppad/local/vec_ad.hpp \
    164         cppad/local/undef.hpp \
    165         cppad/local/value.hpp \
    166         cppad/local/var2par.hpp \
    167         cppad/speed/det_33.hpp \
    168         cppad/speed/det_by_lu.hpp \
    169         cppad/speed/det_by_minor.hpp \
    170         cppad/speed/det_grad_33.hpp \
    171         cppad/speed/det_of_minor.hpp \
    172         cppad/speed/ode_evaluate.hpp \
    173         cppad/speed/sparse_evaluate.hpp \
    174         cppad/speed/uniform_01.hpp
    175 #
     24        cppad/*.h \
     25        cppad/*.hpp \
     26        cppad/local/*.hpp \
     27        cppad/speed/*.hpp
    17628#
    17729# Did user specify --with-Introduction
     
    24597SUBDIRS = \
    24698        $(IPOPT_CPPAD) \
    247         $(IPOPT_CPPAD) \
    24899        $(EXAMPLE) \
    249100        $(INTRODUCTION) \
     
    283134#
    284135if CppAD_DOCUMENTATION
    285 doc_prefix  = $(DESTDIR)$(datadir)
    286 doc_doc     = $(doc_prefix)/doc
    287 doc_postfix = $(doc_doc)/$(postfix_dir)
    288 doc_package = $(doc_postfix)/$(PACKAGE)-$(VERSION)
     136doc_postfix = $(DESTDIR)$(datadir)/doc/$(postfix_dir)
     137doc_package = $(DESTDIR)$(datadir)/doc/$(postfix_dir)/$(PACKAGE)-$(VERSION)
    289138install-data-hook:
    290         if [ ! -e $(doc_prefix) ] ; then mkdir $(doc_prefix) ; fi
    291         if [ ! -e $(doc_doc) ] ; then mkdir $(doc_doc) ; fi
    292         if [ ! -e $(doc_postfix) ] ; then mkdir $(doc_postfix) ; fi
     139        if [ ! -e $(doc_postfix) ] ; then mkdir -p $(doc_postfix) ; fi
    293140        if [ -e $(doc_package) ] ; then rm -rf $(doc_package) ; fi
    294141        cp -a $(top_builddir)/doc $(doc_package)
  • trunk/makefile.in

    r1338 r1361  
    208208myincludedir = $(includedir)/$(postfix_dir)
    209209nobase_myinclude_HEADERS = \
    210         cppad/TrackNewDel.h \
    211         cppad/SpeedTest.h \
    212         cppad/Runge45.h \
    213         cppad/Rosen34.h \
    214         cppad/RombergOne.h \
    215         cppad/RombergMul.h \
    216         cppad/PowInt.h \
    217         cppad/Poly.h \
    218         cppad/OdeGearControl.h \
    219         cppad/OdeGear.h \
    220         cppad/OdeErrControl.h \
    221         cppad/NearEqual.h \
    222         cppad/LuSolve.h \
    223         cppad/LuInvert.h \
    224         cppad/LuFactor.h \
    225         cppad/ErrorHandler.h \
    226         cppad/CppAD_vector.h \
    227         cppad/CppAD.h \
    228         cppad/CheckSimpleVector.h \
    229         cppad/CheckNumericType.h \
    230         cppad/config.h \
    231         cppad/check_numeric_type.hpp \
    232         cppad/check_simple_vector.hpp \
    233         cppad/cppad.hpp \
    234         cppad/declare.hpp \
    235         cppad/vector.hpp \
    236         cppad/error_handler.hpp \
    237         cppad/lu_factor.hpp \
    238         cppad/lu_invert.hpp \
    239         cppad/lu_solve.hpp \
    240         cppad/nan.hpp \
    241         cppad/near_equal.hpp \
    242         cppad/ode_err_control.hpp \
    243         cppad/ode_gear.hpp \
    244         cppad/ode_gear_control.hpp \
    245         cppad/poly.hpp \
    246         cppad/pow_int.hpp \
    247         cppad/romberg_one.hpp \
    248         cppad/romberg_mul.hpp \
    249         cppad/rosen_34.hpp \
    250         cppad/runge_45.hpp \
    251         cppad/speed_test.hpp \
    252         cppad/std_math_unary.hpp \
    253         cppad/track_new_del.hpp \
    254         cppad/local/ad.hpp \
    255         cppad/local/ad_binary.hpp \
    256         cppad/local/ad_copy.hpp \
    257         cppad/local/ad_fun.hpp \
    258         cppad/local/ad_tape.hpp \
    259         cppad/local/ad_valued.hpp \
    260         cppad/local/abort_recording.hpp \
    261         cppad/local/abs.hpp \
    262         cppad/local/abs_op.hpp \
    263         cppad/local/acos_op.hpp \
    264         cppad/local/add.hpp \
    265         cppad/local/add_eq.hpp \
    266         cppad/local/add_op.hpp \
    267         cppad/local/arithmetic.hpp \
    268         cppad/local/asin_op.hpp \
    269         cppad/local/atan2.hpp \
    270         cppad/local/atan_op.hpp \
    271         cppad/local/base_complex.hpp \
    272         cppad/local/bender_quad.hpp \
    273         cppad/local/bool_fun.hpp \
    274         cppad/local/bool_fun_link.hpp \
    275         cppad/local/bool_valued.hpp \
    276         cppad/local/cap_taylor.hpp \
    277         cppad/local/compare.hpp \
    278         cppad/local/compute_assign.hpp \
    279         cppad/local/cond_exp.hpp \
    280         cppad/local/convert.hpp \
    281         cppad/local/cppad_assert.hpp \
    282         cppad/local/declare_ad.hpp \
    283         cppad/local/default.hpp \
    284         cppad/local/define.hpp \
    285         cppad/local/dependent.hpp \
    286         cppad/local/discrete.hpp \
    287         cppad/local/div.hpp \
    288         cppad/local/div_eq.hpp \
    289         cppad/local/div_op.hpp \
    290         cppad/local/drivers.hpp \
    291         cppad/local/equal_op_seq.hpp \
    292         cppad/local/erf.hpp \
    293         cppad/local/exp_op.hpp \
    294         cppad/local/for_one.hpp \
    295         cppad/local/for_two.hpp \
    296         cppad/local/for_jac_sweep.hpp \
    297         cppad/local/for_sparse_jac.hpp \
    298         cppad/local/forward.hpp \
    299         cppad/local/forward_sweep.hpp \
    300         cppad/local/forward0sweep.hpp \
    301         cppad/local/fun_check.hpp \
    302         cppad/local/fun_eval.hpp \
    303         cppad/local/fun_construct.hpp \
    304         cppad/local/hessian.hpp \
    305         cppad/local/identical.hpp \
    306         cppad/local/independent.hpp \
    307         cppad/local/integer.hpp \
    308         cppad/local/jacobian.hpp \
    309         cppad/local/log_op.hpp \
    310         cppad/local/lu_ratio.hpp \
    311         cppad/local/math_other.hpp \
    312         cppad/local/mul.hpp \
    313         cppad/local/mul_eq.hpp \
    314         cppad/local/mul_op.hpp \
    315         cppad/local/omp_max_thread.hpp \
    316         cppad/local/op.hpp \
    317         cppad/local/op_code.hpp \
    318         cppad/local/ordered.hpp \
    319         cppad/local/output.hpp \
    320         cppad/local/par_var.hpp \
    321         cppad/local/pow.hpp \
    322         cppad/local/preprocessor.hpp \
    323         cppad/local/print_for.hpp \
    324         cppad/local/near_equal_ext.hpp \
    325         cppad/local/reverse.hpp \
    326         cppad/local/rev_hes_sweep.hpp \
    327         cppad/local/rev_jac_sweep.hpp \
    328         cppad/local/rev_one.hpp \
    329         cppad/local/rev_sparse_jac.hpp \
    330         cppad/local/rev_sparse_hes.hpp \
    331         cppad/local/rev_two.hpp \
    332         cppad/local/reverse_sweep.hpp \
    333         cppad/local/sin_cos.hpp \
    334         cppad/local/sparse.hpp \
    335         cppad/local/sparse_hessian.hpp \
    336         cppad/local/sparse_jacobian.hpp \
    337         cppad/local/sqrt_op.hpp \
    338         cppad/local/std_math_ad.hpp \
    339         cppad/local/sub.hpp \
    340         cppad/local/sub_eq.hpp \
    341         cppad/local/sub_op.hpp \
    342         cppad/local/tape_link.hpp \
    343         cppad/local/recorder.hpp \
    344         cppad/local/player.hpp \
    345         cppad/local/test_vector.hpp \
    346         cppad/local/user_ad.hpp \
    347         cppad/local/unary_minus.hpp \
    348         cppad/local/unary_plus.hpp \
    349         cppad/local/vec_ad.hpp \
    350         cppad/local/undef.hpp \
    351         cppad/local/value.hpp \
    352         cppad/local/var2par.hpp \
    353         cppad/speed/det_33.hpp \
    354         cppad/speed/det_by_lu.hpp \
    355         cppad/speed/det_by_minor.hpp \
    356         cppad/speed/det_grad_33.hpp \
    357         cppad/speed/det_of_minor.hpp \
    358         cppad/speed/ode_evaluate.hpp \
    359         cppad/speed/sparse_evaluate.hpp \
    360         cppad/speed/uniform_01.hpp
     210        cppad/*.h \
     211        cppad/*.hpp \
     212        cppad/local/*.hpp \
     213        cppad/speed/*.hpp
    361214
    362215@CppAD_INTRODUCTION_FALSE@INTRODUCTION =
    363 #
    364216#
    365217# Did user specify --with-Introduction
     
    408260#
    409261SUBDIRS = \
    410         $(IPOPT_CPPAD) \
    411262        $(IPOPT_CPPAD) \
    412263        $(EXAMPLE) \
     
    444295
    445296#
    446 @CppAD_DOCUMENTATION_TRUE@doc_prefix = $(DESTDIR)$(datadir)
    447 @CppAD_DOCUMENTATION_TRUE@doc_doc = $(doc_prefix)/doc
    448 @CppAD_DOCUMENTATION_TRUE@doc_postfix = $(doc_doc)/$(postfix_dir)
    449 @CppAD_DOCUMENTATION_TRUE@doc_package = $(doc_postfix)/$(PACKAGE)-$(VERSION)
     297@CppAD_DOCUMENTATION_TRUE@doc_postfix = $(DESTDIR)$(datadir)/doc/$(postfix_dir)
     298@CppAD_DOCUMENTATION_TRUE@doc_package = $(DESTDIR)$(datadir)/doc/$(postfix_dir)/$(PACKAGE)-$(VERSION)
    450299all: all-recursive
    451300
     
    925774        rm $(distdir)/doc/error.wrd
    926775@CppAD_DOCUMENTATION_TRUE@install-data-hook:
    927 @CppAD_DOCUMENTATION_TRUE@      if [ ! -e $(doc_prefix) ] ; then mkdir $(doc_prefix) ; fi
    928 @CppAD_DOCUMENTATION_TRUE@      if [ ! -e $(doc_doc) ] ; then mkdir $(doc_doc) ; fi
    929 @CppAD_DOCUMENTATION_TRUE@      if [ ! -e $(doc_postfix) ] ; then mkdir $(doc_postfix) ; fi
     776@CppAD_DOCUMENTATION_TRUE@      if [ ! -e $(doc_postfix) ] ; then mkdir -p $(doc_postfix) ; fi
    930777@CppAD_DOCUMENTATION_TRUE@      if [ -e $(doc_package) ] ; then rm -rf $(doc_package) ; fi
    931778@CppAD_DOCUMENTATION_TRUE@      cp -a $(top_builddir)/doc $(doc_package)
Note: See TracChangeset for help on using the changeset viewer.