Considering the overall goal of making APR and APR-util being used

out-of-tree, AP_LIBS can not be a PROGRAM_DEPENDENCY, but just a library
that we link against - therefore, it belongs under PROGRAM_LDADD.

(A program dependency implies that we can build it - that will not
always be the case with APR and APR-util.)

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

diff --git a/Makefile.in b/Makefile.in
index 935bd2e3b48a07c8e6670db299ce65ba08eab35c..be40dc4bf765c8152b8cc921dff4c7dfa66f5f00 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,13 +5,12 @@ CLEAN_SUBDIRS = test
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(HTTPD_LDFLAGS) \
-                       $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
+                       $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
 PROGRAM_DEPENDENCIES = \
   $(BUILTIN_LIBS) \
   $(MPM_LIB) \
   server/libmain.la \
-  os/$(OS_DIR)/libos.la \
-  $(AP_LIBS)
+  os/$(OS_DIR)/libos.la
 
 PROGRAMS        = $(PROGRAM_NAME)
 TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)

diff --git a/support/Makefile.in b/support/Makefile.in
index 02a0cf90fec4eca0806a8984ef5e1eab30c9d2ae..09c95a8a027165fd399ed21d38e7890367a5b4ad 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -4,10 +4,8 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
 PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm
 TARGETS  = $(PROGRAMS)
 
-PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
-PROGRAM_DEPENDENCIES = \
-       $(top_builddir)/srclib/apr-util/libaprutil.la \
-       $(top_builddir)/srclib/apr/libapr.la
+PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+PROGRAM_DEPENDENCIES = 
 
 include $(top_builddir)/build/rules.mk