dejagnu
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

PATCH: flatten Makefile tree


From: Ben Elliston
Subject: PATCH: flatten Makefile tree
Date: Tue, 20 Dec 2005 22:42:45 +1100
User-agent: Mutt/1.2.5.1i

This patch substantially flattens the tree of Makefile.am's we have.
All of the testsuite Makefile.ams have now been collected in the
top-level Makefile.am.

In addition, I changed the configury so that the examples are still
configured, but not built.  All that is needed is for the user to cd
into the appropriate example directory and run `make' and/or `make
check'.

If there are no objections, I'll check this in tomorrow.

Ben

2005-12-20  Ben Elliston  <address@hidden>
 
        * Makefile.am (SUBDIRS): Remove testsuite, example.
        (EXTRA_DIST): Add $(TESTSUITE_FILES).
        (TESTSUITE_FILES): New.
        (RUNTEST, RUNTESTDEFAULTFLAGS): New.
        (AM_CXXFLAGS): Set.
        (check_PROGRAMS): New.
        (unit_SOURCES): New.
        * Makefile.in: Regenerate.
        * configure.ac (AC_OUTPUT): Don't output example/Makefile,
        testsuite/Makefile or testsuite/libdejagnu/Makefile.
        * configure: Regenerate.
        * testsuite/Makefile.am: Remove.
        * testsuite/Makefile.in: Likewise.
        * testsuite/libdejagnu/Makefile.am: Likewise.
        * testsuite/libdejagnu/Makefile.in: Likewise.

Index: Makefile.am
===================================================================
RCS file: /sources/dejagnu/dejagnu/Makefile.am,v
retrieving revision 1.26
diff -u -r1.26 Makefile.am
--- Makefile.am 20 Dec 2005 11:05:49 -0000      1.26
+++ Makefile.am 20 Dec 2005 11:36:22 -0000
@@ -1,13 +1,14 @@
 # Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = dejagnu
-SUBDIRS = doc testsuite example
+SUBDIRS = doc
 
 EXTRA_DIST = ChangeLog.0 MAINTAINERS runtest site.tmpl \
        $(pkgdata_DATA) $(pkgdata_SCRIPTS) \
        $(config_DATA) $(config_SCRIPTS) \
        $(baseboard_DATA) $(baseboard_SCRIPTS) \
        $(PACKAGING_METAFILES)
+       $(TESTSUITE_FILES)
 
 bin_SCRIPTS = runtest
 include_HEADERS = dejagnu.h
@@ -166,6 +167,26 @@
 djlibexecdir = $(pkgdatadir)/libexec
 djlibexec_SCRIPTS = config.guess
 
+TESTSUITE_FILES = \
+       testsuite/runtest.all/topdir/subdir1/subsubdir1/subsubfile1 \
+       testsuite/runtest.all/topdir/subdir1/subfile1 \
+       testsuite/runtest.all/topdir/subdir1/subfile2 \
+       testsuite/runtest.all/topdir/subdir2/subfile2 \
+       testsuite/runtest.all/libs.exp \
+       testsuite/runtest.all/options.exp \
+       testsuite/runtest.all/remote.test \
+       testsuite/runtest.all/stats-sub.exp \
+       testsuite/runtest.all/stats.exp \
+       testsuite/runtest.all/target.test \
+       testsuite/runtest.all/utils.test \
+       testsuite/runtest.all/clone_output.test \
+       testsuite/runtest.all/config.test \
+       testsuite/runtest.all/default_procs.tcl \
+       testsuite/config/default.exp \
+       testsuite/lib/libsup.exp \
+       testsuite/lib/util-defs.exp \
+       testsuite/libdejagnu/tunit.exp
+
 PACKAGING_METAFILES = packaging/depot/dejagnu.psf \
        packaging/deb/site.exp packaging/deb/changelog packaging/deb/conffiles \
        packaging/deb/control packaging/deb/copyright packaging/deb/postinst \
@@ -214,3 +235,12 @@
          tar cf $$here/dejagnu-${VERSION}.hpux11.depot dejagnu; \
          gzip -9fv  $$here/dejagnu-${VERSION}.hpux11.depot; \
          rm -rf /tmp/dejagnu
+
+RUNTEST = `if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \
+    echo ${top_srcdir}/runtest$(EXEEXT); \
+  else echo "ERROR: runtest not found" ; exit 1; fi`
+
+RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $(srcdir)/testsuite 
RUNTEST=$(RUNTEST)
+AM_CXXFLAGS = -I$(top_srcdir) -g
+check_PROGRAMS = unit
+unit_SOURCES = testsuite/libdejagnu/unit.cc
Index: configure.ac
===================================================================
RCS file: /sources/dejagnu/dejagnu/configure.ac,v
retrieving revision 1.7
diff -u -r1.7 configure.ac
--- configure.ac        3 Apr 2004 06:05:30 -0000       1.7
+++ configure.ac        20 Dec 2005 11:36:27 -0000
@@ -37,10 +37,4 @@
 
 AC_CONFIG_SUBDIRS([example/calc example/hello example/mathhelper])
 
-AC_OUTPUT([Makefile \
-       doc/Makefile \
-       doc/C/Makefile 
-       example/Makefile
-       testsuite/Makefile \
-        testsuite/libdejagnu/Makefile
-       ])
+AC_OUTPUT([Makefile doc/Makefile doc/C/Makefile])

Attachment: pgpjgA5TFTKpS.pgp
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]