Commit Graph

27 Commits

Author SHA1 Message Date
Alex Elder a241a16214 xfstests: some refinements on "make depend"
Make it so "make depend" is a generic target, like "make clean".

Each Makefile has a "depend" target that indicates whether making
dependencies means creating ".dep" or creating ".ltdep" (or, I
suppose, both, though none do that right now).  Both files get
created even if there are no CFILES to scan (to ensure the target
up-to-date).  The "default" target now depends on "depend" (there is
no "ltdepend" any more).

Remove the "depend" and "ltdepend" definitions from the "buildrules"
file; only the actual generated files (".dep" and ".ltdep") remain
as generic targets.  The "depend' target is still defined as phony.

Do a shell trick when expanding the value of CFILES, to avoid a
problem that occurs if it is created by "make" by concatentating two
empty strings.  The problem was that in that case CFILES will
contain a space, and that wasn't getting treated as empty as
desired.

Make the rule for tool/lib dependencies more generic, to reflect the
general desire that "lib" subdirectories need to be built before
things in the "tool" subdirectories.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
2011-03-11 06:45:19 -06:00
Alex Elder 6249f4ae8d xfstests: a few fixes to Makefile
Change the top-level Makefile, to make it clearer just what makes
what, and what depends on what:
- Separate the rules for "configure" and "include/builddefs" into
  two parts, each of which generate one of the files
- Get rid of the rule for include/config.h, and group it with the
  one for include/builddefs (the same command creates both files)

Having done this, we find that having both "include/builddefs" and
"include/config.h" as dependencies for the default target results in
a parallel invocation of "make" spawning two concurrent attempts to
do the configure step--and that doesn't work.

Creating one of those two will result in the other getting created,
so just list one of them as a dependency for the default rule.

A couple of other small fixes:
- Get rid of the "new", "remake" and "check" dependencies for the
  default rule, which serv no purpose
- Use the $(Q) convention in a few missed spots
- Stop a DMAPI-only comment from getting echoed on default build
- Delete the "

This updated version pulls in the content of a patch previously
posted separately to fix the problem with parallel builds.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
2011-03-09 14:52:45 -06:00
Alex Elder 2294e28218 xfstests: fix depend targets
There's no need to re-make the dependency files all the time.  Make
it so the "depend" target rebuilds the ".dep" file only if necessary.
Also change the name of the dependency file created for "ltdepend"
to be ".ltdep".

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
2010-08-03 09:23:00 -05:00
Dave Chinner 50f99d08ef xfstests: Clean up build output
We don't need to see every compiler command line for every file that
is compiled. This makes it hard to see warnings and errors during
compile. For progress notification, we really only need to see the
directory/file being operated on.

Turn down the verbosity of output by suppressing various make output
and provide better overall visibility of which directory is being
operated on, what the operation is and what is being done to the
files by the build/clean process.

This patch only addresses the top level makefile and build rules; it
does not clean up the subdirectories - these will be addressed by a
followup patch. It also does not touch the dmapi section of the
xfstests build system.

The old style verbose builds can still be run via "make V=1 ..."

Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
2010-01-20 10:26:01 +11:00
Eric Sandeen fed5346d92 commit bd53c922 added src/aio-dio-regress to the top-level
Makefile so that it would get caught on make install, but
doing this unconditionally means that we tried to build that
subdir even if libaio headers weren't found.

Fix this up to do a properly chained make install through
the subdirs...

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
2009-12-03 10:30:11 -06:00
Izidor Matusov bd53c9223b Install src/aio-dio-regress tests on "make install"
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@infradead.org>
2009-11-09 15:26:36 -06:00
Eric Sandeen 8c5325e126 Create xfstests install target.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
2009-01-02 22:28:37 -06:00
Eric Sandeen 305b6f33d7 fix up xfs-cmds build after the parallel-fest
My big parallel build patch lost the "make configure" target.
This broke Makepkgs...

Now, IMHO, running configure from make is a little bass-ackwards;
I'd probably prefer to have Makepkgs explicitly run:

 autoconf; configure --myoptions; make

but for now, this adds back in a workable "make configure" target.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
2008-12-30 23:21:24 +01:00
Barry Naujok 4877dfbf86 Allow parallel builds of the xfstests package
Merge of master-melb:xfs-cmds:32515a by kenmcd.

  Allow parallel builds of the xfstests package
2008-11-21 02:44:04 +00:00
Barry Naujok 2ccda108c4 xfstests: check for dmapi headers
Merge of master-melb:xfs-cmds:32507a by kenmcd.

  xfstests: check for dmapi headers
2008-11-20 14:22:49 +00:00
Tim Shimmin 946e45ce9f automake doesn't have "default" target but uses "all" target instead
Merge of master-melb:xfs-cmds:31021a by kenmcd.

  automake doesn't have "default" target but uses "all" target instead
2008-05-05 06:24:38 +00:00
Tim Shimmin bf09e8cc4d fixup xfstests Makefile sinch dmapi changes
Merge of master-melb:xfs-cmds:28442a by kenmcd.

  fixup xfstests Makefile sinch dmapi changes
2007-04-20 03:57:28 +00:00
Allan Randall 15b13aea06 fixed Makefile for building dmapi tests
Merge of master-melb:xfs-cmds:27778a by kenmcd.

  fixed Makefile for building dmapi tests
2006-12-20 02:51:57 +00:00
Allan Randall ab526a6352 Integrate existing dmapi qa tests into xfs qa infrastructure
Merge of master-melb:xfs-cmds:27764a by kenmcd.

  Dmapi get/set_dmattr
2006-12-19 02:55:36 +00:00
Tim Shimmin 64fe5df9de xfstests changes for lib64 stuff
Merge of master-melb:xfs-cmds:25826a by kenmcd.

  call configure with libexecdir and lib64 enabling
2006-04-24 15:31:12 +00:00
Tim Shimmin e11d0477a1 fix lib64 installs
Merge of master-melb:xfs-cmds:25657a by kenmcd.
2006-04-04 06:06:00 +00:00
Nathan Scott c15833f024 Update copyright annotations and license boilerplates to correspond with SGI Legals preferences.
Merge of master-melb:xfs-cmds:24326a by kenmcd.
2005-11-09 02:48:08 +00:00
ptools cb6beb9759 Fixed merge problems 2004-06-15 07:32:36 +00:00
fsgqa 29358bdaac xfstests updates - build issue, and loop driver isnt needed in test 072 2003-07-08 05:05:43 +00:00
Nathan Scott 332ee29d1a xfstests updates - rework build to be like other xfs packages, revive some old fs test tools and reenable xfs extensions, move ltp code into a separate subdir to help keeping in sync with real ltp project (hopefully) 2003-07-07 06:36:46 +00:00
Nathan Scott 5e98630b01 Do a better job of cleaning up after autoconf. 2002-09-03 01:17:30 +00:00
Eric Sandeen 3ef12e3824 Update copyright dates (again) 2002-06-04 23:07:56 +00:00
Eric Sandeen bc4eb461ae Undoes mod: xfs-cmds:slinx:120772a
Undo xfs-cmds:slinx:120772a, inadvertently whacked a previous mod.
2002-06-04 22:53:09 +00:00
Eric Sandeen 8ce73f8626 Update copyright dates 2002-06-04 17:58:21 +00:00
Nathan Scott 4ce620c5c8 remove misc & man directories, these have found new homes. 2001-03-21 01:52:40 +00:00