From 9f5e2d64f6c7ca3dc95b65a4bf75a409356ba5ae Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Sun, 4 Mar 2012 14:34:22 +0200 Subject: [PATCH] antimake: refresh demos --- mk/temos/expected/antimake6.txt | 21 +++++++++++---------- mk/temos/expected/libusual1.txt | 2 +- mk/temos/expected/libusual2.txt | 2 +- mk/temos/expected/libusual3.txt | 2 +- mk/temos/expected/libusual4.txt | 2 +- mk/temos/expected/libusual5.txt | 2 +- mk/temos/expected/libusual6.txt | 2 +- mk/temos/src/antimake6.temo | 13 +++++++------ 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/mk/temos/expected/antimake6.txt b/mk/temos/expected/antimake6.txt index f0a1b5d..8a8d93a 100644 --- 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 2959397..dab6feb 100644 --- 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 081ce1c..1ec68e3 100644 --- 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 4ec3d59..1a90aaa 100644 --- 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 bb279da..4841e29 100644 --- 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 13ea708..8d5bc72 100644 --- 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 7e08c0a..a9c905e 100644 --- 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 aee99bd..39e0ef6 100644 --- 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 -- 2.39.5