Changeset 354 for trunk/ADOL-C/include


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/include
Files:
6 added
4 copied
25 moved

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.