*) top-level: build our base libraries (srclib) first since these (by

   definition) have no dependencies on anything else. this will also ensure
   that we have *.exports available for building server/

*) add the "test" SUBDIR back in so that it gets called for "make clean" and
   other types of make targets.

*) revise test/Makefile.in so that it does not build any test programs by
   default. add "make test" to build any/all test programs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87250 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 6110eeb8c7c021f110c1c8a240cb4b0e22ed23fa..36f7251beba2531194c84a76f2a73a0b02d1d6ce 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 
-SUBDIRS = modules os server srclib support
+SUBDIRS = srclib modules os server support test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c

diff --git a/test/Makefile.in b/test/Makefile.in
index bbdad4d1b37b8e2144e37c6a2f042fe502f77bb3..d34eb21712cfb249a468dd6150be60d3212d8b8e 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,6 +1,9 @@
 
+# no targets: we don't want to build anything by default. if you want the
+# test programs, then "make test"
+targets =
+
 PROGRAMS = dbu
-targets  = $(PROGRAMS)
 
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
 PROGRAM_DEPENDENCIES = ../srclib/apr-util/libaprutil.la \
@@ -8,6 +11,8 @@ PROGRAM_DEPENDENCIES = ../srclib/apr-util/libaprutil.la \
 
 include $(top_srcdir)/build/rules.mk
 
+test: $(PROGRAMS)
+
 dbu_OBJECTS = dbu.lo
 dbu: $(dbu_OBJECTS)
        $(LINK) $(dbu_OBJECTS) $(PROGRAM_LDADD)