antimake: refresh demos

diff --git a/mk/temos/expected/antimake6.txt b/mk/temos/expected/antimake6.txt
index f0a1b5d8a4f47cea5995e53be712b525f1ca528b..8a8d93a9fc4d3f079074a6730c822d864df77eb0 100644 (file)
--- a/mk/temos/expected/antimake6.txt
+++ b/mk/temos/expected/antimake6.txt
@@ -176,14 +176,15 @@ EXTRA_DIST = Makefile.am
 noinst_LIBRARIES = libfunc4.a
 libfunc4_a_SOURCES = func4.c func4.h
 
-EXTRA_PROGRAMS = prog
+noinst_PROGRAMS = prog
 prog_SOURCES = prog.c
+prog_LDFLAGS = -L../sub -L../sub/esub -L.  -Lsub
 prog_LDADD = \
-       -L../sub -lfunc1 \
-       -L../sub/esub -lfunc2 \
+       -lfunc1 \
+       -lfunc2 \
        $(topdir)/sub/sub/libfunc3.a \
-       -L. -lfunc4 \
-       -Lsub -lfunc5 \
+       -lfunc4 \
+       -lfunc5 \
        esub/libfunc6.a
 
 prog_CFLAGS = -I../sub
@@ -244,13 +245,12 @@ $ make
      RANLIB   esub/esub/libfunc6.a
      CXX      cpptest.cpp
      CXXLD    cpptest
+     CC       esub/prog.c
+     CCLD     esub/prog
 $ ls
 Makefile     build.mk     config.log     configure     cpptest.cpp  libtool
 antimake.mk  build.mk.in   config.status  configure.ac esub         ltmain.sh
 autogen.sh   config.guess  config.sub    cpptest       install-sh   sub
-$ make esub/prog
-     CC       esub/prog.c
-     CCLD     esub/prog
 $ ./esub/prog
 esub/prog.c
 func1.c
@@ -368,11 +368,12 @@ $ make
      RANLIB   esub/esub/libfunc6.a
      CXX      ../actest-0.1/cpptest.cpp
      CXXLD    cpptest
+     CC       ../actest-0.1/esub/prog.c
+     CCLD     esub/prog
 $ ls
 Makefile  build.mk  config.log config.status  cpptest  esub  libtool  sub
 $ make esub/prog
