Changeset 354


Ignore:
Timestamp:
Oct 1, 2012 7:32:26 AM (6 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
Files:
6 added
24 edited
4 copied
25 moved

Legend:

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

    r171 r354  
    33## Revision: $Id: Makefile.am 38 2009-06-17 15:48:09Z awalther $
    44##
    5 ## Copyright (C) Andrea Walther, Andreas Kowarz
     5## Copyright (C) Andrea Walther, Andreas Kowarz, Kshitij Kulshreshtha
    66##
    77## This file is part of ADOL-C. This software is provided as open source.
     
    2727endif
    2828
    29 BUILT_SOURCES = $(top_builddir)/ADOL-C/adolc/adolc.h
    30 
    31 $(top_builddir)/ADOL-C/adolc/adolc.h:
    32         $(LN_S) $(top_srcdir)/ADOL-C/src adolc
     29SUBDIRS += include
    3330
    3431MAINTAINERCLEANFILES = Makefile.in
  • 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
  • trunk/ADOL-C/include/Makefile.am

    r353 r354  
    33## Revision: $Id: Makefile.am 38 2009-06-17 15:48:09Z awalther $
    44##
    5 ## Copyright (C) Andrea Walther, Andreas Kowarz
     5## Copyright (C) Andrea Walther, Andreas Kowarz, Kshitij Kulshreshtha
    66##
    77## This file is part of ADOL-C. This software is provided as open source.
     
    1111##############################################################################
    1212
    13 AUTOMAKE_OPTIONS     = foreign
    14 
    15 if DOCEXA
    16 SUBDIRS              = src examples test
    17 else
    18 if ADDEXA
    19 SUBDIRS              = src examples test
    20 else
    21 if PAREXA
    22 SUBDIRS              = src examples test
    23 else
    24 SUBDIRS              = src test
    25 endif
    26 endif
    27 endif
    28 
    29 BUILT_SOURCES = $(top_builddir)/ADOL-C/adolc/adolc.h
    30 
    31 $(top_builddir)/ADOL-C/adolc/adolc.h:
    32         $(LN_S) $(top_srcdir)/ADOL-C/src adolc
    33 
    34 MAINTAINERCLEANFILES = Makefile.in
    35 
    36 test: all
    37         cd test; $(MAKE) test
    38 
    39 
     13SUBDIRS = adolc
  • trunk/ADOL-C/include/adolc/drivers/Makefile.am

    r353 r354  
    33## Revision: $Id$
    44##
    5 ## Copyright (C) Andrea Walther, Andreas Kowarz
     5## Copyright (C)  Andrea Walther, Andreas Kowarz, Kshitij Kulshreshta
    66##
    77## This file is part of ADOL-C. This software is provided as open source.
     
    1111##############################################################################
    1212
    13 AM_CFLAGS            = @ac_adolc_cflags@
    14 AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
     13libdriversincludedir      = $(pkgincludedir)/drivers
    1614
    17 LDADD                = -ladolc
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     15libdriversinclude_HEADERS = drivers.h odedrivers.h taylor.h
    1916
    20 INCLUDES             = -I$(top_builddir)/ADOL-C
    21 
    22 MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    23 
    24 if ADDEXA
    25 noinst_PROGRAMS      = hessmat
    26 endif
    27 
    28 hessmat_SOURCES      = hessmat.cpp
  • trunk/ADOL-C/include/adolc/sparse/Makefile.am

    r353 r354  
    33## Revision: $Id$
    44##
    5 ## Copyright (C)  Andrea Walther, Andreas Kowarz
     5## Copyright (C)  Andrea Walther, Andreas Kowarz, Kshitij Kulshreshtha
    66##
    77## This file is part of ADOL-C. This software is provided as open source.
     
    1111##############################################################################
    1212
    13 AM_CFLAGS                = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    14 AM_CXXFLAGS              = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    15 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    16 
    17 INCLUDES                 = -I$(top_builddir)/ADOL-C
    18 
    19 MAINTAINERCLEANFILES     = Makefile.in *~ *.orig
    20 
    21 noinst_LTLIBRARIES       = libsparse.la
    22 
    2313libsparseincludedir      = $(pkgincludedir)/sparse
    2414
    2515libsparseinclude_HEADERS = sparsedrivers.h sparse_fo_rev.h
    26 
    27 libsparse_la_SOURCES     = sparse_fo_rev.cpp sparsedrivers.cpp
  • trunk/ADOL-C/include/adolc/tapedoc/Makefile.am

    r353 r354  
    11##############################################################################
    22## Makefile.am -- Process this file with automake to produce Makefile.in
    3 ## subdirectory tapedoc
    43## Revision: $Id$
    54##
    6 ## Copyright (C)  Andrea Walther, Andreas Kowarz
     5## Copyright (C)  Andrea Walther, Andreas Kowarz, Kshitij Kulshreshtha
    76##
    87## This file is part of ADOL-C. This software is provided as open source.
     
    1211##############################################################################
    1312
    14 AM_CFLAGS                 = @ac_adolc_cflags@ -DADOLC_INTERNAL=1
    15 AM_CXXFLAGS               = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    16 AM_LDFLAGS                = -no-undefined
    17 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    18 
    19 MAINTAINERCLEANFILES      = Makefile.in *~ *.orig
    20 
    21 INCLUDES                  = -I$(top_builddir)/ADOL-C
    22 
    23 noinst_LTLIBRARIES        = libtapedoc.la
    24 
    2513libtapedocincludedir      = $(pkgincludedir)/tapedoc
    2614
    2715libtapedocinclude_HEADERS = tapedoc.h
    28 
    29 libtapedoc_la_SOURCES     = tapedoc.c
  • trunk/ADOL-C/src/Makefile.am

    r337 r354  
    1919endif
    2020
    21 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    22 
    23 INCLUDES             = -I$(top_builddir)/ADOL-C
     21AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/src
    2422
    2523if SPARSE
     
    3533                       externfcts_p.h checkpointing_p.h buffer_temp.h
    3634
    37 pkginclude_HEADERS   = adolc.h adalloc.h adouble.h adutils.h adutilsc.h \
    38                        common.h convolut.h dvlparms.h fortutils.h\
    39                        interfaces.h taping.h usrparms.h \
    40                        externfcts.h checkpointing.h fixpoint.h\
    41                        adolc_sparse.h adolc_openmp.h \
    42                        revolve.h advector.h
    4335
    4436lib_LTLIBRARIES      = libadolc.la
  • trunk/ADOL-C/src/drivers/Makefile.am

    r171 r354  
    33## Revision: $Id$
    44##
    5 ## Copyright (C)  Andrea Walther, Andreas Kowarz
     5## Copyright (C)  Andrea Walther, Andreas Kowarz, Kshitij Kulshreshtha
    66##
    77## This file is part of ADOL-C. This software is provided as open source.
     
    1414AM_CXXFLAGS               = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    1515AM_LDFLAGS                = -no-undefined
    16 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
     16AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/src
    1717
    1818MAINTAINERCLEANFILES      = Makefile.in *~ *.orig
    1919
    20 INCLUDES                  = -I$(top_builddir)/ADOL-C
    21 
    2220noinst_LTLIBRARIES        = libdrivers.la
    23 
    24 libdriversincludedir      = $(pkgincludedir)/drivers
    25 
    26 libdriversinclude_HEADERS = drivers.h odedrivers.h taylor.h
    2721
    2822libdrivers_la_SOURCES     = drivers.c driversf.c odedrivers.c odedriversf.c \
  • trunk/ADOL-C/src/sparse/Makefile.am

    r171 r354  
    1313AM_CFLAGS                = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    1414AM_CXXFLAGS              = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    15 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    16 
    17 INCLUDES                 = -I$(top_builddir)/ADOL-C
     15AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    1816
    1917MAINTAINERCLEANFILES     = Makefile.in *~ *.orig
     
    2119noinst_LTLIBRARIES       = libsparse.la
    2220
    23 libsparseincludedir      = $(pkgincludedir)/sparse
    24 
    25 libsparseinclude_HEADERS = sparsedrivers.h sparse_fo_rev.h
    26 
    2721libsparse_la_SOURCES     = sparse_fo_rev.cpp sparsedrivers.cpp
  • trunk/ADOL-C/src/tapedoc/Makefile.am

    r171 r354  
    1515AM_CXXFLAGS               = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    1616AM_LDFLAGS                = -no-undefined
    17 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
     17AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/src
    1818
    1919MAINTAINERCLEANFILES      = Makefile.in *~ *.orig
    2020
    21 INCLUDES                  = -I$(top_builddir)/ADOL-C
    22 
    2321noinst_LTLIBRARIES        = libtapedoc.la
    2422
    25 libtapedocincludedir      = $(pkgincludedir)/tapedoc
    26 
    27 libtapedocinclude_HEADERS = tapedoc.h
    28 
    2923libtapedoc_la_SOURCES     = tapedoc.c
  • trunk/ADOL-C/test/Makefile.am

    r265 r354  
    1919fminmax_SOURCES         = fminmax.cpp
    2020
    21 INCLUDES                = -I$(top_builddir)/ADOL-C
    22 
    2321powexam_LDADD           = ../src/libadolc.la
    2422speelpenning_LDADD = ../src/libadolc.la
     
    3028# Here list all include flags, relative to this "srcdir" directory.  This
    3129# "cygpath" stuff is necessary to compile with native compilers on Cygwin
    32 AM_CPPFLAGS = -I$(srcdir)/../src/ \
    33         -I$(srcdir)/../src/drivers \
    34         -I$(srcdir)/../src/sparse \
    35         -I$(srcdir)/../src/tapedoc
     30AM_CPPFLAGS = -I$(srcdir)/../include
    3631
    3732# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/configure.ac

    r335 r354  
    1717        [adol-c@list.coin-or.org])
    1818AC_REVISION($Revision$)
    19 AC_CONFIG_SRCDIR([ADOL-C/src/adolc.h])
     19AC_CONFIG_SRCDIR([ADOL-C/src/adouble.cpp])
    2020AC_CONFIG_AUX_DIR(autoconf)
    2121AC_CONFIG_HEADERS([ADOL-C/src/config.h])
     
    382382AC_CONFIG_FILES(Makefile
    383383                ADOL-C/Makefile
     384                ADOL-C/include/Makefile
     385                ADOL-C/include/adolc/Makefile
     386                ADOL-C/include/adolc/drivers/Makefile
     387                ADOL-C/include/adolc/sparse/Makefile
     388                ADOL-C/include/adolc/tapedoc/Makefile
    384389                ADOL-C/src/Makefile
    385390                ADOL-C/src/drivers/Makefile
Note: See TracChangeset for help on using the changeset viewer.