aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorGilles Chehade <gilles@poolp.org>2013-10-27 18:05:24 +0100
committerGilles Chehade <gilles@poolp.org>2013-10-27 18:05:24 +0100
commit5675ca7787f5a9647f6617cc883d691548d80d66 (patch)
tree83c8ee2619912401b6a3cc1a9564cd2601971db5 /contrib
parentfix path to encrypt utility and make it compile-time tweakable (diff)
downloadOpenSMTPD-5675ca7787f5a9647f6617cc883d691548d80d66.tar.xz
OpenSMTPD-5675ca7787f5a9647f6617cc883d691548d80d66.zip
makefile stuff
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am8
-rw-r--r--contrib/libexec/encrypt/Makefile.am8
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index d1e9f516..ab9780c1 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,9 @@
+SUBDIRS =
+
if !HAVE_MAIL_LOCAL
-SUBDIRS = libexec
+SUBDIRS += libexec/mail.local
+endif
+
+if !HAVE_ENCRYPT
+SUBDIRS += libexec/encrypt
endif
diff --git a/contrib/libexec/encrypt/Makefile.am b/contrib/libexec/encrypt/Makefile.am
index 9b09d910..76ffc418 100644
--- a/contrib/libexec/encrypt/Makefile.am
+++ b/contrib/libexec/encrypt/Makefile.am
@@ -1,6 +1,6 @@
pkglibexec_PROGRAMS = encrypt
-encrypt_SOURCES = encrypt.c $(top_srcdir)/smtpd/log.c
+encrypt_SOURCES = encrypt.c
INCLUDES = -I$(top_srcdir)/openbsd-compat
@@ -8,11 +8,5 @@ LIBCOMPAT = $(top_builddir)/openbsd-compat/libopenbsd-compat.a
LDADD = $(LIBCOMPAT)
-# need to define _GNU_SOURCE to get:
-# EAI_NODATA defined
-# {v,}asprintf
-# setres{g,u}id
-CFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE
-
uninstall-hook:
rmdir $(DESTDIR)$(pkglibexecdir) 2> /dev/null || /bin/true