Correct referenced OpenSSL version now that 0.9.8m

[apache] / support / Makefile.in

diff --git a/support/Makefile.in b/support/Makefile.in
index c64375948f2f95e2bbb52f1930d697e010f6f8a7..3425ffe7a6e1421cd92e2006b62a172cc0d627ec 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -1,24 +1,32 @@
 DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
-       logresolve.pl phf_abuse_log.cgi split-logfile
+       logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
 
-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
+CLEAN_TARGETS = suexec
+
+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm fcgistarter
 TARGETS  = $(PROGRAMS)
 
-PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
-PROGRAM_DEPENDENCIES = \
-       $(top_builddir)/srclib/apr-util/libaprutil.la \
-       $(top_builddir)/srclib/apr/libapr.la
+PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+PROGRAM_DEPENDENCIES = 
 
 include $(top_builddir)/build/rules.mk
 
 install:
-       @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
-       @cp -p $(top_builddir)/server/httpd.exp $(libexecdir)
-       @cp -p apachectl $(sbindir)
-       chmod 755 $(sbindir)/apachectl
-       @if test -f $(builddir)/apxs; then \
-           cp -p apxs $(sbindir); \
-           chmod 755 $(sbindir)/apxs; \
+       @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+       @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+       @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+       @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+       @for i in apxs apachectl dbmmanage; do \
+           if test -f "$(builddir)/$$i"; then \
+               cp -p $$i $(DESTDIR)$(sbindir); \
+               chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+           fi ; \
+       done
+       @if test -f "$(builddir)/envvars-std"; then \
+           cp -p envvars-std $(DESTDIR)$(sbindir); \
+           if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+               cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+           fi ; \
        fi
 
 htpasswd_OBJECTS = htpasswd.lo
@@ -37,11 +45,31 @@ logresolve_OBJECTS = logresolve.lo
 logresolve: $(logresolve_OBJECTS)
        $(LINK) $(logresolve_LTFLAGS) $(logresolve_OBJECTS) $(PROGRAM_LDADD)
 
+htdbm_OBJECTS = htdbm.lo
+htdbm: $(htdbm_OBJECTS)
+       $(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD)
+
 ab_OBJECTS = ab.lo
+ab_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS) $(MATH_LIBS)
 ab: $(ab_OBJECTS)
-       $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD)
+
+checkgid_OBJECTS = checkgid.lo
+checkgid: $(checkgid_OBJECTS)
+       $(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD)
 
 suexec_OBJECTS = suexec.lo
 suexec: $(suexec_OBJECTS)
-       $(LINK) $(suexec_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) $(suexec_OBJECTS)
+
+htcacheclean_OBJECTS = htcacheclean.lo
+htcacheclean: $(htcacheclean_OBJECTS)
+       $(LINK) $(htcacheclean_LTFLAGS) $(htcacheclean_OBJECTS) $(PROGRAM_LDADD)
+
+httxt2dbm_OBJECTS = httxt2dbm.lo
+httxt2dbm: $(httxt2dbm_OBJECTS)
+       $(LINK) $(httxt2dbm_LTFLAGS) $(httxt2dbm_OBJECTS) $(PROGRAM_LDADD)
 
+fcgistarter_OBJECTS = fcgistarter.lo
+fcgistarter: $(fcgistarter_OBJECTS)
+       $(LINK) $(fcgistarter_LTFLAGS) $(fcgistarter_OBJECTS) $(PROGRAM_LDADD)