From d94ac17a5bb066e576de4225d59c5022e3a7f7b5 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Fri, 29 Mar 2019 09:25:37 +0200
Subject: Remove explicit _DEPENDENCIES variables from Makefiles.

These might be needed only in rare cases during the development
cycle. There is no use keeping them around.

* configure.ac (MU_AUTHLIBS_DEPENDENCY)
(DBMLIB_DEPENDENCY,SQLLIB_DEPENDENCY): Remove.
* imap4d/Makefile.am: Remove explicit _DEPENDENCIES.
* pop3d/Makefile.am: Likewise.
* libmu_auth/Makefile.am: Likewise.
* libmu_dbm/Makefile.am: Likewise.
---
 configure.ac           |  7 -------
 imap4d/Makefile.am     | 10 ----------
 libmu_auth/Makefile.am |  1 -
 libmu_dbm/Makefile.am  |  2 +-
 pop3d/Makefile.am      |  7 -------
 5 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index c52cfc6b7..498014197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,12 +160,8 @@ AC_ARG_ENABLE([experimental],
 # Initialize authlibs
 
 AC_SUBST(MU_AUTHLIBS)
-AC_SUBST(MU_AUTHLIBS_DEPENDENCY)
 AC_SUBST(MU_AUTHINCS)
 
-MU_AUTHLIBS=
-MU_AUTHLIBS_DEPENDENCY=../libmu_auth/libmu_auth.la
-
 dnl Check for arguments
 AC_ARG_ENABLE([pam],
               AC_HELP_STRING([--disable-pam],
@@ -351,7 +347,6 @@ AH_BOTTOM(
 # DBM Support
 ##################################
 AC_SUBST(DBMLIBS)
-AC_SUBST(DBMLIB_DEPENDENCY)
 AC_SUBST(DBMINCLUDES)
 
 enable_dbm=
@@ -792,7 +787,6 @@ AC_SUBST(SQL_LTLIBOBJS)
 BUILD_SQL=
 AC_SUBST(BUILD_SQL)
 AC_SUBST(SQLLIB)
-AC_SUBST(SQLLIB_DEPENDENCY)
 
 SQL_LOADABLE_MODULES=
 AC_SUBST(SQL_LOADABLE_MODULES)
@@ -938,7 +932,6 @@ if test -n "$SQL_MODULES"; then
   AC_DEFINE(USE_SQL)
   BUILD_SQL=libsql.la
   SQLLIB=../sql/libsql.la
-  SQLLIB_DEPENDENCY=$SQLLIB
 
   for module in $SQL_MODULES
   do
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 2345191f2..b46c3fef6 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -86,13 +86,3 @@ if MU_COND_UNISTRING
 else
   imap4d_SOURCES += unistr_c.c
 endif
-
-## This kludge is necessary to correctly establish imap4d -> MU_AUTHLIBS
-## dependencies. Automake stupidly refuses to include them.
-## The same kludge appears in pop3d/Makefile.am and auth/Makefile.am
-## Think about better approach         --gray
-imap4d_DEPENDENCIES = \
- @MU_AUTHLIBS_DEPENDENCY@\
- ../lib/libmuaux.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_MAILUTILS}
diff --git a/libmu_auth/Makefile.am b/libmu_auth/Makefile.am
index d106b02fc..613dc6376 100644
--- a/libmu_auth/Makefile.am
+++ b/libmu_auth/Makefile.am
@@ -42,4 +42,3 @@ endif
 
 libmu_auth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
 libmu_auth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_auth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 
diff --git a/libmu_dbm/Makefile.am b/libmu_dbm/Makefile.am
index 31c2233cb..6effa8f6c 100644
--- a/libmu_dbm/Makefile.am
+++ b/libmu_dbm/Makefile.am
@@ -44,4 +44,4 @@ noinst_HEADERS = mudbm.h
 
 libmu_dbm_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @DBMLIBS@ @LTLIBINTL@
 libmu_dbm_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_dbm_la_DEPENDENCIES = @DBMLIB_DEPENDENCY@ 
+
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index 06391cc45..f2f81bb54 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -68,10 +68,3 @@ popauth_LDADD = \
  ${LIBMU_DBM}\
  @DBMLIBS@
 
-pop3d_DEPENDENCIES = \
- @MU_AUTHLIBS_DEPENDENCY@ \
- ../lib/libmuaux.la \
- ${MU_LIB_LOCAL_MAILBOX}\
- ${MU_LIB_MAILUTILS}\
- ${LIBMU_DBM}
-
-- 
cgit v1.2.1