From eb3fe5cf4fdf541eab9d7a68f8ef9dcf3e934ba6 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Thu, 27 Apr 2000 04:21:21 +0000 Subject: [PATCH] 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 --- Makefile.in | 2 +- configure.in | 3 ++- support/Makefile.in | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 support/Makefile.in diff --git a/Makefile.in b/Makefile.in index 15e83bf4b7..f385157086 100644 --- 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 2c3eb0476f..b415bbd3b2 100644 --- 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 index 0000000000..8460b563ce --- /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) + -- 2.50.1