Changeset 171


Ignore:
Timestamp:
Oct 4, 2010 9:57:19 AM (9 years ago)
Author:
kulshres
Message:

Squashed merge branch 'master' of 'gitclone' into svn

  • 'master' of 'gitclone': (84 commits) adjust example makefiles and include paths get rid of the symlink in the src subdirectory

details of the commits:
commit c9e4bc332d2363f737fc2e8a8fcfc2e43ddb9d15
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Oct 4 15:43:47 2010 +0200

adjust example makefiles and include paths

include paths in example sources were wrong for some time now
simplify makefile rules too, there is really no need for checking SPARSE
adjust include paths in makefiles.

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

commit e6e1963e41e097fd5b4a79cd1611c12f6868dc94
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Oct 4 15:41:25 2010 +0200

get rid of the symlink in the src subdirectory

windows doesn't like symlinks and make infinite depth directories
we now create a symlink for build in the directory parallel to src
adjust all makefiles.am accordingly for build

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

Location:
trunk/ADOL-C
Files:
1 deleted
102 edited

Legend:

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

    r73 r171  
    2727endif
    2828
     29BUILT_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
    2934MAINTAINERCLEANFILES = Makefile.in
    3035
  • trunk/ADOL-C/Makefile.in

    r128 r171  
    236236@ADDEXA_TRUE@@DOCEXA_FALSE@SUBDIRS = src examples test
    237237@DOCEXA_TRUE@SUBDIRS = src examples test
     238BUILT_SOURCES = $(top_builddir)/ADOL-C/adolc/adolc.h
    238239MAINTAINERCLEANFILES = Makefile.in
    239 all: all-recursive
     240all: $(BUILT_SOURCES)
     241        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    240242
    241243.SUFFIXES:
     
    471473        done
    472474check-am: all-am
    473 check: check-recursive
     475check: $(BUILT_SOURCES)
     476        $(MAKE) $(AM_MAKEFLAGS) check-recursive
    474477all-am: Makefile
    475478installdirs: installdirs-recursive
    476479installdirs-am:
    477 install: install-recursive
     480install: $(BUILT_SOURCES)
     481        $(MAKE) $(AM_MAKEFLAGS) install-recursive
    478482install-exec: install-exec-recursive
    479483install-data: install-data-recursive
     
    500504        @echo "This command is intended for maintainers to use"
    501505        @echo "it deletes files that may require special tools to rebuild."
     506        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
    502507        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
    503508clean: clean-recursive
     
    567572uninstall-am:
    568573
    569 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
    570         install-am install-strip tags-recursive
     574.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
     575        ctags-recursive install install-am install-strip \
     576        tags-recursive
    571577
    572578.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
     
    585591
    586592
     593$(top_builddir)/ADOL-C/adolc/adolc.h:
     594        $(LN_S) $(top_srcdir)/ADOL-C/src adolc
     595
    587596test: all
    588597        cd test; $(MAKE) test
  • trunk/ADOL-C/examples/Makefile.am

    r161 r171  
    1313AM_CFLAGS               = @ac_adolc_cflags@
    1414AM_CXXFLAGS             = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
     17INCLUDES                = -I$(top_builddir)/ADOL-C
     18
    1819LDADD                   = -ladolc
    19 AM_LDFLAGS              = -L../src
    20 AM_CPPFLAGS             += @COLPACK_CFLAGS@
    21 else
    22 LDADD                   = -ladolc
    23 AM_LDFLAGS              = -L../src
    24 endif
    25 
    26 INCLUDES                = -I$(top_builddir)
     20AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    2721
    2822MAINTAINERCLEANFILES    = Makefile.in *~ *.orig ADOLC-*.tap
  • trunk/ADOL-C/examples/Makefile.in

    r161 r171  
    3838build_triplet = @build@
    3939host_triplet = @host@
    40 @SPARSE_TRUE@am__append_1 = @COLPACK_CFLAGS@
    4140@DOCEXA_TRUE@noinst_PROGRAMS = detexam$(EXEEXT) speelpenning$(EXEEXT) \
    4241@DOCEXA_TRUE@   powexam$(EXEEXT) odexam$(EXEEXT) \
     
    277276AM_CFLAGS = @ac_adolc_cflags@
    278277AM_CXXFLAGS = @ac_adolc_cxxflags@
    279 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src $(am__append_1)
    280 @SPARSE_FALSE@LDADD = -ladolc
    281 @SPARSE_TRUE@LDADD = -ladolc
    282 @SPARSE_FALSE@AM_LDFLAGS = -L../src
    283 @SPARSE_TRUE@AM_LDFLAGS = -L../src
    284 INCLUDES = -I$(top_builddir)
     278AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     279INCLUDES = -I$(top_builddir)/ADOL-C
     280LDADD = -ladolc
     281AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
    285282MAINTAINERCLEANFILES = Makefile.in *~ *.orig ADOLC-*.tap
    286283EXTRA_DIST = adolc_examples.sln \
  • trunk/ADOL-C/examples/additional_examples/checkpointing/Makefile.am

    r161 r171  
    1313AM_CFLAGS             = @ac_adolc_cflags@
    1414AM_CXXFLAGS           = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                 = -ladolc
    19 AM_LDFLAGS            = -L../../../src
    20 else
    21 LDADD                 = -ladolc
    22 AM_LDFLAGS            = -L../../../src
    23 endif
     18AM_LDFLAGS            = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES              = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES              = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES  = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/checkpointing/Makefile.in

    r161 r171  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219checkpointing_SOURCES = checkpointing.cpp
  • trunk/ADOL-C/examples/additional_examples/checkpointing/checkpointing.cpp

    r42 r171  
    1313---------------------------------------------------------------------------*/
    1414#include <math.h>
    15 #include <adolc.h>
     15#include <adolc/adolc.h>
    1616
    1717#define h 0.01
  • trunk/ADOL-C/examples/additional_examples/clock/myclock.cpp

    r42 r171  
    1818#include <sys/timeb.h>
    1919#include <time.h>
    20 #include <../examples/additional_examples/clock/myclock.h>
     20#include "myclock.h"
    2121
    2222
  • trunk/ADOL-C/examples/additional_examples/detexam/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/detexam/Makefile.in

    r161 r171  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223detexam_SOURCES = detexam.cpp ../clock/myclock.cpp
  • trunk/ADOL-C/examples/additional_examples/detexam/detexam-old.cpp

    r88 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
    19 #include <../examples/additional_examples/clock/myclock.h>
     18#include <adolc/adolc.h>
     19#include "../clock/myclock.h"
    2020
    2121
  • trunk/ADOL-C/examples/additional_examples/detexam/detexam.cpp

    r88 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
    19 #include <../examples/additional_examples/clock/myclock.h>
     18#include <adolc/adolc.h>
     19#include "../clock/myclock.h"
    2020
    2121
  • trunk/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.am

    r161 r171  
    1313AM_CFLAGS              = @ac_adolc_cflags@
    1414AM_CXXFLAGS            = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                  = -ladolc
    19 AM_LDFLAGS             = -L../../../src
    20 else
    21 LDADD                  = -ladolc
    22 AM_LDFLAGS             = -L../../../src
    23 endif
     18AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES               = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES               = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.in

    r161 r171  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219ext_diff_func_SOURCES = ext_diff_func.cpp
  • trunk/ADOL-C/examples/additional_examples/ext_diff_func/ext_diff_func.cpp

    r42 r171  
    1313---------------------------------------------------------------------------*/
    1414#include <math.h>
    15 #include <adolc.h>
     15#include <adolc/adolc.h>
    1616
    1717#define h 0.01
  • trunk/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.am

    r161 r171  
    1313AM_CFLAGS              = @ac_adolc_cflags@
    1414AM_CXXFLAGS            = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                  = -ladolc
    19 AM_LDFLAGS             = -L../../../src
    20 else
    21 LDADD                  = -ladolc
    22 AM_LDFLAGS             = -L../../../src
    23 endif
     18AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES               = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES               = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.in

    r161 r171  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219fixpoint_exam_SOURCES = fixpoint_exam.cpp
  • trunk/ADOL-C/examples/additional_examples/fixpoint_exam/fixpoint_exam.cpp

    r42 r171  
    1313---------------------------------------------------------------------------*/
    1414#include <math.h>
    15 #include <adolc.h>
     15#include <adolc/adolc.h>
    1616
    1717#define imax 100
  • trunk/ADOL-C/examples/additional_examples/helm/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/helm/Makefile.in

    r161 r171  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir)
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223helm_auto_SOURCES = helm-auto-exam.cpp
  • trunk/ADOL-C/examples/additional_examples/helm/helm-auto-exam.cpp

    r88 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/hessmat/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/hessmat/Makefile.in

    r161 r171  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir)
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219hessmat_SOURCES = hessmat.cpp
  • trunk/ADOL-C/examples/additional_examples/hessmat/hessmat.cpp

    r42 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <stdlib.h>
  • trunk/ADOL-C/examples/additional_examples/lighthouse/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/lighthouse/Makefile.in

    r161 r171  
    227227AM_CFLAGS = @ac_adolc_cflags@
    228228AM_CXXFLAGS = @ac_adolc_cxxflags@
    229 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    230 @SPARSE_FALSE@LDADD = -ladolc
    231 @SPARSE_TRUE@LDADD = -ladolc
    232 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    233 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    234 INCLUDES = -I$(top_builddir)
     229AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     230LDADD = -ladolc
     231AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     232INCLUDES = -I$(top_builddir)/ADOL-C
    235233MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    236234cubic_SOURCES = cubic.cpp
  • trunk/ADOL-C/examples/additional_examples/lighthouse/cubic-2.cpp

    r42 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/lighthouse/cubic-iter-2.cpp

    r42 r171  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>
     20#include <adolc/adolc.h>
    2121#include <math.h>
    2222
  • trunk/ADOL-C/examples/additional_examples/lighthouse/cubic-iter.cpp

    r42 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/lighthouse/cubic.cpp

    r42 r171  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>
     20#include <adolc/adolc.h>
    2121
    2222#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/lufact/LU.cpp

    r42 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <../examples/additional_examples/lufact/LU.h>
     19#include "LU.h"
    2020
    2121/****************************************************************************/
  • trunk/ADOL-C/examples/additional_examples/lufact/LU.h

    r42 r171  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>           // use of ALL ADOL-C interfaces
     20#include <adolc/adolc.h>           // use of ALL ADOL-C interfaces
    2121
    2222
  • trunk/ADOL-C/examples/additional_examples/lufact/LUdet.cpp

    r88 r171  
    2323/****************************************************************************/
    2424/*                                                                 INCLUDES */
    25 #include <../examples/additional_examples/lufact/LU.h>
     25#include "LU.h"
    2626
    2727
  • trunk/ADOL-C/examples/additional_examples/lufact/LUsolve.cpp

    r88 r171  
    2323/****************************************************************************/
    2424/*                                                                 INCLUDES */
    25 #include <../examples/additional_examples/lufact/LU.h>
     25#include "LU.h"
    2626
    2727/****************************************************************************/
  • trunk/ADOL-C/examples/additional_examples/lufact/Makefile.am

    r161 r171  
    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
    1717
    18 if SPARSE
    1918LDADD                = -ladolc
    20 AM_LDFLAGS           = -L../../../src
    21 else
    22 LDADD                = -ladolc
    23 AM_LDFLAGS           = -L../../../src
    24 endif
     19AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2520
    26 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     21INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2722
    2823EXTRA_DIST           = LU.h
  • trunk/ADOL-C/examples/additional_examples/lufact/Makefile.in

    r161 r171  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    224222EXTRA_DIST = LU.h
    225223MAINTAINERCLEANFILES = Makefile.in tape.tex *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/ode/Makefile.am

    r161 r171  
    1616AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
    1717
    18 if SPARSE
    1918LDADD                = -ladolc
    20 AM_LDFLAGS           = -L../../../src
    21 else
    22 LDADD                = -ladolc
    23 AM_LDFLAGS           = -L../../../src
    24 endif
     19AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2520
    26 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     21INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2722
    2823MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/ode/Makefile.in

    r161 r171  
    225225AM_CXXFLAGS = @ac_adolc_cxxflags@
    226226AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    227 @SPARSE_FALSE@LDADD = -ladolc
    228 @SPARSE_TRUE@LDADD = -ladolc
    229 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    230 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    231 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     227LDADD = -ladolc
     228AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     229INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    232230MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    233231odexam_SOURCES = vfunc_robertson.cpp vgenodemain.cpp ../clock/myclock.cpp
  • trunk/ADOL-C/examples/additional_examples/ode/vfunc_eutroph.cpp

    r42 r171  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/ode/vfunc_fic.cpp

    r42 r171  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/ode/vfunc_robertson.cpp

    r42 r171  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/ode/vgenodemain.cpp

    r88 r171  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
    32 #include <../examples/additional_examples/clock/myclock.h>
     31#include <adolc/adolc.h>
     32#include "../clock/myclock.h"
    3333
    3434#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/openmp_exam/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/openmp_exam/Makefile.in

    r161 r171  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir)
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223liborser_SOURCES = liborser.cpp
  • trunk/ADOL-C/examples/additional_examples/pow/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/pow/Makefile.in

    r161 r171  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir)
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219powexam_SOURCES = powexam.cpp
  • trunk/ADOL-C/examples/additional_examples/pow/powexam.cpp

    r42 r171  
    1717/*                                                                 INCLUDES */
    1818
    19 #include <adolc.h>               // use of ALL ADOL-C interfaces
     19#include <adolc/adolc.h>               // use of ALL ADOL-C interfaces
    2020
    2121#include <iostream>
  • trunk/ADOL-C/examples/additional_examples/scal/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/scal/Makefile.in

    r161 r171  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir)
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219scalexam_SOURCES = scalexam.cpp
  • trunk/ADOL-C/examples/additional_examples/scal/scalexam.cpp

    r88 r171  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <math.h>
  • trunk/ADOL-C/examples/additional_examples/sparse/Makefile.am

    r161 r171  
    1313AM_CFLAGS               = @ac_adolc_cflags@
    1414AM_CXXFLAGS             = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                   = -ladolc
    19 AM_LDFLAGS              = -L../../../src
    20 else
    21 LDADD                   = -ladolc
    22 AM_LDFLAGS              = -L../../../src
    23 endif
     18AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES                = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES                = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES    = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/sparse/Makefile.in

    r161 r171  
    229229AM_CFLAGS = @ac_adolc_cflags@
    230230AM_CXXFLAGS = @ac_adolc_cxxflags@
    231 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    232 @SPARSE_FALSE@LDADD = -ladolc
    233 @SPARSE_TRUE@LDADD = -ladolc
    234 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    235 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    236 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     231AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     232LDADD = -ladolc
     233AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     234INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    237235MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    238236@SPARSE_TRUE@sparse_jacobian_SOURCES = sparse_jacobian.cpp
  • trunk/ADOL-C/examples/additional_examples/sparse/jacpatexam.cpp

    r42 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
    19 #include <adolc_sparse.h>
    20 #include <../examples/additional_examples/clock/myclock.h>
     18#include <adolc/adolc.h>
     19#include <adolc/adolc_sparse.h>
     20#include "../clock/myclock.h"
    2121
    2222#include <string.h>
  • trunk/ADOL-C/examples/additional_examples/sparse/sparse_hessian.cpp

    r160 r171  
    1818#include <cstdio>
    1919
    20 #include <adolc.h>
    21 #include <adolc_sparse.h>
     20#include <adolc/adolc.h>
     21#include <adolc/adolc_sparse.h>
    2222
    2323#define tag 1
  • trunk/ADOL-C/examples/additional_examples/sparse/sparse_jacobian.cpp

    r160 r171  
    1818#include <cstdio>
    1919
    20 #include <adolc.h>
    21 #include <adolc_sparse.h>
     20#include <adolc/adolc.h>
     21#include <adolc/adolc_sparse.h>
    2222
    2323#define tag 1
  • trunk/ADOL-C/examples/additional_examples/speelpenning/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/speelpenning/Makefile.in

    r161 r171  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219speelpenning_SOURCES = speelpenning.cpp ../clock/myclock.cpp
  • trunk/ADOL-C/examples/additional_examples/speelpenning/speelpenning.cpp

    r88 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
    20 #include <../examples/additional_examples/clock/myclock.h>
     19#include <adolc/adolc.h>
     20#include "../clock/myclock.h"
    2121
    2222
  • trunk/ADOL-C/examples/additional_examples/tapesave/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/tapesave/Makefile.in

    r161 r171  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir)
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223createTape_SOURCES = createTape.cpp
  • trunk/ADOL-C/examples/additional_examples/tapesave/createTape.cpp

    r42 r171  
    2323/*                                                                 INCLUDES */
    2424/* use of ALL ADOL-C interfaces */
    25 #include <adolc.h>
     25#include <adolc/adolc.h>
    2626
    2727/****************************************************************************/
  • trunk/ADOL-C/examples/additional_examples/tapesave/useTape.cpp

    r88 r171  
    2323/*                                                                 INCLUDES */
    2424/* use of ALL ADOL-C interfaces */
    25 #include <adolc.h>
     25#include <adolc/adolc.h>
    2626
    2727#include <cstdio>
  • trunk/ADOL-C/examples/additional_examples/taylor/Makefile.am

    r161 r171  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/taylor/Makefile.in

    r161 r171  
    232232AM_CFLAGS = @ac_adolc_cflags@
    233233AM_CXXFLAGS = @ac_adolc_cxxflags@
    234 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    235 @SPARSE_FALSE@LDADD = -ladolc
    236 @SPARSE_TRUE@LDADD = -ladolc
    237 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    238 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    239 INCLUDES = -I$(top_builddir)
     234AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     235LDADD = -ladolc
     236AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     237INCLUDES = -I$(top_builddir)/ADOL-C
    240238MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    241239taylorexam_SOURCES = taylorexam.cpp
  • trunk/ADOL-C/examples/additional_examples/taylor/accessexam.cpp

    r42 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
     18#include <adolc/adolc.h>
    1919
    2020#include <stdlib.h>
  • trunk/ADOL-C/examples/additional_examples/taylor/coordinates.cpp

    r42 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
     18#include <adolc/adolc.h>
    1919
    2020#include <cstdlib>
  • trunk/ADOL-C/examples/additional_examples/taylor/inversexam.cpp

    r42 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <cstdlib>
  • trunk/ADOL-C/examples/additional_examples/taylor/taylorexam.cpp

    r42 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
     18#include <adolc/adolc.h>
    1919
    2020#include <cstdlib>
  • trunk/ADOL-C/examples/additional_examples/taylor/trigger.cpp

    r42 r171  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>
     20#include <adolc/adolc.h>
    2121
    2222#include <cstdlib>
  • trunk/ADOL-C/examples/additional_examples/timing/Makefile.am

    r161 r171  
    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
    1717
    18 if SPARSE
    1918LDADD                   = -ladolc
    20 AM_LDFLAGS              = -L../../../src
    21 else
    22 LDADD                   = -ladolc
    23 AM_LDFLAGS              = -L../../../src
    24 endif
     19AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    2520
    26 INCLUDES                = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     21INCLUDES                = -I$(top_builddir)/ADOL-C -I$(top_srcdir)ADOL-C/examples/additional_examples
    2722
    2823CTRLFILES               = detexam.ctrl \
  • trunk/ADOL-C/examples/additional_examples/timing/Makefile.in

    r161 r171  
    302302AM_CFLAGS = @ac_adolc_cflags@
    303303AM_CXXFLAGS = @ac_adolc_cxxflags@
    304 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    305 @SPARSE_FALSE@LDADD = -ladolc
    306 @SPARSE_TRUE@LDADD = -ladolc
    307 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    308 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    309 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     304AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     305LDADD = -ladolc
     306AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     307INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)ADOL-C/examples/additional_examples
    310308CTRLFILES = detexam.ctrl \
    311309                          eutrophexam.ctrl \
  • trunk/ADOL-C/examples/additional_examples/timing/rotations.cpp

    r42 r171  
    2020/****************************************************************************/
    2121/*                                                                 INCLUDES */
    22 #include <adolc.h>
    23 #include <../examples/additional_examples/timing/rotations.h>
     22#include <adolc/adolc.h>
     23#include "rotations.h"
    2424
    2525#include <cmath>
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_determinant.cpp

    r42 r171  
    2626/****************************************************************************/
    2727/*                                                                 INCLUDES */
    28 #include <adolc.h>
     28#include <adolc/adolc.h>
    2929
    3030
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_experimental.cpp

    r42 r171  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <time.h>
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_griewank.cpp

    r42 r171  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <cmath>
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_helmholtz.cpp

    r42 r171  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030#include <cmath>
    3131
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_michalewitz.cpp

    r42 r171  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <cmath>
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_power.cpp

    r42 r171  
    2626/****************************************************************************/
    2727/*                                                                 INCLUDES */
    28 #include <adolc.h>
     28#include <adolc/adolc.h>
    2929
    3030#include <cstdlib>
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_rosenbrock.cpp

    r42 r171  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <cmath>
  • trunk/ADOL-C/examples/additional_examples/timing/sfunc_speelpenning.cpp

    r42 r171  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <time.h>
  • trunk/ADOL-C/examples/additional_examples/timing/sgenmain.cpp

    r88 r171  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
    32 #include <../examples/additional_examples/clock/myclock.h>
     31#include <adolc/adolc.h>
     32#include "../clock/myclock.h"
    3333
    3434#include <cstdlib>
  • trunk/ADOL-C/examples/additional_examples/timing/vfunc_gear.cpp

    r42 r171  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <cmath>
  • trunk/ADOL-C/examples/additional_examples/timing/vfunc_pargear.cpp

    r42 r171  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
    32 #include <../examples/additional_examples/timing/rotations.h>
     31#include <adolc/adolc.h>
     32#include "rotations.h"
    3333
    3434#include <cmath>
  • trunk/ADOL-C/examples/additional_examples/timing/vfunc_shuttle.cpp

    r42 r171  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
     31#include <adolc/adolc.h>
    3232
    3333#include <cmath>
  • trunk/ADOL-C/examples/additional_examples/timing/vfunc_simplevec.cpp

    r42 r171  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <time.h>
  • trunk/ADOL-C/examples/additional_examples/timing/vgenmain.cpp

    r88 r171  
    3131/****************************************************************************/
    3232/*                                                                 INCLUDES */
    33 #include <adolc.h>
    34 #include <../examples/additional_examples/clock/myclock.h>
     33#include <adolc/adolc.h>
     34#include "../clock/myclock.h"
    3535
    3636#include <cstdlib>
  • trunk/ADOL-C/examples/detexam.cpp

    r42 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adouble.h>          // use of active doubles
    19 #include <interfaces.h>       // use of basic forward/reverse
     18#include <adolc/adouble.h>          // use of active doubles
     19#include <adolc/interfaces.h>       // use of basic forward/reverse
    2020// interfaces of ADOL-C
    21 #include <taping.h>           // use of taping
     21#include <adolc/taping.h>           // use of taping
    2222
    2323#include <iostream>
  • trunk/ADOL-C/examples/odexam.cpp

    r42 r171  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adouble.h>            // use of active double
    20 #include <drivers/odedrivers.h> // use of "Easy To Use" ODE drivers
    21 #include <adalloc.h>            // use of ADOL-C allocation utilities
    22 #include <taping.h>             // use of taping
     19#include <adolc/adouble.h>            // use of active double
     20#include <adolc/drivers/odedrivers.h> // use of "Easy To Use" ODE drivers
     21#include <adolc/adalloc.h>            // use of ADOL-C allocation utilities
     22#include <adolc/taping.h>             // use of taping
    2323
    2424// NOTICE: If one wants to include all ADOL-C interfaces without
    2525//         getting in trouble to find out the right header files
    2626//
    27 //         #include "adolc.h"
     27//         #include "adolc/adolc.h"
    2828//
    2929//         will do the right work.
  • trunk/ADOL-C/examples/powexam.cpp

    r42 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>             /* use of ALL ADOL-C interfaces */
     18#include <adolc/adolc.h>             /* use of ALL ADOL-C interfaces */
    1919
    2020#include <iostream>
  • trunk/ADOL-C/examples/speelpenning.cpp

    r103 r171  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adouble.h>            // use of active doubles
    19 #include <drivers/drivers.h>    // use of "Easy to Use" drivers
     18#include <adolc/adouble.h>            // use of active doubles
     19#include <adolc/drivers/drivers.h>    // use of "Easy to Use" drivers
    2020// gradient(.) and hessian(.)
    21 #include <taping.h>             // use of taping
     21#include <adolc/taping.h>             // use of taping
    2222
    2323#include <iostream>
  • trunk/ADOL-C/examples/tapeless_scalar.cpp

    r42 r171  
    2323
    2424#define ADOLC_TAPELESS
    25 #include <adouble.h>
     25#include <adolc/adouble.h>
    2626typedef adtl::adouble adouble;
    2727
  • trunk/ADOL-C/examples/tapeless_vector.cpp

    r42 r171  
    2323#define ADOLC_TAPELESS
    2424#define NUMBER_DIRECTIONS 3
    25 #include <adouble.h>
     25#include <adolc/adouble.h>
    2626typedef adtl::adouble adouble;
    2727
  • trunk/ADOL-C/src/Makefile.am

    r161 r171  
    1919endif
    2020
    21 AM_CPPFLAGS          = -I$(top_srcdir)
     21AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    2222
    23 INCLUDES             = -I$(top_builddir)
     23INCLUDES             = -I$(top_builddir)/ADOL-C
    2424
    2525if SPARSE
     
    4646libadolc_la_LDFLAGS  = -version-info 2:1:1 -no-undefined
    4747
    48 BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
    49 
    50 $(top_builddir)/ADOL-C/src/adolc/adolc.h:
    51         $(LN_S) $(top_srcdir)/ADOL-C/src adolc
    52 
    5348if SPARSE
    5449libadolc_la_SOURCES  = adalloc.c malloc.c adouble.cpp \
    5550                       convolut.c fortutils.c \
    5651                       interfaces.cpp interfacesf.c \
    57                        taping.c tape_handling.cpp \
     52                       taping_p.h taping.c tape_handling.cpp \
    5853                       zos_forward.c fos_forward.c fov_forward.c \
    5954                       hos_forward.c hov_forward.c hov_wk_forward.c \
  • trunk/ADOL-C/src/Makefile.in

    r161 r171  
    8686        fov_reverse.c hos_reverse.c hos_ov_reverse.c hov_reverse.c \
    8787        forward_partx.c externfcts.cpp checkpointing.cpp fixpoint.cpp \
    88         fov_offset_forward.c revolve.c int_forward_s.c int_forward_t.c \
    89         indopro_forward_s.c indopro_forward_t.c nonl_ind_forward_s.c \
    90         nonl_ind_forward_t.c int_reverse_s.c int_reverse_t.c
     88        fov_offset_forward.c revolve.c taping_p.h int_forward_s.c \
     89        int_forward_t.c indopro_forward_s.c indopro_forward_t.c \
     90        nonl_ind_forward_s.c nonl_ind_forward_t.c int_reverse_s.c \
     91        int_reverse_t.c
    9192@SPARSE_FALSE@am_libadolc_la_OBJECTS = adalloc.lo malloc.lo adouble.lo \
    9293@SPARSE_FALSE@  convolut.lo fortutils.lo interfaces.lo \
     
    318319@SPARSE_FALSE@AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    319320@SPARSE_TRUE@AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    320 AM_CPPFLAGS = -I$(top_srcdir)
    321 INCLUDES = -I$(top_builddir)
     321AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     322INCLUDES = -I$(top_builddir)/ADOL-C
    322323@SPARSE_FALSE@SUBDIRS = drivers tapedoc
    323324@SPARSE_TRUE@SUBDIRS = drivers sparse tapedoc
     
    337338libadolc_la_LDFLAGS = -version-info 2:1:1 -no-undefined \
    338339        $(am__append_1)
    339 BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
    340340@SPARSE_FALSE@libadolc_la_SOURCES = adalloc.c malloc.c adouble.cpp \
    341341@SPARSE_FALSE@                       convolut.c fortutils.c\
     
    353353@SPARSE_TRUE@                       convolut.c fortutils.c \
    354354@SPARSE_TRUE@                       interfaces.cpp interfacesf.c \
    355 @SPARSE_TRUE@                       taping.c tape_handling.cpp \
     355@SPARSE_TRUE@                       taping_p.h taping.c tape_handling.cpp \
    356356@SPARSE_TRUE@                       zos_forward.c fos_forward.c fov_forward.c \
    357357@SPARSE_TRUE@                       hos_forward.c hov_forward.c hov_wk_forward.c \
     
    370370@SPARSE_TRUE@                       tapedoc/libtapedoc.la
    371371
    372 all: $(BUILT_SOURCES) config.h
     372all: config.h
    373373        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    374374
     
    759759        done
    760760check-am: all-am
    761 check: $(BUILT_SOURCES)
    762         $(MAKE) $(AM_MAKEFLAGS) check-recursive
     761check: check-recursive
    763762all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
    764763installdirs: installdirs-recursive
     
    767766          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
    768767        done
    769 install: $(BUILT_SOURCES)
    770         $(MAKE) $(AM_MAKEFLAGS) install-recursive
     768install: install-recursive
    771769install-exec: install-exec-recursive
    772770install-data: install-data-recursive
     
    793791        @echo "This command is intended for maintainers to use"
    794792        @echo "it deletes files that may require special tools to rebuild."
    795         -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
    796793        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
    797794clean: clean-recursive
     
    866863uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
    867864
    868 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
    869         ctags-recursive install install-am install-strip \
    870         tags-recursive
     865.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
     866        ctags-recursive install-am install-strip tags-recursive
    871867
    872868.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
     
    888884
    889885
    890 $(top_builddir)/ADOL-C/src/adolc/adolc.h:
    891         $(LN_S) $(top_srcdir)/ADOL-C/src adolc
    892 
    893886# Tell versions [3.59,3.63) of GNU make to not export all variables.
    894887# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/ADOL-C/src/drivers/Makefile.am

    r106 r171  
    1414AM_CXXFLAGS               = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    1515AM_LDFLAGS                = -no-undefined
    16 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/src
     16AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    1717
    1818MAINTAINERCLEANFILES      = Makefile.in *~ *.orig
    1919
    20 INCLUDES                  = -I$(top_builddir)
     20INCLUDES                  = -I$(top_builddir)/ADOL-C
    2121
    2222noinst_LTLIBRARIES        = libdrivers.la
  • trunk/ADOL-C/src/drivers/Makefile.in

    r128 r171  
    237237AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    238238AM_LDFLAGS = -no-undefined
    239 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
     239AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    240240MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    241 INCLUDES = -I$(top_builddir)
     241INCLUDES = -I$(top_builddir)/ADOL-C
    242242noinst_LTLIBRARIES = libdrivers.la
    243243libdriversincludedir = $(pkgincludedir)/drivers
  • trunk/ADOL-C/src/sparse/Makefile.am

    r161 r171  
    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/src  @COLPACK_CFLAGS@
     15AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    1616
    17 INCLUDES                 = -I$(top_builddir)
     17INCLUDES                 = -I$(top_builddir)/ADOL-C
    1818
    1919MAINTAINERCLEANFILES     = Makefile.in *~ *.orig
  • trunk/ADOL-C/src/sparse/Makefile.in

    r161 r171  
    235235AM_CFLAGS = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    236236AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    237 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    238 INCLUDES = -I$(top_builddir)
     237AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
     238INCLUDES = -I$(top_builddir)/ADOL-C
    239239MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    240240noinst_LTLIBRARIES = libsparse.la
  • trunk/ADOL-C/src/tapedoc/Makefile.am

    r106 r171  
    1515AM_CXXFLAGS               = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    1616AM_LDFLAGS                = -no-undefined
    17 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/src
     17AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    1818
    1919MAINTAINERCLEANFILES      = Makefile.in *~ *.orig
    2020
    21 INCLUDES                  = -I$(top_builddir)
     21INCLUDES                  = -I$(top_builddir)/ADOL-C
    2222
    2323noinst_LTLIBRARIES        = libtapedoc.la
  • trunk/ADOL-C/src/tapedoc/Makefile.in

    r128 r171  
    236236AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    237237AM_LDFLAGS = -no-undefined
    238 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
     238AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    239239MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    240 INCLUDES = -I$(top_builddir)
     240INCLUDES = -I$(top_builddir)/ADOL-C
    241241noinst_LTLIBRARIES = libtapedoc.la
    242242libtapedocincludedir = $(pkgincludedir)/tapedoc
  • trunk/ADOL-C/test/Makefile.am

    r168 r171  
    1919fminmax_SOURCES         = fminmax.cpp
    2020
    21 INCLUDES                = -I$(top_builddir)/ADOL-C/src
     21INCLUDES                = -I$(top_builddir)/ADOL-C
    2222
    2323powexam_LDADD           = ../src/libadolc.la
  • trunk/ADOL-C/test/Makefile.in

    r169 r171  
    220220powexam_SOURCES = powexam.cpp
    221221fminmax_SOURCES = fminmax.cpp
    222 INCLUDES = -I$(top_builddir)/ADOL-C/src
     222INCLUDES = -I$(top_builddir)/ADOL-C
    223223powexam_LDADD = ../src/libadolc.la
    224224speelpenning_LDADD = ../src/libadolc.la
Note: See TracChangeset for help on using the changeset viewer.