Add the support directory back into the build process.

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

diff --git a/Makefile.in b/Makefile.in
index 15e83bf4b72741417ce009478caf3e219aebdbe1..f3851570869c567e5028f7a13ed8db36d1d80fe3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@ top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-SUBDIRS = ap lib main modules os $(REGEX_DIR)
+SUBDIRS = ap lib main modules os support $(REGEX_DIR)
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c buildmark.c

diff --git a/configure.in b/configure.in
index 2c3eb0476f413d725cfd25676d61d0410cc5bd1f..b415bbd3b2da73756c948084806e770cec2798dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -169,7 +169,8 @@ AC_ARG_WITH(program-name,
   progname="httpd"] )
 
 APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
-            modules/Makefile os/Makefile)
+            modules/Makefile os/Makefile support/Makefile)
+
 APACHE_FAST_GENERATE
        
 dnl ## Build modules.c

diff --git a/support/Makefile.in b/support/Makefile.in
new file mode 100644 (file)
index 0000000..8460b56
--- /dev/null
+++ b/support/Makefile.in
@@ -0,0 +1,36 @@
+
+DEPTH     = ..
+top_srcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
+targets  = $(PROGRAMS)
+
+PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
+PROGRAM_DEPENDENCIES = ../lib/apr/$(LIBPRE)apr.a \
+       ../ap/libap.la
+
+include $(top_srcdir)/build/rules.mk
+include $(top_srcdir)/build/program.mk
+
+htpasswd_OBJECTS = htpasswd.lo
+htpasswd: $(htpasswd_OBJECTS)
+       $(LINK) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)
+
+htdigest_OBJECTS = htdigest.lo
+htdigest: $(htdigest_OBJECTS)
+       $(LINK) $(htdigest_OBJECTS) $(PROGRAM_LDADD)
+
+rotatelogs_OBJECTS = rotatelogs.lo
+rotatelogs: $(rotatelogs_OBJECTS)
+       $(LINK) $(rotatelogs_OBJECTS) $(PROGRAM_LDADD)
+
+logresolve_OBJECTS = logresolve.lo
+logresolve: $(logresolve_OBJECTS)
+       $(LINK) $(logresolve_OBJECTS) $(PROGRAM_LDADD)
+
+ab_OBJECTS = ab.lo
+ab: $(ab_OBJECTS)
+       $(LINK) $(ab_OBJECTS) $(PROGRAM_LDADD)
+