1 files changed, 65 insertions, 25 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index ca4d108..5518bc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 ## src/Makefile.am
 ##
 ## This file is part of GNU Anubis.
-## Copyright (C) 2001-2014 The Anubis Team.
+## Copyright (C) 2001-2024 The Anubis Team.
 ##
 ## GNU Anubis is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by the
@@ -19,14 +19,20 @@
 ##
 
 adm_sbin_programs = anubisadm 
-adm_bin_programs = anubisusr
+adm_bin_programs =
+
 sbin_PROGRAMS = anubis @ANUBIS_SBIN_ADM@
 bin_PROGRAMS = @ANUBIS_BIN_ADM@
 EXTRA_PROGRAMS = $(adm_bin_programs) $(adm_sbin_programs)
 
-noinst_LIBRARIES = libanubisdb.a
-anubis_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a\
- @LIBINTL@ $(GUILE_LIBS) @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
+noinst_LIBRARIES = libanubis.a
+anubis_LDADD = \
+ ./libanubis.a\
+ @LIBINTL@\
+ $(GUILE_LIBS)\
+ @LIBGNUTLS_LIBS@\
+ @GSASL_LIBS@\
+ $(LIBGCRYPT_LIBS)
 
 anubis_SOURCES = \
  authmode.c \
@@ -36,9 +42,6 @@ anubis_SOURCES = \
  esmtp.c \
  exec.c \
  extern.h \
- gpg.c \
- gsasl_srv.c \
- guile.c \
  headers.h \
  help.c \
  ident.c \
@@ -61,26 +64,38 @@ anubis_SOURCES = \
  regex.c \
  socks.c \
  transmode.c \
- tunnel.c \
- xdatabase.c 
+ tunnel.c
 
-anubisadm_SOURCES = anubisadm.c anubisadm.h adm.c
-anubisadm_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@
-anubisusr_SOURCES = anubisusr.c anubisusr.h usr.c
-anubisusr_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
+if GSASL_COND
+  anubis_SOURCES += gsasl_srv.c
+endif
 
-if TLS_COND
- TLS_C=tls.c
+if GPG_COND
+  anubis_SOURCES += gpg.c
 endif
 
-libanubisdb_a_SOURCES = \
+if GUILE_COND
+  anubis_SOURCES += guile.c
+endif
+
+if GCRYPT_COND
+  anubis_SOURCES += idecrypt.c
+endif
+
+anubisadm_SOURCES = anubisadm.c anubisadm.h adm.c
+anubisadm_LDADD = ./libanubis.a @LIBINTL@
+anubisusr_SOURCES = anubisusr.c anubisusr.h usr.c
+anubisusr_LDADD = ./libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
+
+libanubis_a_SOURCES = \
  anubisdb.c \
  dbtext.c \
- gdbm.c \
- gsasl.c \
+ getpass.c \
+ keyword.c \
+ keyword.h \
  list.c \
  list.h \
- md5.c \
+ mem.c \
  mysql.c \
  pgsql.c \
  sql.h \
@@ -88,24 +103,49 @@ libanubisdb_a_SOURCES = \
  smtprepl.c \
  smtprepl.h \
  stream.c \
- $(TLS_C) \
- url.c 
+ url.c \
+ wordsplit/wordsplit.c \
+ wordsplit/wordsplit.h
+
+if TLS_COND
+  libanubis_a_SOURCES += tls.c md5sum.c xdatabase.c
+  adm_bin_programs += anubisusr
+else
+  libanubis_a_SOURCES += notls.c
+endif
+
+if GSASL_COND
+  libanubis_a_SOURCES += gsasl.c
+endif
+
+if GDBM_COND
+  libanubis_a_SOURCES += gdbm.c
+endif
+
 
 AM_YFLAGS = -dtv
 AM_LFLAGS = -dvp
-EXTRA_DIST = getopt.m4 env.opt
+EXTRA_DIST = getopt.m4 env.opt gettext.h
 
 BUILT_SOURCES = env.c
 
 localedir = $(datadir)/locale
 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
-AM_CPPFLAGS = @ADD_INCLUDES@ @LIBGNUTLS_INCLUDES@ -I$(top_srcdir)/lib
+AM_CPPFLAGS =\
+ @ADD_INCLUDES@\
+ @GUILE_INCLUDES@\
+ @LIBGNUTLS_INCLUDES@\
+ $(LIBGCRYPT_CFLAGS)\
+ -I$(top_srcdir)\
+ -I$(srcdir)\
+ -I$(srcdir)/wordsplit
+
 SUFFIXES=.opt .c
 
 .opt.c:
 	m4 -s $(top_srcdir)/src/getopt.m4 $< | sed '1d' > $@
 
-FLOWCHART_FILES=$(anubis_SOURCES) $(libanubisdb_a_SOURCES)
+FLOWCHART_FILES=$(anubis_SOURCES) $(libanubis_a_SOURCES)
 
 flowchart: anubis.cflow