Changeset 2056


Ignore:
Timestamp:
Sep 9, 2009, 5:29:39 PM (11 years ago)
Author:
Peter
Message:

yathello: using dir m4, and using YAT_LDFLAGS and YAT_LIBS rather than YAT_LA_FILE
yat-config: fixed syntax
maintainer-check:added a few echo to monitor the progress
fixes #560

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/svn_support.am

    r1998 r2056  
    2424maintainer-check:
    2525  rm -rf tmp-repo && \
    26   echo "svn export $(srcdir) tmp-repo" &&\
     26  echo "maintainer-check: see mc.log for progress" && \
     27  echo "svn export $(srcdir) tmp-repo" > $(abs_builddir)/mc.log && \
    2728  svn export $(srcdir) tmp-repo && \
    2829  (cd tmp-repo && \
     30    echo "bootstrap $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    2931   ./bootstrap && \
    3032   $(MKDIR_P) build_ && \
    3133   $(MKDIR_P) install_ && \
    3234   cd build_ && \
     35   echo "configure $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    3336   ../configure $(DISTCHECK_CONFIGURE_FLAGS) \
    3437      --prefix=$(abs_builddir)/tmp-repo/dummy_install_ && \
     38   echo "build $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    3539   $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ && \
     40   echo "install $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    3641   $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
    3742           install && \
     43   echo "check install $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    3844   $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
    3945           installcheck && \
     46   echo "build and test yathello" >> $(abs_builddir)/mc.log && \
    4047   (cd test && $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
    4148               yat_check_yat_test) && \
     49   echo "perform distcheck" >> $(abs_builddir)/mc.log && \
    4250   $(MAKE) $(AM_MAKEFLAGS) distcheck) && \
    4351  mv tmp-repo/build_/$(distdir).tar.gz . && \
     52  echo "done." >> $(abs_builddir)/mc.log && \
    4453  rm -rf tmp-repo
    4554
  • trunk/build_support/yat-config.in

    r2020 r2056  
    120120       if test "x$includedir" = "x/usr/include"; then
    121121         : # ignore standard include
    122        elif (test "$CXX"="g++" &&
    123              test "x$includedir"="x/usr/local/include"); then
     122       elif (test "$CXX" = "g++" &&
     123             test "x$includedir" = "x/usr/local/include"); then
    124124         : # ignore /usr/local/include if we use g++
    125125       else
  • trunk/test/create_yathello.sh.in

    r1808 r2056  
    2727rm -rf yathello
    2828@MKDIR_P@ yathello && cd yathello
     29@MKDIR_P@ m4
    2930cat > configure.ac <<EOF
    3031AC_INIT([hello],[1.0])
    3132AC_CONFIG_SRCDIR([hello.cc])
    3233AM_INIT_AUTOMAKE([foreign])
    33 AC_CONFIG_MACRO_DIR([.])
     34AC_CONFIG_MACRO_DIR([m4])
    3435AC_LANG(C++)
    3536AC_PROG_CXXCPP
     
    4243
    4344cat > Makefile.am <<EOF
    44 ACLOCAL_AMFLAGS = -I .
     45ACLOCAL_AMFLAGS = -I m4
    4546AM_CPPFLAGS = \$(YAT_CPPFLAGS)
    4647AM_CXXFLAGS = \$(YAT_CXXFLAGS)
    47 LDADD = \$(YAT_LA_FILE)
     48AM_LDFLAGS = \$(YAT_LDFLAGS)
     49LDADD = \$(YAT_LIBS)
    4850check_PROGRAMS = hello
    4951TESTS = hello
     
    6769EOF
    6870
    69 cp @abs_top_srcdir@/m4/yat.m4 .
     71cp @abs_top_srcdir@/m4/yat.m4 m4/.
Note: See TracChangeset for help on using the changeset viewer.