Commit Diff


commit - 1263973c1fc7efff4d66ff6525f0a89a37de76ac
commit + e4c47d489df2de29c22c09d5765babaef353bb7e
blob - d1b2afaa03f94e3192e1c41c344c723309861013
blob + cf11bbea71d0f961a30594ab8a649e0fe675c14e
--- .gitignore
+++ .gitignore
@@ -1,7 +1,10 @@
 aclocal.m4
 autom4te.cache
+**/GNUmakefile.in
+**/GNUmakefile
 **/Makefile.in
-**/Makefile
+compat/Makefile
+compat/libasr/Makefile
 compat/libasr/libasr.la
 configure
 configure~
blob - 98ab187b1a91ee19aba5c5823487c0b3fd7a30e5 (mode 644)
blob + /dev/null
--- Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-SUBDIRS = compat
-
-smtpd_libexecdir = $(libexecdir)/smtpd
-smtpd_libexec_PROGRAMS = filter-dnsbl
-
-filter_dnsbl_SOURCES = main.c compat.h
-
-if NEED_LIBASR
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/event_asr_run.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr_compat.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr_debug.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr_utils.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/getaddrinfo_async.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/gethostnamadr_async.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/getnameinfo_async.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/getnetnamadr_async.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/res_search_async.c
-filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/res_send_async.c
-endif
-
-LDADD = $(LIBOBJS)
-
-dist_man8_MANS = filter-dnsbl.8
blob - /dev/null
blob + 98ab187b1a91ee19aba5c5823487c0b3fd7a30e5 (mode 644)
--- /dev/null
+++ GNUmakefile.am
@@ -0,0 +1,24 @@
+SUBDIRS = compat
+
+smtpd_libexecdir = $(libexecdir)/smtpd
+smtpd_libexec_PROGRAMS = filter-dnsbl
+
+filter_dnsbl_SOURCES = main.c compat.h
+
+if NEED_LIBASR
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/event_asr_run.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr_compat.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr_debug.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/asr_utils.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/getaddrinfo_async.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/gethostnamadr_async.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/getnameinfo_async.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/getnetnamadr_async.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/res_search_async.c
+filter_dnsbl_SOURCES+=	$(top_srcdir)/compat/libasr/res_send_async.c
+endif
+
+LDADD = $(LIBOBJS)
+
+dist_man8_MANS = filter-dnsbl.8
blob - b362c542342a94b9b2bdc7c9d8eea391afcbb744
blob + 5eb28fbaee51df04963455e7d32d95663985cbc7
--- configure.ac
+++ configure.ac
@@ -101,6 +101,6 @@ AM_CONDITIONAL([NEED_LIBASR], [test "x$need_libasr" = 
 
 AC_SUBST([AM_CFLAGS])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile compat/Makefile compat/libasr/Makefile])
+AC_CONFIG_FILES([GNUmakefile compat/Makefile compat/libasr/Makefile])
 
 AC_OUTPUT
blob - /dev/null
blob + 1abbcd5ca48239b567aac236475de662ca7eee10 (mode 644)
--- /dev/null
+++ makefile
@@ -0,0 +1,23 @@
+LOCALBASE?= /usr/local/
+
+PROG=	filter-dnsbl
+MAN=	filter-dnsbl.8
+BINDIR=	${LOCALBASE}/libexec/smtpd/
+MANDIR=	${LOCALBASE}/man/man
+
+SRCS+=	main.c
+
+CFLAGS+=-I${LOCALBASE}/include
+CFLAGS+=-Wall -I${.CURDIR}
+CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes
+CFLAGS+=-Wmissing-declarations
+CFLAGS+=-Wshadow -Wpointer-arith -Wcast-qual
+CFLAGS+=-Wsign-compare
+LDFLAGS+=-L${LOCALBASE}/lib
+LDADD+=	-levent -lopensmtpd
+DPADD=	${LIBEVENT}
+
+bindir:
+	${INSTALL} -d ${DESTDIR}${BINDIR}
+
+.include <bsd.prog.mk>