Commit eafe970d authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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
parent e6a32536

Makefile.in

+2 −3
Changes for Makefile.in: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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)

support/Makefile.in

+2 −4
Changes for support/Makefile.in: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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