Cleanup: remove squid_DEPENDENCIES from Makefile

The bug *_DEPENDENCIES existed to solve no longer exists. Current auto*
toolchains can correctly generate the dependencies data based on *_LDADD
and *_SOURCES Makefile variables.

The incorrect definition of squid_DEPENDENCIES was also causing various
build issues and could result in crashes when conditionaly built features
were changed by users ./configure without a full re-bootstrap.

TODO: remove *_DEPENDEICIES for other binaries.

diff --git a/src/Makefile.am b/src/Makefile.am
index ecc95486a9fb86c4e04cef6bfd1adad60d4b7fe7..db084add6c9748bf1de7765baa69b9ddbd180fc7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,14 +89,13 @@ DIST_SUBDIRS += adaptation
 
 if USE_ESI
 SUBDIRS += esi
-ESI_LOCAL_LIBS = \
+ESI_LIBS = \
        esi/libesi.la \
-       $(top_builddir)/lib/libTrie/libTrie.a
-ESI_LIBS = $(ESI_LOCAL_LIBS) \
+       $(top_builddir)/lib/libTrie/libTrie.a \
        $(XMLLIB) \
        $(EXPATLIB)
 else
-ESI_LIBS = 
+ESI_LIBS =
 endif
 DIST_SUBDIRS += esi
 
@@ -641,30 +640,6 @@ squid_LDADD = \
        $(KRB5LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
-squid_DEPENDENCIES = \
-       $(DISK_LIBS) \
-       $(DISK_LINKOBJS) \
-       $(REPL_OBJS) \
-       $(ADAPTATION_LIBS) \
-       $(ESI_LOCAL_LIBS) \
-       $(SSL_LIBS) \
-       $(AUTH_ACL_LIBS) \
-       ident/libident.la \
-       acl/libacls.la \
-       eui/libeui.la \
-       acl/libstate.la \
-       $(AUTH_LIBS) \
-       acl/libapi.la \
-       base/libbase.la \
-       clients/libclients.la \
-       ftp/libftp.la \
-       libsquid.la \
-       ip/libip.la \
-       fs/libfs.la \
-       format/libformat.la \
-       ipc/libipc.la \
-       mgr/libmgr.la \
-       servers/libservers.la
 
 if ENABLE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)