summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-03-29 09:25:37 +0200
committerSergey Poznyakoff <gray@gnu.org>2019-03-29 09:29:26 +0200
commitd94ac17a5bb066e576de4225d59c5022e3a7f7b5 (patch)
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.
-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 c52cfc6b7..498014197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,12 +160,8 @@ AC_ARG_ENABLE([experimental],
160# Initialize authlibs 160# Initialize authlibs
161 161
162AC_SUBST(MU_AUTHLIBS) 162AC_SUBST(MU_AUTHLIBS)
163AC_SUBST(MU_AUTHLIBS_DEPENDENCY)
164AC_SUBST(MU_AUTHINCS) 163AC_SUBST(MU_AUTHINCS)
165 164
166MU_AUTHLIBS=
167MU_AUTHLIBS_DEPENDENCY=../libmu_auth/libmu_auth.la
168
169dnl Check for arguments 165dnl Check for arguments
170AC_ARG_ENABLE([pam], 166AC_ARG_ENABLE([pam],
171 AC_HELP_STRING([--disable-pam], 167 AC_HELP_STRING([--disable-pam],
@@ -351,7 +347,6 @@ AH_BOTTOM(
351# DBM Support 347# DBM Support
352################################## 348##################################
353AC_SUBST(DBMLIBS) 349AC_SUBST(DBMLIBS)
354AC_SUBST(DBMLIB_DEPENDENCY)
355AC_SUBST(DBMINCLUDES) 350AC_SUBST(DBMINCLUDES)
356 351
357enable_dbm= 352enable_dbm=
@@ -792,7 +787,6 @@ AC_SUBST(SQL_LTLIBOBJS)
792BUILD_SQL= 787BUILD_SQL=
793AC_SUBST(BUILD_SQL) 788AC_SUBST(BUILD_SQL)
794AC_SUBST(SQLLIB) 789AC_SUBST(SQLLIB)
795AC_SUBST(SQLLIB_DEPENDENCY)
796 790
797SQL_LOADABLE_MODULES= 791SQL_LOADABLE_MODULES=
798AC_SUBST(SQL_LOADABLE_MODULES) 792AC_SUBST(SQL_LOADABLE_MODULES)
@@ -938,7 +932,6 @@ if test -n "$SQL_MODULES"; then
938 AC_DEFINE(USE_SQL) 932 AC_DEFINE(USE_SQL)
939 BUILD_SQL=libsql.la 933 BUILD_SQL=libsql.la
940 SQLLIB=../sql/libsql.la 934 SQLLIB=../sql/libsql.la
941 SQLLIB_DEPENDENCY=$SQLLIB
942 935
943 for module in $SQL_MODULES 936 for module in $SQL_MODULES
944 do 937 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
86else 86else
87 imap4d_SOURCES += unistr_c.c 87 imap4d_SOURCES += unistr_c.c
88endif 88endif
89
90## This kludge is necessary to correctly establish imap4d -> MU_AUTHLIBS
91## dependencies. Automake stupidly refuses to include them.
92## The same kludge appears in pop3d/Makefile.am and auth/Makefile.am
93## Think about better approach --gray
94imap4d_DEPENDENCIES = \
95 @MU_AUTHLIBS_DEPENDENCY@\
96 ../lib/libmuaux.la\
97 ${MU_LIB_MBOX}\
98 ${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
42 42
43libmu_auth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@ 43libmu_auth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
44libmu_auth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 44libmu_auth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
45libmu_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
44 44
45libmu_dbm_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @DBMLIBS@ @LTLIBINTL@ 45libmu_dbm_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @DBMLIBS@ @LTLIBINTL@
46libmu_dbm_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 46libmu_dbm_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
47libmu_dbm_la_DEPENDENCIES = @DBMLIB_DEPENDENCY@ 47
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 = \
68 ${LIBMU_DBM}\ 68 ${LIBMU_DBM}\
69 @DBMLIBS@ 69 @DBMLIBS@
70 70
71pop3d_DEPENDENCIES = \
72 @MU_AUTHLIBS_DEPENDENCY@ \
73 ../lib/libmuaux.la \
74 ${MU_LIB_LOCAL_MAILBOX}\
75 ${MU_LIB_MAILUTILS}\
76 ${LIBMU_DBM}
77

Return to:

Send suggestions and report system problems to the System administrator.