From ee37e3e22012ecee8b3d1d243378ce19a03689e3 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 6 May 2001 16:22:20 +0000 Subject: [PATCH] * debian/rules: Install all the doc formats. * redhat/dejagnu.spec: Install all the doc formats. * Clean.tcl: Also nuke all Emacs backup files. * Makefile.am: Fix dependencies on tarball target. Add new target to build Debian packages. Add $(includedir) to install-data-local target so dejagnu.h gets installed in the right place. * doc/Makefile.am: Make all paths absolute, cause some versions of the db2* tools are braindead. * doc/overview.sgml: Update version numbers and log. * doc/user.sgml: Add mention of dejagnu.h header file. * doc/ref.sgml: Add chapter on dejagnu.h header file for unit testing. * config/default.exp: New file for default config settings for simple native testsuites that don't need anything else. * lib/dejagnu.exp: Add $text\r\n to all strings, to make sure we only get one line at a time. * testsuite/libdejagnu: New directory for dejagnu library test cases. * testsuite/libdejagnu/unit.cc: Test case for dejagnu.h. * testsuite/libdejagnu/tunit.exp: Test driver for dejagnu.h. * testsuite/libdejagnu/Makefile.am: New makefile to build the test case. * testsuite/libdejagnu/Makefile.in: Generated. * testsuite/Makefile.am: Add libdejagnu to SUBDIRS. Replace the site.exp rule, cause we don't want the $tool setting, so we run all the test suites. Don't pass the tool name for "make check". * configure.in: Add testsuite/libdejagnu/Makefile to AC_OUTPUT. --- .clean | 5 +- ChangeLog | 15 ++++ Clean.tcl | 3 +- Makefile.am | 28 +++++-- Makefile.in | 28 +++++-- configure | 176 +++++++++++++++++++++++++++++++++++---- debian/rules | 3 +- dejagnu.h | 5 +- doc/Makefile.am | 33 +++++--- doc/Makefile.in | 40 ++++++--- doc/ref.sgml | 139 +++++++++++++++++++++---------- doc/user.sgml | 6 +- example/Makefile.am | 2 +- example/Makefile.in | 5 +- example/calc/Makefile.am | 2 +- example/calc/Makefile.in | 57 +++++-------- redhat/dejagnu.spec | 4 +- runtest.exp | 11 ++- testsuite/libdejagnu/Makefile.am | 2 +- testsuite/libdejagnu/Makefile.in | 49 ++++------- 20 files changed, 427 insertions(+), 186 deletions(-) diff --git a/.clean b/.clean index 54da622..115bbd8 100644 --- a/.clean +++ b/.clean @@ -1,10 +1,8 @@ # this is a list of files to keep -.clean ChangeLog AUTHORS COPYING ChangeLog -Clean.tcl INSTALL Makefile.am Makefile.in @@ -20,7 +18,7 @@ config.sub configure configure.in contrib -debian +dejagnu.h doc example i960glue.c @@ -28,7 +26,6 @@ install-sh lib missing mkinstalldirs -redhat runtest runtest.exp site.tmpl diff --git a/ChangeLog b/ChangeLog index a753153..6c62b6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ +2001-05-06 Rob Savoye + + * debian/rules: Install all the doc formats. + * redhat/dejagnu.spec: Install all the doc formats. + * Clean.tcl: Also nuke all Emacs backup files. + * Makefile.am: Fix dependencies on tarball target. Add new target + to build Debian packages. Add $(includedir) to install-data-local + target so dejagnu.h gets installed in the right place. + 2001-05-03 Rob Savoye + * doc/Makefile.am: Make all paths absolute, cause some versions of + the db2* tools are braindead. + * doc/overview.sgml: Update version numbers and log. + * doc/user.sgml: Add mention of dejagnu.h header file. + * doc/ref.sgml: Add chapter on dejagnu.h header file for unit + testing. * config/default.exp: New file for default config settings for simple native testsuites that don't need anything else. * lib/dejagnu.exp: Add $text\r\n to all strings, to make sure we diff --git a/Clean.tcl b/Clean.tcl index a5366ad..97782f5 100755 --- a/Clean.tcl +++ b/Clean.tcl @@ -125,6 +125,7 @@ proc cleanfiles { directory } { append allfiles " [glob -nocomplain "$directory/core"]" append allfiles " [glob -nocomplain "$directory/CVS"]" append allfiles " [glob -nocomplain "$directory/RCS"]" + append allfiles " [glob -nocomplain "$directory/.\#*"]" } else { # read in the .clean file, line by line while { [gets $cleanfile cur_line]>=0 } { @@ -154,7 +155,7 @@ proc cleanfiles { directory } { # nuke the files if { [string length $allfiles] > 0 } { verbose "Removing \"$allfiles\" from $directory" - catch "exec rm -f $allfiles" + catch "exec rm -fr $allfiles" } else { verbose "Nothing to remove from $directory" 2 } diff --git a/Makefile.am b/Makefile.am index 8799b88..099d4d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ check-DEJAGNU: @echo "Do nothing here, cause we don't want to run the tests twice" # Set ourselves up to build a RedHat package -tarball: doc/overview/overview.html doc/overview.pdf doc/overview.ps +tarball: overview.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} cp -fpr $(srcdir) dejagnu-${VERSION} @echo "clean up stuff we don't want in the source file" @@ -50,7 +50,9 @@ snapshot: -rm -fr dejagnu-${DATE} cp -fpr $(srcdir) dejagnu-${DATE} @echo "clean up stuff we don't want in the source file" - (cd dejagnu-${DATE} ; $(srcdir)/Clean.tcl) + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + (cd dejagnu-${DATE} ; $${dir}/Clean.tcl); -mkdir -p doc/overview -cp -fr doc/overview dejagnu-${DATE}/doc/ -cp -fr doc/overview.ps dejagnu-${DATE}/doc/ @@ -65,14 +67,28 @@ rpm: tarball rpmspec cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/ rpm -ba /usr/src/redhat/SPECS/dejagnu.spec -overview.html install-doc doc html dvi ps pdf rtf: +deb: overview.html overview.ps overview.pdf + -rm -fr dejagnu-${VERSION} + cp -fpr $(srcdir) dejagnu-${VERSION} + @echo "clean up stuff we don't want in the source file" + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); + -mkdir -p doc/overview; + -cp -fr $(srcdir)/debian dejagnu-${VERSION}/; + -cp -fr doc/overview dejagnu-${VERSION}/doc/; + -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; + -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; + (cd dejagnu-${VERSION}; dpkg-buildpackage) + +overview.html overview.ps overview.pdf install-doc: cd doc && $(MAKE) $(FLAGS_TO_PASS) $@ # Automake sucks when it comes to building a distribution, so # we just copy the source tree onto of what Automake did, and # then we Clean it. Automake only includes the source files. # We want all the testsuites, data files, and html versions of the doc. -dist-hook: rpmspec overview.html +dist-hook: rpmspec overview.html overview.ps overview.pdf -rm -fr $(distdir) cp -fpr $(srcdir) $(distdir) (cd $(distdir) ; $(TCLSH) $(srcdir)/Clean.tcl) @@ -94,7 +110,7 @@ config_dest = $(DESTDIR)$(pkgdatadir)/config config_files = $(srcdir)/config/README $(srcdir)/config/*.exp install-data-local: - $(mkinstalldirs) $(lib_dest) + $(mkinstalldirs) $(lib_dest) $(includedir) for f in $(lib_files); do \ test ! -f "$$f" || $(INSTALL_DATA) $$f $(lib_dest); \ done @@ -125,7 +141,7 @@ uninstall-local: for f in $(baseboards_files); do \ test ! -f "$$f" || rm -f $(baseboards_dest)/`basename "$$f"`; \ done - rm -f $(baseboards_dest)/`basename dejagnu.h`; + rm -f $(includedir)/dejagnu.h; site.exp: Makefile @echo 'Making a new site.exp file...' diff --git a/Makefile.in b/Makefile.in index efadbf9..aef5058 100644 --- a/Makefile.in +++ b/Makefile.in @@ -433,7 +433,7 @@ check-DEJAGNU: @echo "Do nothing here, cause we don't want to run the tests twice" # Set ourselves up to build a RedHat package -tarball: doc/overview/overview.html doc/overview.pdf doc/overview.ps +tarball: overview.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} cp -fpr $(srcdir) dejagnu-${VERSION} @echo "clean up stuff we don't want in the source file" @@ -452,7 +452,9 @@ snapshot: -rm -fr dejagnu-${DATE} cp -fpr $(srcdir) dejagnu-${DATE} @echo "clean up stuff we don't want in the source file" - (cd dejagnu-${DATE} ; $(srcdir)/Clean.tcl) + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + (cd dejagnu-${DATE} ; $${dir}/Clean.tcl); -mkdir -p doc/overview -cp -fr doc/overview dejagnu-${DATE}/doc/ -cp -fr doc/overview.ps dejagnu-${DATE}/doc/ @@ -467,14 +469,28 @@ rpm: tarball rpmspec cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/ rpm -ba /usr/src/redhat/SPECS/dejagnu.spec -overview.html install-doc doc html dvi ps pdf rtf: +deb: overview.html overview.ps overview.pdf + -rm -fr dejagnu-${VERSION} + cp -fpr $(srcdir) dejagnu-${VERSION} + @echo "clean up stuff we don't want in the source file" + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); + -mkdir -p doc/overview; + -cp -fr $(srcdir)/debian dejagnu-${VERSION}/; + -cp -fr doc/overview dejagnu-${VERSION}/doc/; + -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; + -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; + (cd dejagnu-${VERSION}; dpkg-buildpackage) + +overview.html overview.ps overview.pdf install-doc: cd doc && $(MAKE) $(FLAGS_TO_PASS) $@ # Automake sucks when it comes to building a distribution, so # we just copy the source tree onto of what Automake did, and # then we Clean it. Automake only includes the source files. # We want all the testsuites, data files, and html versions of the doc. -dist-hook: rpmspec overview.html +dist-hook: rpmspec overview.html overview.ps overview.pdf -rm -fr $(distdir) cp -fpr $(srcdir) $(distdir) (cd $(distdir) ; $(TCLSH) $(srcdir)/Clean.tcl) @@ -483,7 +499,7 @@ dist-hook: rpmspec overview.html -cp -fr doc/overview.pdf $(distdir)/doc/ install-data-local: - $(mkinstalldirs) $(lib_dest) + $(mkinstalldirs) $(lib_dest) $(includedir) for f in $(lib_files); do \ test ! -f "$$f" || $(INSTALL_DATA) $$f $(lib_dest); \ done @@ -514,7 +530,7 @@ uninstall-local: for f in $(baseboards_files); do \ test ! -f "$$f" || rm -f $(baseboards_dest)/`basename "$$f"`; \ done - rm -f $(baseboards_dest)/`basename dejagnu.h`; + rm -f $(includedir)/dejagnu.h; site.exp: Makefile @echo 'Making a new site.exp file...' diff --git a/configure b/configure index bc33d01..755e157 100755 --- a/configure +++ b/configure @@ -700,7 +700,7 @@ fi PACKAGE=dejagnu -VERSION=1.4.0 +VERSION=1.4.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1055,6 +1055,149 @@ else fi fi +for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1064: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CXX" && break +done +test -n "$CXX" || CXX="gcc" + + +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1096: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +cat > conftest.$ac_ext << EOF + +#line 1107 "configure" +#include "confdefs.h" + +int main(){return(0);} +EOF +if { (eval echo configure:1112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +if test $ac_cv_prog_cxx_works = no; then + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:1138: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 +cross_compiling=$ac_cv_prog_cxx_cross + +echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +echo "configure:1143: checking whether we are using GNU C++" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes +else + ac_cv_prog_gxx=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +if test $ac_cv_prog_gxx = yes; then + GXX=yes +else + GXX= +fi + +ac_test_CXXFLAGS="${CXXFLAGS+set}" +ac_save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS= +echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +echo "configure:1171: checking whether ${CXX-g++} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1067,7 +1210,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1071: checking for a BSD compatible install" >&5 +echo "configure:1214: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1120,12 +1263,12 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1124: checking for Cygwin environment" >&5 +echo "configure:1267: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1153,19 +1296,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1157: checking for mingw32 environment" >&5 +echo "configure:1300: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1184,7 +1327,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1188: checking for executable suffix" >&5 +echo "configure:1331: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1194,7 +1337,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1218,7 +1361,7 @@ ac_exeext=$EXEEXT dirlist=".. ../../ ../../.. ../../../.. ../../../../.. ../../../../../.. ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." echo $ac_n "checking for docbook tools""... $ac_c" 1>&6 -echo "configure:1222: checking for docbook tools" >&5 +echo "configure:1365: checking for docbook tools" >&5 # Check whether --with-oskith or --without-oskith was given. if test "${with_oskith+set}" = set; then withval="$with_oskith" @@ -1264,7 +1407,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../ /../../../../../.." no_itcl=true echo $ac_n "checking for the tclsh program""... $ac_c" 1>&6 -echo "configure:1268: checking for the tclsh program" >&5 +echo "configure:1411: checking for the tclsh program" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -1309,7 +1452,7 @@ if test x"${ac_cv_path_tclsh}" = x ; then # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1313: checking for $ac_word" >&5 +echo "configure:1456: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1469,7 +1612,8 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile doc/Makefile testsuite/Makefile example/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile doc/Makefile testsuite/Makefile example/Makefile +testsuite/libdejagnu/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/debian/rules b/debian/rules index a141e13..bb929c6 100755 --- a/debian/rules +++ b/debian/rules @@ -65,7 +65,8 @@ binary-indep: checkroot build install -d debian/tmp/usr/doc/$(package)/html/stylesheet-images install -m 0644 doc/overview.rtf debian/tmp/usr/doc/$(package) install -m 0644 doc/overview.ps debian/tmp/usr/doc/$(package) - install -m 0644 doc/overview/*.html debian/tmp/usr/doc/$(package)/html + install -m 0644 doc/overview.pdf debian/tmp/usr/doc/$(package) + install -m 0644 doc/overview/*.html debian/tmp/usr/doc/$(package)/html/ install -m 0644 doc/overview/stylesheet-images/*.png debian/tmp/usr/doc/$(package)/html/stylesheet-images install -m 0644 debian/copyright debian/tmp/usr/doc/$(package) install -m 0644 debian/changelog debian/tmp/usr/doc/$(package)/changelog.Debian diff --git a/dejagnu.h b/dejagnu.h index 214d3ff..7d6c7f7 100644 --- a/dejagnu.h +++ b/dejagnu.h @@ -16,9 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* This is the include generated by configuring */ -#include - #ifndef __DEJAGNU_H__ #define __DEJAGNU_H__ @@ -188,6 +185,7 @@ class TestState { string s = c; unresolved (s); } + void totals (void) { cout << "\t#passed:\t\t" << passed << endl; cout << "\t#failed:\t\t" << failed << endl; @@ -197,6 +195,7 @@ class TestState { cout << "\t#unresolved:\t\t" << unresolve << endl; } + // This is so thjis class can be printed in an ostream. friend ostream & operator << (ostream &os, TestState& t) { return os << "\t" << outstate[t.laststate] << t.lastmsg ; } diff --git a/doc/Makefile.am b/doc/Makefile.am index 9aa89b3..2815347 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -7,33 +7,46 @@ man_MANS = runtest.1 # now, don't install the old texinfo document from version 1.3 # info_TEXINFOS = dejagnu.texi DOCBOOK = @DOCBOOK@ -TARGETS = overview.html overview.rtf overview.ps # overview.pdf overview.dvi +TARGETS = overview.html overview.ps overview.pdf overview.rtf docs: $(TARGETS) %.ps: %.dvi - dvips -o $@ $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + dvips -o $@ $*.dvi %.pdf: %.sgml - $(DOCBOOK)/db2pdf $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + $(DOCBOOK)/db2pdf $${dir}/$*.sgml %.dvi: %.sgml - $(DOCBOOK)/db2dvi $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + $(DOCBOOK)/db2dvi $${dir}/$*.sgml %.rtf: %.sgml - $(DOCBOOK)/db2rtf -o $@ $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + touch $@; \ + $(DOCBOOK)/db2rtf -o $@ $${dir}/$*.sgml %.gif: %.fig convert -transparency white $< $@ # .fig -> .gif %.epsi: %.eps - ps2epsi $< # .eps -> .epsi + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + ps2epsi $${dir}/$*.sgml # .eps -> .epsi %.eps: %.fig fig2dev -L ps -m 0.7 -p dummy $< > $@ # .fig -> .eps/portrait %.html: %.sgml - $(DOCBOOK)/db2html $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + $(DOCBOOK)/db2html $${dir}/$*.sgml # now for some extra dependencies that the automatic rules will not # catch: @@ -41,15 +54,15 @@ docs: $(TARGETS) html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml clean realclean distclean: - rm -fr $(TARGETS) DBHTOHTML* overview.junk overview.{aux,dvi,log} + rm -fr $(TARGETS) DBHTOHTML* overview.junk overview overview.{aux,dvi,log,ps,pdf,tex} install-doc: $(TARGETS) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html $(DESTDIR)$(pkgdatadir)/html/stylesheet-images $(INSTALL_DATA) overview/*.html $(DESTDIR)$(pkgdatadir)/html $(INSTALL_DATA) overview/stylesheet-images/*.png $(DESTDIR)$(pkgdatadir)/html/stylesheet-images - $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.ps + $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.rtf $(INSTALL_DATA) overview.ps $(DESTDIR)$(pkgdatadir)/dejagnu.ps $(INSTALL_DATA) overview.pdf $(DESTDIR)$(pkgdatadir)/dejagnu.pdf - $(INSTALL_DATA) runtest.1 $(mandir)/man1/ + $(INSTALL_DATA) $(srcdir)/runtest.1 $(mandir)/man1/ diff --git a/doc/Makefile.in b/doc/Makefile.in index a9a4def..82830a5 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -62,6 +62,7 @@ POST_UNINSTALL = : BOARDS = @BOARDS@ CC = @CC@ CONFIG = @CONFIG@ +CXX = @CXX@ EXEEXT = @EXEEXT@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -75,19 +76,19 @@ man_MANS = runtest.1 # now, don't install the old texinfo document from version 1.3 # info_TEXINFOS = dejagnu.texi DOCBOOK = @DOCBOOK@ -TARGETS = overview.html overview.rtf overview.ps # overview.pdf overview.dvi +TARGETS = overview.html overview.ps overview.pdf overview.rtf mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = man1dir = $(mandir)/man1 MANS = $(man_MANS) NROFF = nroff -DIST_COMMON = README Makefile.am Makefile.in configure configure.in +DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -154,7 +155,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -226,28 +227,41 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean docs: $(TARGETS) %.ps: %.dvi - dvips -o $@ $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + dvips -o $@ $*.dvi %.pdf: %.sgml - $(DOCBOOK)/db2pdf $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + $(DOCBOOK)/db2pdf $${dir}/$*.sgml %.dvi: %.sgml - $(DOCBOOK)/db2dvi $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + $(DOCBOOK)/db2dvi $${dir}/$*.sgml %.rtf: %.sgml - $(DOCBOOK)/db2rtf -o $@ $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + touch $@; \ + $(DOCBOOK)/db2rtf -o $@ $${dir}/$*.sgml %.gif: %.fig convert -transparency white $< $@ # .fig -> .gif %.epsi: %.eps - ps2epsi $< # .eps -> .epsi + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + ps2epsi $${dir}/$*.sgml # .eps -> .epsi %.eps: %.fig fig2dev -L ps -m 0.7 -p dummy $< > $@ # .fig -> .eps/portrait %.html: %.sgml - $(DOCBOOK)/db2html $< + src=$(srcdir); \ + dir=`(cd $${src}; pwd)`; \ + $(DOCBOOK)/db2html $${dir}/$*.sgml # now for some extra dependencies that the automatic rules will not # catch: @@ -255,16 +269,16 @@ docs: $(TARGETS) html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml clean realclean distclean: - rm -fr $(TARGETS) DBHTOHTML* overview.junk overview.{aux,dvi,log} + rm -fr $(TARGETS) DBHTOHTML* overview.junk overview overview.{aux,dvi,log,ps,pdf,tex} install-doc: $(TARGETS) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html $(DESTDIR)$(pkgdatadir)/html/stylesheet-images $(INSTALL_DATA) overview/*.html $(DESTDIR)$(pkgdatadir)/html $(INSTALL_DATA) overview/stylesheet-images/*.png $(DESTDIR)$(pkgdatadir)/html/stylesheet-images - $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.ps + $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.rtf $(INSTALL_DATA) overview.ps $(DESTDIR)$(pkgdatadir)/dejagnu.ps $(INSTALL_DATA) overview.pdf $(DESTDIR)$(pkgdatadir)/dejagnu.pdf - $(INSTALL_DATA) runtest.1 $(mandir)/man1/ + $(INSTALL_DATA) $(srcdir)/runtest.1 $(mandir)/man1/ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/ref.sgml b/doc/ref.sgml index f8f0ea7..a24ca13 100644 --- a/doc/ref.sgml +++ b/doc/ref.sgml @@ -4259,95 +4259,144 @@ - - Unit Testing + + Unit Testing API - - Unit Testing API - - For unit testing, you can use the dejagnu.h header file. - - + C Unit Testing API - For C code, there is a C API. - - - Pass Method + All of the functions that take a + msg parameter use a C char * that is + the message to be dislayed. There currently is no support for + variable length arguments. + + + + Pass Function This prints a message for a successful test - completion. - msg. This is a C char * string that - is the message to be dislayed. + completion. pass msg - + - - C++ Unit Testing API + + Fail Function + + This prints a message for an unsuccessful test + completion. + + + fail + msg + + + + + + Untested Function - + This prints a message for an test case that isn't run + for some technical reason. + + + untested + msg + + + + + Unresolved Function + + This prints a message for an test case that is run, + but there is no clear result. These output states require a + human to look over the results to determine what happened. + + + + unresolved + msg + + + + + Totals Function + + This prints out the total numbers of all the test + state outputs. + + + totals + + + + + + + + C++ Unit Testing API + + All of the methods that take a + msg parameter use a C char * + or STL string, that is the message to be + dislayed. There currently is no support for variable + length arguments. + + Pass Method This prints a message for a successful test - completion. - msg. This is a C char * string that - is the message to be dislayed. + completion. TestState::pass msg - - + + - + Fail Method This prints a message for an unsuccessful test - completion. - msg. This is a C char * string that - is the message to be dislayed. + completion. TestState::fail msg - - + + - + Untested Method This prints a message for an test case that isn't run - for some technical reason. - msg. This is a C char * string that - is the message to be dislayed. + for some technical reason. TestState::untested msg - - + + - + Unresolved Method This prints a message for an test case that is run, but there is no clear result. These output states require a human to look over the results to determine what happened. - msg. This is a C char * string that - is the message to be dislayed. + TestState::unresolved msg - - + + - + Totals Method This prints out the total numbers of all the test @@ -4357,11 +4406,9 @@ TestState::totals - - - + - + diff --git a/doc/user.sgml b/doc/user.sgml index 16f2160..3ba26ad 100644 --- a/doc/user.sgml +++ b/doc/user.sgml @@ -2374,10 +2374,10 @@ libraries. In this case, each file is linked with a test case in C or C++, and each function or class and method is tested in series, with the test case having to check private data or - global variable to see if the function or method worked. + global variables to see if the function or method worked. - This works particularly well for testing API and a level - where it is easier to debug them, than by need to trace through + This works particularly well for testing APIs and at level + where it is easier to debug them, than by needing to trace through the entire appication. Also if there is a specification for the API to be tested, the testcase can also function as a compliance test. diff --git a/example/Makefile.am b/example/Makefile.am index 15e59ee..eab209d 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -5,4 +5,4 @@ AUTOMAKE_OPTIONS = dejagnu SUBDIRS = calc check-recursive: - @echo "No check target in examples" \ No newline at end of file + @echo "No check target in examples" diff --git a/example/Makefile.in b/example/Makefile.in index 3ced4ef..a6c789f 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -60,6 +60,7 @@ POST_UNINSTALL = : BOARDS = @BOARDS@ CC = @CC@ CONFIG = @CONFIG@ +CXX = @CXX@ DOCBOOK = @DOCBOOK@ EXEEXT = @EXEEXT@ MAINT = @MAINT@ @@ -79,7 +80,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best EXPECT = expect RUNTEST = runtest @@ -195,7 +196,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/example/calc/Makefile.am b/example/calc/Makefile.am index 4767579..454b2b8 100644 --- a/example/calc/Makefile.am +++ b/example/calc/Makefile.am @@ -17,7 +17,7 @@ AUTOMAKE_OPTIONS = dejagnu -bin_PROGRAMS = calc +noinst_PROGRAMS = calc calc_SOURCES = calc.c RUNTESTDEFAULTFLAGS = --tool calc CALC=`pwd`/calc --srcdir $$srcdir/testsuite \ No newline at end of file diff --git a/example/calc/Makefile.in b/example/calc/Makefile.in index 8951ec0..44ad75f 100644 --- a/example/calc/Makefile.in +++ b/example/calc/Makefile.in @@ -81,7 +81,7 @@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = dejagnu -bin_PROGRAMS = calc +noinst_PROGRAMS = calc calc_SOURCES = calc.c RUNTESTDEFAULTFLAGS = --tool calc CALC=`pwd`/calc --srcdir $$srcdir/testsuite @@ -89,7 +89,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs CONFIG_HEADER = calc.h CONFIG_CLEAN_FILES = -PROGRAMS = $(bin_PROGRAMS) +PROGRAMS = $(noinst_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I. @@ -104,13 +104,14 @@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = ./stamp-h.in COPYING INSTALL Makefile.am Makefile.in \ -aclocal.m4 calc.h.in configure configure.in +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS aclocal.m4 calc.h.in configure \ +configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/calc.P EXPECT = expect @@ -164,30 +165,14 @@ distclean-hdr: maintainer-clean-hdr: -mostlyclean-binPROGRAMS: +mostlyclean-noinstPROGRAMS: -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -distclean-binPROGRAMS: +distclean-noinstPROGRAMS: -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done +maintainer-clean-noinstPROGRAMS: .s.o: $(COMPILE) -c $< @@ -284,7 +269,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -361,7 +346,7 @@ installcheck: installcheck-am all-recursive-am: calc.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -install-exec-am: install-binPROGRAMS +install-exec-am: install-exec: install-exec-am install-data-am: @@ -370,14 +355,13 @@ install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall: uninstall-am all-am: Makefile $(PROGRAMS) calc.h all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) mostlyclean-generic: @@ -389,25 +373,26 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ +mostlyclean-am: mostlyclean-hdr mostlyclean-noinstPROGRAMS \ mostlyclean-compile mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ +clean-am: clean-hdr clean-noinstPROGRAMS clean-compile clean-tags \ clean-depend clean-generic mostlyclean-am clean: clean-am -distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ +distclean-am: distclean-hdr distclean-noinstPROGRAMS distclean-compile \ distclean-tags distclean-depend distclean-generic \ clean-am distclean: distclean-am -rm -f config.status -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ maintainer-clean-depend maintainer-clean-generic \ distclean-am @@ -418,8 +403,8 @@ maintainer-clean: maintainer-clean-am -rm -f config.status .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ clean-tags maintainer-clean-tags distdir mostlyclean-depend \ diff --git a/redhat/dejagnu.spec b/redhat/dejagnu.spec index 2bdc486..15e5529 100644 --- a/redhat/dejagnu.spec +++ b/redhat/dejagnu.spec @@ -36,6 +36,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/include mkdir -p $RPM_BUILD_ROOT/usr/share/dejagnu mkdir -p $RPM_BUILD_ROOT/usr/doc/dejagnu-%{version} make prefix=$RPM_BUILD_ROOT/usr install +make prefix=$RPM_BUILD_ROOT/usr install-doc %clean rm -rf $RPM_BUILD_ROOT @@ -48,11 +49,12 @@ rm -rf $RPM_BUILD_ROOT # %config site.exp -%doc COPYING NEWS README AUTHORS INSTALL ChangeLog doc/overview +%doc COPYING NEWS README AUTHORS INSTALL ChangeLog doc/overview doc/overview.ps doc/overview.pdf %changelog * Wed Apr 11 2001 Rob Savoye - Added installing dejagnu.h. +- Install the ps and pdf formatted docs too * Wed Feb 21 2001 Rob Savoye - Fixed Requires line, and changed the URL to the new ftp site. diff --git a/runtest.exp b/runtest.exp index 28663d3..68a2117 100755 --- a/runtest.exp +++ b/runtest.exp @@ -1275,16 +1275,21 @@ proc load_config { args } { # proc load_tool_target_config { name } { - global target_os + global target_os libdir srcdir set found [load_config "${name}.exp" "${target_os}.exp" "default.exp" "unknown.exp"]; if { $found == 0 } { - send_error "ERROR: Couldn't find tool config file for $name.\n" + send_error "WARNING: Couldn't find tool config file for $name, using default.\n" + # If we can't load the tool init file, this must be a simple natively hosted + # test suite, so we use the default procs for Unix. + if { [search_and_load_file "library file" default.exp [list $libdir $libdir/config [file dirname [file dirname $srcdir]]/dejagnu/config $srcdir/config . [file dirname [file dirname [file dirname $srcdir]]]/dejagnu/config]] == 0 } { + send_error "ERROR: Couldn't find default tool init file.\n" + exit 1 + } } } - # # Find the file that describes the machine specified by board_name. # diff --git a/testsuite/libdejagnu/Makefile.am b/testsuite/libdejagnu/Makefile.am index e43c76d..6e926d1 100644 --- a/testsuite/libdejagnu/Makefile.am +++ b/testsuite/libdejagnu/Makefile.am @@ -4,7 +4,7 @@ CFLAGS = -I$(top_srcdir) -bin_PROGRAMS = unit +noinst_PROGRAMS = unit unit_SOURCES = unit.cc diff --git a/testsuite/libdejagnu/Makefile.in b/testsuite/libdejagnu/Makefile.in index 288c019..5ca370d 100644 --- a/testsuite/libdejagnu/Makefile.in +++ b/testsuite/libdejagnu/Makefile.in @@ -74,13 +74,13 @@ tclsh = @tclsh@ CFLAGS = -I$(top_srcdir) -bin_PROGRAMS = unit +noinst_PROGRAMS = unit unit_SOURCES = unit.cc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = -bin_PROGRAMS = unit$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) +noinst_PROGRAMS = unit$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) @@ -117,30 +117,14 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -mostlyclean-binPROGRAMS: +mostlyclean-noinstPROGRAMS: -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -distclean-binPROGRAMS: +distclean-noinstPROGRAMS: -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done +maintainer-clean-noinstPROGRAMS: .s.o: $(COMPILE) -c $< @@ -272,7 +256,7 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-exec-am: install-binPROGRAMS +install-exec-am: install-exec: install-exec-am install-data-am: @@ -281,14 +265,13 @@ install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall: uninstall-am all-am: Makefile $(PROGRAMS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) mostlyclean-generic: @@ -300,22 +283,22 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ +clean-am: clean-noinstPROGRAMS clean-compile clean-tags clean-depend \ clean-generic mostlyclean-am clean: clean-am -distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ +distclean-am: distclean-noinstPROGRAMS distclean-compile distclean-tags \ distclean-depend distclean-generic clean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-binPROGRAMS \ +maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ maintainer-clean-depend maintainer-clean-generic \ distclean-am @@ -324,8 +307,8 @@ maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -- 2.11.4.GIT