Changeset 354 for trunk/ADOL-C/examples


Ignore:
Timestamp:
Oct 1, 2012 7:32:26 AM (7 years ago)
Author:
kulshres
Message:

Move all external headers into a separate directory

This let's us get rid of the symlink adolc that was previously required
for building and created problems sometimes
This also adjusts all Makefiles for examples to make external builds
possible.

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

Location:
trunk/ADOL-C/examples
Files:
17 edited

Legend:

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

    r337 r354  
    1313AM_CFLAGS               = @ac_adolc_cflags@
    1414AM_CXXFLAGS             = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
    16 
    17 INCLUDES                = -I$(top_builddir)/ADOL-C
     15AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/include
    1816
    1917LDADD                   = -ladolc
  • trunk/ADOL-C/examples/additional_examples/checkpointing/Makefile.am

    r171 r354  
    1313AM_CFLAGS             = @ac_adolc_cflags@
    1414AM_CXXFLAGS           = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                 = -ladolc
    1818AM_LDFLAGS            = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES              = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2119
    2220MAINTAINERCLEANFILES  = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/detexam/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
     
    2624endif
    2725
    28 detexam_SOURCES      = detexam.cpp ../clock/myclock.cpp
     26detexam_SOURCES      = detexam.cpp $(srcdir)/../clock/myclock.cpp
    2927
    30 detexam_old_SOURCES  = detexam-old.cpp ../clock/myclock.cpp
     28detexam_old_SOURCES  = detexam-old.cpp $(srcdir)/../clock/myclock.cpp
  • trunk/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.am

    r171 r354  
    1313AM_CFLAGS              = @ac_adolc_cflags@
    1414AM_CXXFLAGS            = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                  = -ladolc
    1818AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES               = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2119
    2220MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.am

    r171 r354  
    1313AM_CFLAGS              = @ac_adolc_cflags@
    1414AM_CXXFLAGS            = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                  = -ladolc
    1818AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES               = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2119
    2220MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/helm/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/hessmat/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/lighthouse/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/lufact/Makefile.am

    r171 r354  
    1414AM_CFLAGS            = @ac_adolc_cflags@
    1515AM_CXXFLAGS          = @ac_adolc_cxxflags@
    16 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     16AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1717
    1818LDADD                = -ladolc
    1919AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    20 
    21 INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2220
    2321EXTRA_DIST           = LU.h
  • trunk/ADOL-C/examples/additional_examples/ode/Makefile.am

    r171 r354  
    1414AM_CFLAGS               = @ac_adolc_cflags@
    1515AM_CXXFLAGS             = @ac_adolc_cxxflags@
    16 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
     16AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/include
    1717
    1818LDADD                = -ladolc
    1919AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    20 
    21 INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2220
    2321MAINTAINERCLEANFILES = Makefile.in *~ *.orig
     
    2725endif
    2826
    29 odexam_SOURCES       = vfunc_robertson.cpp vgenodemain.cpp ../clock/myclock.cpp
     27odexam_SOURCES       = vfunc_robertson.cpp vgenodemain.cpp $(srcdir)/../clock/myclock.cpp
    3028
    31 od2exam_SOURCES      = vfunc_eutroph.cpp vgenodemain.cpp ../clock/myclock.cpp
     29od2exam_SOURCES      = vfunc_eutroph.cpp vgenodemain.cpp $(srcdir)/../clock/myclock.cpp
    3230
    33 od3exam_SOURCES      = vfunc_fic.cpp vgenodemain.cpp ../clock/myclock.cpp
     31od3exam_SOURCES      = vfunc_fic.cpp vgenodemain.cpp $(srcdir)/../clock/myclock.cpp
  • trunk/ADOL-C/examples/additional_examples/openmp_exam/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/pow/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/scal/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/sparse/Makefile.am

    r171 r354  
    1313AM_CFLAGS               = @ac_adolc_cflags@
    1414AM_CXXFLAGS             = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                   = -ladolc
    1818AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES                = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2119
    2220MAINTAINERCLEANFILES    = Makefile.in *~ *.orig
     
    3129sparse_hessian_SOURCES  = sparse_hessian.cpp
    3230
    33 jacpatexam_SOURCES      = jacpatexam.cpp ../clock/myclock.cpp
     31jacpatexam_SOURCES      = jacpatexam.cpp $(srcdir)/../clock/myclock.cpp
    3432endif
  • trunk/ADOL-C/examples/additional_examples/speelpenning/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
     
    2624endif
    2725
    28 speelpenning_SOURCES = speelpenning.cpp ../clock/myclock.cpp
     26speelpenning_SOURCES = speelpenning.cpp $(srcdir)/../clock/myclock.cpp
  • trunk/ADOL-C/examples/additional_examples/taylor/Makefile.am

    r171 r354  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include
    1616
    1717LDADD                = -ladolc
    1818AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    19 
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    2119
    2220MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/timing/Makefile.am

    r171 r354  
    1414AM_CFLAGS               = @ac_adolc_cflags@
    1515AM_CXXFLAGS             = @ac_adolc_cxxflags@
    16 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
     16AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/include
    1717
    1818LDADD                   = -ladolc
    1919AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    20 
    21 INCLUDES                = -I$(top_builddir)/ADOL-C -I$(top_srcdir)ADOL-C/examples/additional_examples
    2220
    2321CTRLFILES               = detexam.ctrl \
     
    5048
    5149detexam_SOURCES         = sfunc_determinant.cpp sgenmain.cpp \
    52                           ../clock/myclock.cpp
     50                          $(srcdir)/../clock/myclock.cpp
    5351
    5452speelpenning_SOURCES    = sfunc_speelpenning.cpp sgenmain.cpp \
    55                           ../clock/myclock.cpp
     53                          $(srcdir)/../clock/myclock.cpp
    5654
    5755griewankexam_SOURCES    = sfunc_griewank.cpp sgenmain.cpp \
    58                           ../clock/myclock.cpp
     56                          $(srcdir)/../clock/myclock.cpp
    5957
    6058michalewitzexam_SOURCES = sfunc_michalewitz.cpp sgenmain.cpp \
    61                           ../clock/myclock.cpp
     59                          $(srcdir)/../clock/myclock.cpp
    6260
    6361rosenbrockexam_SOURCES  = sfunc_rosenbrock.cpp sgenmain.cpp \
    64                           ../clock/myclock.cpp
     62                          $(srcdir)/../clock/myclock.cpp
    6563
    6664powexam_SOURCES         = sfunc_power.cpp sgenmain.cpp \
    67                           ../clock/myclock.cpp
     65                          $(srcdir)/../clock/myclock.cpp
    6866
    6967helmholtzexam_SOURCES   = sfunc_helmholtz.cpp sgenmain.cpp \
    70                           ../clock/myclock.cpp
     68                          $(srcdir)/../clock/myclock.cpp
    7169
    7270shuttlexam_SOURCES      = vfunc_shuttle.cpp vgenmain.cpp \
    73                           ../clock/myclock.cpp
     71                          $(srcdir)/../clock/myclock.cpp
    7472
    7573gearexam_SOURCES        = vfunc_gear.cpp vgenmain.cpp \
    76                           ../clock/myclock.cpp
     74                          $(srcdir)/../clock/myclock.cpp
    7775
    7876pargearexam_SOURCES     = vfunc_pargear.cpp rotations.cpp vgenmain.cpp \
    79                           ../clock/myclock.cpp
     77                          $(srcdir)/../clock/myclock.cpp
    8078
    8179simplevec_SOURCES       = vfunc_simplevec.cpp vgenmain.cpp \
    82                           ../clock/myclock.cpp
     80                          $(srcdir)/../clock/myclock.cpp
    8381
    84 eutrophexam_SOURCES     = ../ode/vfunc_eutroph.cpp vgenmain.cpp \
    85                           ../clock/myclock.cpp
     82eutrophexam_SOURCES     = $(srcdir)/../ode/vfunc_eutroph.cpp vgenmain.cpp \
     83                          $(srcdir)/../clock/myclock.cpp
    8684
    87 robertsonexam_SOURCES   = ../ode/vfunc_robertson.cpp vgenmain.cpp \
    88                           ../clock/myclock.cpp
     85robertsonexam_SOURCES   = $(srcdir)/../ode/vfunc_robertson.cpp vgenmain.cpp \
     86                          $(srcdir)/../clock/myclock.cpp
    8987
    90 ficexam_SOURCES         = ../ode/vfunc_fic.cpp vgenmain.cpp \
    91                           ../clock/myclock.cpp
     88ficexam_SOURCES         = $(srcdir)/../ode/vfunc_fic.cpp vgenmain.cpp \
     89                          $(srcdir)/../clock/myclock.cpp
    9290
    9391experimental_SOURCES    = sfunc_experimental.cpp sgenmain.cpp \
    94                           ../clock/myclock.cpp
     92                          $(srcdir)/../clock/myclock.cpp
Note: See TracChangeset for help on using the changeset viewer.