summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-03-29 07:25:37 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-03-29 07:29:26 (GMT)
commitd94ac17a5bb066e576de4225d59c5022e3a7f7b5 (patch) (side-by-side diff)
tree97f7f0aaa7a09ae397c410cd6bba7ca91d5e2451
parent7d1af236c928ef3f71757cf5ad6c4182851daa95 (diff)
downloadmailutils-d94ac17a5bb066e576de4225d59c5022e3a7f7b5.tar.gz
mailutils-d94ac17a5bb066e576de4225d59c5022e3a7f7b5.tar.bz2
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac7
-rw-r--r--imap4d/Makefile.am10
-rw-r--r--libmu_auth/Makefile.am1
-rw-r--r--libmu_dbm/Makefile.am2
-rw-r--r--pop3d/Makefile.am7
5 files changed, 1 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac
index c52cfc6..4980141 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 2345191..b46c3fe 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 d106b02..613dc63 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 31c2233..6effa8f 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 06391cc..f2f81bb 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}
-

Return to:

Send suggestions and report system problems to the System administrator.