Changeset 623


Ignore:
Timestamp:
Aug 19, 2015 2:32:29 PM (4 years ago)
Author:
kulshres
Message:

more changes to the build system

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/examples/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS             = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                   = -l${adolclib}
     17LIBS                   = -l${adolclib}
    1818AM_LDFLAGS              = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/checkpointing/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                 = -l${adolclib}
     17LIBS                 = -l${adolclib}
    1818AM_LDFLAGS            = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/clock/Makefile.am

    r106 r623  
    1111##############################################################################
    1212
    13 EXTRA_DIST           = myclock.h
     13noinst_LTLIBRARIES = libclock.la
     14
     15libclock_la_SOURCES  = myclock.h myclock.cpp
    1416
    1517MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/detexam/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = $(builddir)/../clock/libclock.la -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
     
    2424endif
    2525
    26 detexam_SOURCES      = detexam.cpp $(srcdir)/../clock/myclock.cpp
     26detexam_SOURCES      = detexam.cpp
    2727
    28 detexam_old_SOURCES  = detexam-old.cpp $(srcdir)/../clock/myclock.cpp
     28detexam_old_SOURCES  = detexam-old.cpp
  • trunk/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS            = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                  = -l${adolclib}
     17LIBS                  = -l${adolclib}
    1818AM_LDFLAGS             = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS            = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                  = -l${adolclib}
     17LIBS                  = -l${adolclib}
    1818AM_LDFLAGS             = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/helm/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/hessmat/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/lie/Makefile.am

    r609 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/lighthouse/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/lufact/Makefile.am

    r471 r623  
    1616AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1717
    18 LDADD                = -l${adolclib}
     18LIBS                = -l${adolclib}
    1919AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    2020
  • trunk/ADOL-C/examples/additional_examples/ode/Makefile.am

    r471 r623  
    1616AM_CPPFLAGS             = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1717
    18 LDADD                = -l${adolclib}
     18LIBS                = $(builddir)/../clock/libclock.la -l${adolclib}
    1919AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    2020
     
    2525endif
    2626
    27 odexam_SOURCES       = vfunc_robertson.cpp vgenodemain.cpp $(srcdir)/../clock/myclock.cpp
     27noinst_LTLIBRARIES  = librobertson.la libeutroph.la libfic.la
    2828
    29 od2exam_SOURCES      = vfunc_eutroph.cpp vgenodemain.cpp $(srcdir)/../clock/myclock.cpp
     29librobertson_la_SOURCES = vfunc_robertson.cpp
    3030
    31 od3exam_SOURCES      = vfunc_fic.cpp vgenodemain.cpp $(srcdir)/../clock/myclock.cpp
     31libeutroph_la_SOURCES   = vfunc_eutroph.cpp
     32
     33libfic_la_SOURCES       = vfunc_fic.cpp
     34
     35odexam_SOURCES       = vgenodemain.cpp
     36
     37odexam_LDADD         = librobertson.la
     38
     39od2exam_SOURCES      = vgenodemain.cpp
     40
     41od2exam_LDADD        = libeutroph.la
     42
     43od3exam_SOURCES      = vgenodemain.cpp
     44
     45od3exam_LDADD        = libfic.la
  • trunk/ADOL-C/examples/additional_examples/openmp_exam/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/param/Makefile.am

    r537 r623  
    1515AM_CPPFLAGS            = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/examples/additional_examples/clock
    1616
    17 LDADD                  = -l${adolclib}
     17LIBS                  = $(builddir)/../clock/libclock.la -l${adolclib}
    1818AM_LDFLAGS             = -L$(top_builddir)/ADOL-C
    1919
     
    2424endif
    2525
    26 paramexam_SOURCES      = paramexam.cpp $(srcdir)/../clock/myclock.cpp
     26paramexam_SOURCES      = paramexam.cpp
  • trunk/ADOL-C/examples/additional_examples/pow/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/scal/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/sparse/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS             = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                   = -l${adolclib}
     17LIBS                   = -l${adolclib}
    1818AM_LDFLAGS              = -L$(top_builddir)/ADOL-C
    1919
     
    2929sparse_hessian_SOURCES  = sparse_hessian.cpp
    3030
    31 jacpatexam_SOURCES      = jacpatexam.cpp $(srcdir)/../clock/myclock.cpp
     31jacpatexam_SOURCES      = jacpatexam.cpp
     32
     33jacpatexam_LDADD = $(builddir)/../clock/libclock.la
    3234endif
  • trunk/ADOL-C/examples/additional_examples/speelpenning/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = $(builddir)/../clock/libclock.la -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
     
    2424endif
    2525
    26 speelpenning_SOURCES = speelpenning.cpp $(srcdir)/../clock/myclock.cpp
     26speelpenning_SOURCES = speelpenning.cpp
  • trunk/ADOL-C/examples/additional_examples/tapesave/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/taylor/Makefile.am

    r471 r623  
    1515AM_CPPFLAGS          = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1616
    17 LDADD                = -l${adolclib}
     17LIBS                = -l${adolclib}
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
  • trunk/ADOL-C/examples/additional_examples/timing/Makefile.am

    r471 r623  
    1616AM_CPPFLAGS             = -I$(top_builddir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/include
    1717
    18 LDADD                   = -l${adolclib}
     18LIBS                   = $(builddir)/../clock/libclock.la -l${adolclib}
    1919AM_LDFLAGS              = -L$(top_builddir)/ADOL-C
    2020
     
    4747endif
    4848
    49 detexam_SOURCES         = sfunc_determinant.cpp sgenmain.cpp \
    50                           $(srcdir)/../clock/myclock.cpp
     49detexam_SOURCES         = sfunc_determinant.cpp sgenmain.cpp
    5150
    52 speelpenning_SOURCES    = sfunc_speelpenning.cpp sgenmain.cpp \
    53                           $(srcdir)/../clock/myclock.cpp
     51speelpenning_SOURCES    = sfunc_speelpenning.cpp sgenmain.cpp
    5452
    55 griewankexam_SOURCES    = sfunc_griewank.cpp sgenmain.cpp \
    56                           $(srcdir)/../clock/myclock.cpp
     53griewankexam_SOURCES    = sfunc_griewank.cpp sgenmain.cpp
    5754
    58 michalewitzexam_SOURCES = sfunc_michalewitz.cpp sgenmain.cpp \
    59                           $(srcdir)/../clock/myclock.cpp
     55michalewitzexam_SOURCES = sfunc_michalewitz.cpp sgenmain.cpp
    6056
    61 rosenbrockexam_SOURCES  = sfunc_rosenbrock.cpp sgenmain.cpp \
    62                           $(srcdir)/../clock/myclock.cpp
     57rosenbrockexam_SOURCES  = sfunc_rosenbrock.cpp sgenmain.cpp
    6358
    64 powexam_SOURCES         = sfunc_power.cpp sgenmain.cpp \
    65                           $(srcdir)/../clock/myclock.cpp
     59powexam_SOURCES         = sfunc_power.cpp sgenmain.cpp
    6660
    67 helmholtzexam_SOURCES   = sfunc_helmholtz.cpp sgenmain.cpp \
    68                           $(srcdir)/../clock/myclock.cpp
     61helmholtzexam_SOURCES   = sfunc_helmholtz.cpp sgenmain.cpp
    6962
    70 shuttlexam_SOURCES      = vfunc_shuttle.cpp vgenmain.cpp \
    71                           $(srcdir)/../clock/myclock.cpp
     63shuttlexam_SOURCES      = vfunc_shuttle.cpp vgenmain.cpp
    7264
    73 gearexam_SOURCES        = vfunc_gear.cpp vgenmain.cpp \
    74                           $(srcdir)/../clock/myclock.cpp
     65gearexam_SOURCES        = vfunc_gear.cpp vgenmain.cpp
    7566
    76 pargearexam_SOURCES     = vfunc_pargear.cpp rotations.cpp vgenmain.cpp \
    77                           $(srcdir)/../clock/myclock.cpp
     67pargearexam_SOURCES     = vfunc_pargear.cpp rotations.cpp vgenmain.cpp
    7868
    79 simplevec_SOURCES       = vfunc_simplevec.cpp vgenmain.cpp \
    80                           $(srcdir)/../clock/myclock.cpp
     69simplevec_SOURCES       = vfunc_simplevec.cpp vgenmain.cpp
    8170
    82 eutrophexam_SOURCES     = $(srcdir)/../ode/vfunc_eutroph.cpp vgenmain.cpp \
    83                           $(srcdir)/../clock/myclock.cpp
     71eutrophexam_SOURCES     = vgenmain.cpp
    8472
    85 robertsonexam_SOURCES   = $(srcdir)/../ode/vfunc_robertson.cpp vgenmain.cpp \
    86                           $(srcdir)/../clock/myclock.cpp
     73eutrophexam_LDADD       = $(builddir)/../ode/libeutroph.la
    8774
    88 ficexam_SOURCES         = $(srcdir)/../ode/vfunc_fic.cpp vgenmain.cpp \
    89                           $(srcdir)/../clock/myclock.cpp
     75robertsonexam_SOURCES   = vgenmain.cpp
    9076
    91 experimental_SOURCES    = sfunc_experimental.cpp sgenmain.cpp \
    92                           $(srcdir)/../clock/myclock.cpp
     77robertsonexam_LDADD     = $(builddir)/../ode/librobertson.la
     78
     79ficexam_SOURCES         = vgenmain.cpp
     80
     81ficexam_LDADD           = $(builddir)/../ode/libfic.la
     82
     83experimental_SOURCES    = sfunc_experimental.cpp sgenmain.cpp
  • trunk/ADOL-C/src/Makefile.am

    r608 r623  
    3636
    3737
    38 libadolcsrc_la_SOURCES  = adalloc.c malloc.c adouble.cpp \
     38libadolcsrc_la_SOURCES  = adalloc.c rpl_malloc.c adouble.cpp \
    3939                       convolut.c fortutils.c \
    4040                       interfaces.cpp interfacesf.c \
    4141                       taping.c tape_handling.cpp \
    42                        dvlparms.h oplate.h taping_p.h malloc.h storemanager.h \
     42                       dvlparms.h oplate.h taping_p.h rpl_malloc.h storemanager.h \
    4343                       externfcts_p.h checkpointing_p.h buffer_temp.h \
    4444                       zos_forward.c fos_forward.c fov_forward.c \
  • trunk/Makefile.am

    r547 r623  
    2424                       ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
    2525                       ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
    26                        MSVisualStudio/v10/adolc.sln MSVisualStudio/v10/adolc.vcxproj \
    27                        MSVisualStudio/v10/ColPack_Readme_VC++.txt \
    28                        MSVisualStudio/v10/ColPack.vcxproj \
    29                        MSVisualStudio/v10/sparse/config.h.in MSVisualStudio/v10/nosparse/config.h.in \
    30                        MSVisualStudio/v10/x64/sparse/config.h.in MSVisualStudio/v10/x64/nosparse/config.h.in \
    31                        MSVisualStudio/v10/sparse/config.h MSVisualStudio/v10/nosparse/config.h \
    32                        MSVisualStudio/v10/x64/sparse/config.h MSVisualStudio/v10/x64/nosparse/config.h \
    33                        MSVisualStudio/v10/Readme_VC++.txt \
    34                        MSVisualStudio/v10/installer.sh \
     26                       MSVisualStudio/v14/adolc.sln MSVisualStudio/v14/adolc.vcxproj \
     27                       MSVisualStudio/v14/ColPack_Readme_VC++.txt \
     28                       MSVisualStudio/v14/ColPack.vcxproj \
     29                       MSVisualStudio/v14/sparse/config.h.in MSVisualStudio/v14/nosparse/config.h.in \
     30                       MSVisualStudio/v14/x64/sparse/config.h.in MSVisualStudio/v14/x64/nosparse/config.h.in \
     31                       MSVisualStudio/v14/sparse/config.h MSVisualStudio/v14/nosparse/config.h \
     32                       MSVisualStudio/v14/x64/sparse/config.h MSVisualStudio/v14/x64/nosparse/config.h \
     33                       MSVisualStudio/v14/Readme_VC++.txt \
     34                       MSVisualStudio/v14/installer.sh \
    3535                       adolc.spec.in adolc.spec \
    3636                       update_versions.sh
Note: See TracChangeset for help on using the changeset viewer.