Ignore:
Timestamp:
Jun 8, 2012, 12:22:47 AM (11 years ago)
Author:
Peter
Message:

refs #703 using a non-recursive Makefile. Old Makefile.am are kept but
rather than being source for sub-Makefiles they are included into
topdir Makefile.am. This implies Make rules must be modified to work
from topdir. A temporary code snippet will remove old Makefiles and
Makefile.ins at configure time. This code will be removed in a week or
so and is mainly there for autobuilds and prepare for future
sub-Makefiles (that will have a all: rule in sub-directories.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/Makefile.am

    r2605 r2739  
    2020# along with yat. If not, see <http://www.gnu.org/licenses/>.
    2121
    22 noinst_SCRIPTS = tag_and_release.sh
    23 bin_SCRIPTS=for_installation/yat-config
     22noinst_SCRIPTS = build_support/tag_and_release.sh
     23bin_SCRIPTS = build_support/for_installation/yat-config
    2424
    2525pkgconfigexecdir = $(libdir)/pkgconfig
    26 pkgconfigexec_DATA= yat.pc
     26pkgconfigexec_DATA= build_support/yat.pc
    2727
    28 CLEANFILES = yat.pc yat-config for_installation/yat-config
     28CLEANFILES += build_support/yat.pc build_support/yat-config
     29CLEANFILES += build_support/for_installation/yat-config
    2930
    30 EXTRA_DIST =  yat-config.in yat.pc.in
     31EXTRA_DIST +=  build_support/yat-config.in build_support/yat.pc.in
    3132
    3233edit = $(SED) \
     
    6263  -e 's|@boost_version[@]|$(boost_version)|g'
    6364
    64 yat-config: Makefile $(srcdir)/yat-config.in
     65build_support/yat-config: Makefile $(srcdir)/build_support/yat-config.in
    6566  @rm -f $@ $@.tmp
    6667  @echo "#! $(SHELL)" > $@.tmp
     
    7273  @echo creating $@
    7374
    74 for_installation/yat-config: yat-config
     75build_support/for_installation/yat-config: build_support/yat-config
    7576  @rm -f $@ $@-t \
    76   && $(MKDIR_P) for_installation \
    77   && sed 's|installed=no|installed=yes|g' < yat-config > $@-t \
     77  && $(MKDIR_P) build_support/for_installation \
     78  && sed 's|installed=no|installed=yes|g' < build_support/yat-config > $@-t \
    7879  && mv $@-t $@ && echo creating $@
    7980
    80 yat.pc: $(srcdir)/yat.pc.in gen_yat_pc.sh Makefile
    81   @rm -f $@ $@-t \
     81build_support/yat.pc: $(srcdir)/build_support/yat.pc.in build_support/gen_yat_pc.sh Makefile
     82  rm -f $@ $@-t \
     83  && cd build_support \
    8284  && $(SHELL) gen_yat_pc.sh --prefix="$(prefix)" \
    8385  --exec-prefix="$(exec_prefix)" \
    8486  --libdir="$(libdir)" --includedir="$(includedir)" \
    85   --input="$(srcdir)/yat.pc.in" > $@-t && mv $@-t $@ && echo creating $@
     87  --input="../$(srcdir)/build_support/yat.pc.in" > yat.pc-t \
     88  && mv yat.pc-t yat.pc && echo creating $@
Note: See TracChangeset for help on using the changeset viewer.