Changeset 2056

Timestamp:

Sep 9, 2009, 5:29:39 PM (14 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:

• build_support/svn_support.am (modified) (1 diff)
• build_support/yat-config.in (modified) (1 diff)
• test/create_yathello.sh.in (modified) (3 diffs)

trunk/build_support/svn_support.am

@@ -24 +24 @@
 maintainer-check:
   rm -rf tmp-repo && \
-  echo "svn export $(srcdir) tmp-repo" &&\
+  echo "maintainer-check: see mc.log for progress" && \
+  echo "svn export $(srcdir) tmp-repo" > $(abs_builddir)/mc.log && \
   svn export $(srcdir) tmp-repo && \
   (cd tmp-repo && \
+    echo "bootstrap $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    ./bootstrap && \
    $(MKDIR_P) build_ && \
    $(MKDIR_P) install_ && \
    cd build_ && \
+   echo "configure $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    ../configure $(DISTCHECK_CONFIGURE_FLAGS) \
       --prefix=$(abs_builddir)/tmp-repo/dummy_install_ && \
+   echo "build $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ && \
+   echo "install $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
            install && \
+   echo "check install $(PACKAGE_STRING)" >> $(abs_builddir)/mc.log && \
    $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
            installcheck && \
+   echo "build and test yathello" >> $(abs_builddir)/mc.log && \
    (cd test && $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
                yat_check_yat_test) && \
+   echo "perform distcheck" >> $(abs_builddir)/mc.log && \
    $(MAKE) $(AM_MAKEFLAGS) distcheck) && \
   mv tmp-repo/build_/$(distdir).tar.gz . && \
+  echo "done." >> $(abs_builddir)/mc.log && \
   rm -rf tmp-repo
 

trunk/build_support/yat-config.in

@@ -120 +120 @@
        if test "x$includedir" = "x/usr/include"; then
          : # ignore standard include
-       elif (test "$CXX"="g++" && 
-             test "x$includedir"="x/usr/local/include"); then
+       elif (test "$CXX" = "g++" && 
+             test "x$includedir" = "x/usr/local/include"); then
          : # ignore /usr/local/include if we use g++
        else

trunk/test/create_yathello.sh.in

@@ -27 +27 @@
 rm -rf yathello
 @MKDIR_P@ yathello && cd yathello
+@MKDIR_P@ m4
 cat > configure.ac <<EOF
 AC_INIT([hello],[1.0])
 AC_CONFIG_SRCDIR([hello.cc])
 AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_MACRO_DIR([.])
+AC_CONFIG_MACRO_DIR([m4])
 AC_LANG(C++)
 AC_PROG_CXXCPP
@@ -42 +43 @@
 
 cat > Makefile.am <<EOF
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = \$(YAT_CPPFLAGS)
 AM_CXXFLAGS = \$(YAT_CXXFLAGS)
-LDADD = \$(YAT_LA_FILE)
+AM_LDFLAGS = \$(YAT_LDFLAGS)
+LDADD = \$(YAT_LIBS)
 check_PROGRAMS = hello
 TESTS = hello
@@ -67 +69 @@
 EOF
 
-cp @abs_top_srcdir@/m4/yat.m4 .
+cp @abs_top_srcdir@/m4/yat.m4 m4/.