From eafe970d035da3452ef6787c20551f53141f81e3 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Mon, 13 May 2002 07:45:16 +0000 Subject: [PATCH] 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 --- Makefile.in | 5 ++--- support/Makefile.in | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 935bd2e3b4..be40dc4bf7 100644 --- 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 02a0cf90fe..09c95a8a02 100644 --- 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 -- 2.40.0