aboutsummaryrefslogtreecommitdiffstats
path: root/mk
diff options
context:
space:
mode:
authorFreddy DISSAUX <dsx@bsdsx.fr>2018-06-17 09:17:18 +0200
committerFreddy DISSAUX <dsx@bsdsx.fr>2018-06-17 09:17:18 +0200
commit165c0026f81138fbe8d3f4b0801cf74c15f3b0a6 (patch)
tree7f22db5ca6512a971afc57f358eef73b909ebc53 /mk
parentfix include err.h (diff)
downloadOpenSMTPD-165c0026f81138fbe8d3f4b0801cf74c15f3b0a6.tar.xz
OpenSMTPD-165c0026f81138fbe8d3f4b0801cf74c15f3b0a6.zip
add support of split openbsd-compat
Diffstat (limited to 'mk')
-rw-r--r--mk/mail/mail.lmtp/Makefile.am3
-rw-r--r--mk/mail/mail.maildir/Makefile.am3
-rw-r--r--mk/mail/mail.mda/Makefile.am3
-rw-r--r--mk/smtpctl/Makefile.am3
-rw-r--r--mk/smtpd/Makefile.am6
5 files changed, 18 insertions, 0 deletions
diff --git a/mk/mail/mail.lmtp/Makefile.am b/mk/mail/mail.lmtp/Makefile.am
index 37c6303a..181d2d0b 100644
--- a/mk/mail/mail.lmtp/Makefile.am
+++ b/mk/mail/mail.lmtp/Makefile.am
@@ -7,6 +7,9 @@ mail_lmtp_SOURCES+= $(smtpd_srcdir)/log.c
AM_CPPFLAGS= -I$(top_srcdir)/smtpd \
-I$(top_srcdir)/openbsd-compat
+if !SUPPORT_ERR_H
+AM_CPPFLAGS += -I$(top_srcdir)/openbsd-compat/err_h
+endif
LIBCOMPAT = $(top_builddir)/openbsd-compat/libopenbsd-compat.a
diff --git a/mk/mail/mail.maildir/Makefile.am b/mk/mail/mail.maildir/Makefile.am
index ff36d86d..923ff83b 100644
--- a/mk/mail/mail.maildir/Makefile.am
+++ b/mk/mail/mail.maildir/Makefile.am
@@ -7,6 +7,9 @@ mail_maildir_SOURCES+= $(smtpd_srcdir)/log.c
AM_CPPFLAGS= -I$(top_srcdir)/smtpd \
-I$(top_srcdir)/openbsd-compat
+if !SUPPORT_ERR_H
+AM_CPPFLAGS += -I$(top_srcdir)/openbsd-compat/err_h
+endif
LIBCOMPAT = $(top_builddir)/openbsd-compat/libopenbsd-compat.a
diff --git a/mk/mail/mail.mda/Makefile.am b/mk/mail/mail.mda/Makefile.am
index e165a2cf..29e2ec2c 100644
--- a/mk/mail/mail.mda/Makefile.am
+++ b/mk/mail/mail.mda/Makefile.am
@@ -7,6 +7,9 @@ mail_mda_SOURCES+= $(smtpd_srcdir)/log.c
AM_CPPFLAGS= -I$(top_srcdir)/smtpd \
-I$(top_srcdir)/openbsd-compat
+if !SUPPORT_ERR_H
+AM_CPPFLAGS += -I$(top_srcdir)/openbsd-compat/err_h
+endif
LIBCOMPAT = $(top_builddir)/openbsd-compat/libopenbsd-compat.a
diff --git a/mk/smtpctl/Makefile.am b/mk/smtpctl/Makefile.am
index d1c13304..cdd2ff33 100644
--- a/mk/smtpctl/Makefile.am
+++ b/mk/smtpctl/Makefile.am
@@ -41,6 +41,9 @@ smtpctl_CFLAGS+= -DPATH_GZCAT=\"$(ZCAT)\" \
AM_CPPFLAGS= -I$(top_srcdir)/smtpd \
-I$(top_srcdir)/openbsd-compat
+if !SUPPORT_ERR_H
+AM_CPPFLAGS += -I$(top_srcdir)/openbsd-compat/err_h
+endif
LIBCOMPAT= $(top_builddir)/openbsd-compat/libopenbsd-compat.a
diff --git a/mk/smtpd/Makefile.am b/mk/smtpd/Makefile.am
index 257f95fd..dc051bad 100644
--- a/mk/smtpd/Makefile.am
+++ b/mk/smtpd/Makefile.am
@@ -89,6 +89,12 @@ smtpd_CFLAGS+= -DCA_FILE=\"$(CA_FILE)\"
AM_CPPFLAGS= -I$(smtpd_srcdir) \
-I$(compat_srcdir)
+if !SUPPORT_ERR_H
+AM_CPPFLAGS += -I$(top_srcdir)/openbsd-compat/err_h
+endif
+if !SUPPORT_PATHS_H
+AM_CPPFLAGS += -I$(top_srcdir)/openbsd-compat/paths_h
+endif
LIBCOMPAT= $(top_builddir)/openbsd-compat/libopenbsd-compat.a