-     CC       ../actest-0.1/esub/prog.c
-     CCLD     esub/prog
+make: `esub/prog' is up to date.
 $ ./esub/prog
 ../actest-0.1/esub/prog.c
 ../../actest-0.1/sub/func1.c

diff --git a/mk/temos/expected/libusual1.txt b/mk/temos/expected/libusual1.txt
index 2959397b66b7f97670953117946eb175ebaa4536..dab6febc002e6da41d343a3346fc1e23acc306e0 100644 (file)
--- a/mk/temos/expected/libusual1.txt
+++ b/mk/temos/expected/libusual1.txt
@@ -14,7 +14,7 @@ in your project.
 
 ---------------------------------
 $ git clone git://github.com/libusual/libusual.git lib
-Cloning into lib...
+Cloning into 'lib'...
 done.
 $ cd lib
 $ ./autogen.sh

diff --git a/mk/temos/expected/libusual2.txt b/mk/temos/expected/libusual2.txt
index 081ce1c51ff9543fecdb9f7fb2dab8c734b4016b..1ec68e3ac5a991da8d1e4c06781fdd71e934bf31 100644 (file)
--- a/mk/temos/expected/libusual2.txt
+++ b/mk/temos/expected/libusual2.txt
@@ -19,7 +19,7 @@ Here we configure libusual, but do not build it.
 
 ---------------------------------
 $ git clone git://github.com/libusual/libusual.git lib
-Cloning into lib...
+Cloning into 'lib'...
 done.
 $ cd lib
 $ ./autogen.sh

diff --git a/mk/temos/expected/libusual3.txt b/mk/temos/expected/libusual3.txt
index 4ec3d595743d3de2c6e3e6fd381c62f7d435c3bb..1a90aaaa2e3d1119368652bb334c69b58bcaca39 100644 (file)
--- a/mk/temos/expected/libusual3.txt
+++ b/mk/temos/expected/libusual3.txt
@@ -11,7 +11,7 @@ Here we close libusual repo, but do not configure nor build it.
 
 ---------------------------------
 $ git clone git://github.com/libusual/libusual.git lib
-Cloning into lib...
+Cloning into 'lib'...
 done.
 ---------------------------------
 

diff --git a/mk/temos/expected/libusual4.txt b/mk/temos/expected/libusual4.txt
index bb279dada8a52fc35c92002edaadb334f4be19da..4841e29bcd3162da09cd240ebd22dca891abcb99 100644 (file)
--- a/mk/temos/expected/libusual4.txt
+++ b/mk/temos/expected/libusual4.txt
@@ -9,7 +9,7 @@ Install libusual and link against it.
 
 ---------------------------------
 $ git clone git://github.com/libusual/libusual.git libusual
-Cloning into libusual...
+Cloning into 'libusual'...
 done.
 $ cd libusual
 $ ./autogen.sh

diff --git a/mk/temos/expected/libusual5.txt b/mk/temos/expected/libusual5.txt
index 13ea7085a7044b66f665b39a7e0e9908417f5d85..8d5bc72b4e03d5f84d29dc29cf4aaaf36756aa83 100644 (file)
--- a/mk/temos/expected/libusual5.txt
+++ b/mk/temos/expected/libusual5.txt
@@ -9,7 +9,7 @@ Install libusual and link against it.
 
 ---------------------------------
 $ git clone git://github.com/libusual/libusual.git libusual
-Cloning into libusual...
+Cloning into 'libusual'...
 done.
 $ cd libusual
 $ ./autogen.sh

diff --git a/mk/temos/expected/libusual6.txt b/mk/temos/expected/libusual6.txt
index 7e08c0adcc4684439419a7d0b6b8c10cda16b575..a9c905e385693e38dae9d683f67640d2b8268f44 100644 (file)
--- a/mk/temos/expected/libusual6.txt
+++ b/mk/temos/expected/libusual6.txt
@@ -9,7 +9,7 @@ Install libusual and link against it.
 
 ---------------------------------
 $ git clone git://github.com/libusual/libusual.git libusual
-Cloning into libusual...
+Cloning into 'libusual'...
 done.
 $ cd libusual
 $ ./autogen.sh

diff --git a/mk/temos/src/antimake6.temo b/mk/temos/src/antimake6.temo
index aee99bdafbbbd038027871ab348ebc1a3c47d9e4..39e0ef64ff005bec9f1f27c59dc36b9dbd00d23c 100644 (file)
--- a/mk/temos/src/antimake6.temo
+++ b/mk/temos/src/antimake6.temo
@@ -167,14 +167,15 @@ cat_file esub/Makefile.am <<"EOF"
        noinst_LIBRARIES = libfunc4.a
        libfunc4_a_SOURCES = func4.c func4.h
 
-       EXTRA_PROGRAMS = prog
+       noinst_PROGRAMS = prog
        prog_SOURCES = prog.c
+       prog_LDFLAGS = -L../sub -L../sub/esub -L.  -Lsub
        prog_LDADD = \
-               -L../sub -lfunc1 \
-               -L../sub/esub -lfunc2 \
+               -lfunc1 \
+               -lfunc2 \
                $(topdir)/sub/sub/libfunc3.a \
-               -L. -lfunc4 \
-               -Lsub -lfunc5 \
+               -lfunc4 \
+               -lfunc5 \
                esub/libfunc6.a
 
        prog_CFLAGS = -I../sub
@@ -204,9 +205,9 @@ EOF
 msg Build the project
 run sh ./autogen.sh
 runq ./configure
+#run make esub/prog
 run make
 run ls
-run make esub/prog
 run ./esub/prog
 
 msg Create distribution package