Changeset 161 for trunk/Makefile.am


Ignore:
Timestamp:
Sep 23, 2010 12:14:35 PM (11 years ago)
Author:
kulshres
Message:

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

  • 'master' of 'gitclone': (8 commits) Add missing files to dist Add a rpm spec file add some comments and add else cases to ifs typo fix more improvements in ColPack? checking adjust Makefile.am overall to not explicitly need COLPACK_LIBS refactor colpack searching fix in-tree Colpack location for seperated build

Details of the commits:
ommit f925eb1d39f53bf893280f872407e45b16901cd1
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Sep 23 17:58:41 2010 +0200

Add missing files to dist

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

commit 37d5799660bbb042f02518f22c4034a3541b5b26
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Sep 23 17:57:51 2010 +0200

Add a rpm spec file

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

commit 25a41aac1c58214d3d35b4321d90a5fbfb1d2a5d
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Sep 16 15:09:04 2010 +0200

add some comments and add else cases to ifs

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

commit 1fc5a86ce4340692d0e486b6df2a41af5d138e2b
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Sep 16 14:52:20 2010 +0200

typo fix

it's COLPACK_LIBDIR not COLPACK_DIR

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

commit f8eb90f4962914ccf665617e1a1a7f8d07c066d4
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Sep 16 14:42:15 2010 +0200

more improvements in ColPack? checking

check for the header file too and then test link a C++ program
use readlink to find the real paths for the includedir and libdir
remove the old .tmp from libdir, it may contain junk.
use $AR instead of ar, we may be cross compiling.

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

commit 4db5d1eeb1925f996f244184683c6c649b1262fe
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Sep 15 18:53:00 2010 +0200

adjust Makefile.am overall to not explicitly need COLPACK_LIBS

in case it is dynamically linked to libadolc.so this information
will be forwarded to the executable automatically too. in the
static linking case libadolc.{so,a} already contain everything

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

commit 2c2a4a433c6716db317b1883e9bd568a267cd7e4
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Sep 15 16:38:16 2010 +0200

refactor colpack searching

link with ColPack? statically if ColPack? resides inside
the source tree.

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

commit b950c231857d9fcfcd3f70e1253cc11b9e2d6f5c
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Sep 15 16:02:29 2010 +0200

fix in-tree Colpack location for seperated build

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r127 r161  
    1313AUTOMAKE_OPTIONS     = foreign
    1414
    15 EXTRA_DIST           = TODO BUGS update_versions.sh \
     15EXTRA_DIST           = TODO BUGS LICENSE update_versions.sh \
    1616                       ADOL-C/doc/version.tex.in ADOL-C/doc/version.tex \
     17                       ADOL-C/doc/adolc-manual.pdf ADOL-C/doc/adolc-manual.ps \
     18                       ADOL-C/doc/adolc-manual.tex ADOL-C/doc/short_ref.pdf \
     19                       ADOL-C/doc/short_ref.ps ADOL-C/doc/short_ref.tex \
     20                       ADOL-C/doc/multiplexed.pdf ADOL-C/doc/multiplexed.eps \
     21                       ADOL-C/doc/tapeadv.pdf ADOL-C/doc/tapeadv.eps \
     22                       ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
     23                       ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
    1724                       autoconf/shave.in autoconf/shave-libtool.in \
    1825                       autoconf/dolt.m4 autoconf/shave.m4 \
     
    2532                       windows/vcredist_x86.exe windows/x64/vcredist_x64.exe \
    2633                       windows/installer.sh \
     34                       adolc.spec.in adolc.spec \
     35                       update_versions.sh \
    2736                       ThirdParty/ColPack/ColPack.vcxproj \
    2837                       ThirdParty/ColPack/colpack_vcxcompile.patch \
Note: See TracChangeset for help on using the changeset viewer.