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@…>

File:
1 edited

Legend:

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