Changeset 171 for trunk/ADOL-C/src/Makefile.am

Timestamp:

Oct 4, 2010 9:57:19 AM (10 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@…>

File:

• trunk/ADOL-C/src/Makefile.am (modified) (2 diffs)

trunk/ADOL-C/src/Makefile.am

@@ -19 +19 @@
 endif
 
-AM_CPPFLAGS          = -I$(top_srcdir) 
+AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C 
 
-INCLUDES             = -I$(top_builddir)
+INCLUDES             = -I$(top_builddir)/ADOL-C
 
 if SPARSE
@@ -46 +46 @@
 libadolc_la_LDFLAGS  = -version-info 2:1:1 -no-undefined
 
-BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
-
-$(top_builddir)/ADOL-C/src/adolc/adolc.h:
-        $(LN_S) $(top_srcdir)/ADOL-C/src adolc
-
 if SPARSE
 libadolc_la_SOURCES  = adalloc.c malloc.c adouble.cpp \
                        convolut.c fortutils.c \
                        interfaces.cpp interfacesf.c \
-                       taping.c tape_handling.cpp \
+                       taping_p.h taping.c tape_handling.cpp \
                        zos_forward.c fos_forward.c fov_forward.c \
                        hos_forward.c hov_forward.c hov_wk_forward.c \