Changeset 161 for trunk/Makefile.in


Ignore:
Timestamp:
Sep 23, 2010 12:14:35 PM (10 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.in

    r128 r161  
    3939subdir = .
    4040DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
    41         $(srcdir)/Makefile.in $(top_srcdir)/ADOL-C/doc/version.tex.in \
     41        $(srcdir)/Makefile.in $(srcdir)/adolc.spec.in \
     42        $(top_srcdir)/ADOL-C/doc/version.tex.in \
    4243        $(top_srcdir)/autoconf/shave-libtool.in \
    4344        $(top_srcdir)/autoconf/shave.in $(top_srcdir)/configure \
     
    6263        ADOL-C/doc/version.tex windows/sparse/config.h \
    6364        windows/nosparse/config.h windows/x64/sparse/config.h \
    64         windows/x64/nosparse/config.h
     65        windows/x64/nosparse/config.h adolc.spec
    6566CONFIG_CLEAN_VPATH_FILES =
    6667SOURCES =
     
    113114  done; \
    114115  reldir="$$dir2"
    115 DIST_ARCHIVES = $(distdir).tar.gz
     116DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
    116117GZIP_ENV = --best
    117118distuninstallcheck_listfiles = find . -type f -print
     
    257258top_srcdir = @top_srcdir@
    258259AUTOMAKE_OPTIONS = foreign
    259 EXTRA_DIST = TODO BUGS update_versions.sh \
     260EXTRA_DIST = TODO BUGS LICENSE update_versions.sh \
    260261                       ADOL-C/doc/version.tex.in ADOL-C/doc/version.tex \
     262                       ADOL-C/doc/adolc-manual.pdf ADOL-C/doc/adolc-manual.ps \
     263                       ADOL-C/doc/adolc-manual.tex ADOL-C/doc/short_ref.pdf \
     264                       ADOL-C/doc/short_ref.ps ADOL-C/doc/short_ref.tex \
     265                       ADOL-C/doc/multiplexed.pdf ADOL-C/doc/multiplexed.eps \
     266                       ADOL-C/doc/tapeadv.pdf ADOL-C/doc/tapeadv.eps \
     267                       ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
     268                       ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
    261269                       autoconf/shave.in autoconf/shave-libtool.in \
    262270                       autoconf/dolt.m4 autoconf/shave.m4 \
     
    269277                       windows/vcredist_x86.exe windows/x64/vcredist_x64.exe \
    270278                       windows/installer.sh \
     279                       adolc.spec.in adolc.spec \
     280                       update_versions.sh \
    271281                       ThirdParty/ColPack/ColPack.vcxproj \
    272282                       ThirdParty/ColPack/colpack_vcxcompile.patch \
     
    328338        cd $(top_builddir) && $(SHELL) ./config.status $@
    329339windows/x64/nosparse/config.h: $(top_builddir)/config.status $(top_srcdir)/windows/x64/nosparse/config.h.in
     340        cd $(top_builddir) && $(SHELL) ./config.status $@
     341adolc.spec: $(top_builddir)/config.status $(srcdir)/adolc.spec.in
    330342        cd $(top_builddir) && $(SHELL) ./config.status $@
    331343
     
    544556        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
    545557        $(am__remove_distdir)
    546 
    547558dist-bzip2: distdir
    548559        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
     
    572583dist dist-all: distdir
    573584        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
     585        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
    574586        $(am__remove_distdir)
    575587
Note: See TracChangeset for help on using the changeset viewer.