use the plain makefile as default

diff --git a/BSDmakefile b/BSDmakefile
new file mode 100644 (file)
index 0000000..6e99f6d
--- /dev/null
+++ b/BSDmakefile
@@ -0,0 +1,19 @@
+# $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
+#
+
+CFLAGS+= -I${.CURDIR}
+
+DPADD=  ${LIBSSL} ${LIBCRYPTO}
+LDADD=  -lssl -lcrypto
+
+PROG=  dma
+SRCS=  aliases_parse.y aliases_scan.l base64.c conf.c crypto.c
+SRCS+= dma.c dns.c local.c mail.c net.c spool.c util.c
+MAN=   dma.8
+
+BINOWN= root
+BINGRP= mail
+BINMODE=2555
+WARNS?=        6
+
+.include <bsd.prog.mk>

diff --git a/Makefile b/Makefile
index 6e99f6dda15e196324466196bf5900a7761e7043..89db7aa8bb4d94775a7c4ab8e2670471fd785a55 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,48 @@
-# $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
 #
+# If you want to compile dma for Linux, you probably have to do:
+# make -f Makefile.plain CPPFLAGS="-DNEED_REALLOCF -DNEED_STRLCPY \
+#      -DNEED_GETPROGNAME"
+#
+
+CC?=           gcc
+CFLAGS?=       -O -pipe
+LDADD?=                -lssl -lcrypto -lresolv
+
+INSTALL?=      install -p
+PREFIX?=       /usr/local
+SBIN?=         ${PREFIX}/sbin
+CONFDIR?=      ${PREFIX}/etc
+MAN?=          ${PREFIX}/share/man
+
+YACC?=         yacc
+LEX?=          lex
+
+OBJS=  aliases_parse.o aliases_scan.o base64.o conf.o crypto.o
+OBJS+= dma.o dns.o local.o mail.o net.o spool.o util.o
+OBJS+= dfcompat.o
+
+all: dma
+
+clean:
+       -rm -f .depend dma *.[do]
+       -rm -f aliases_parse.[ch] aliases_scan.c
+ 
+install: all
+       ${INSTALL} -d ${DESTDIR}${SBIN} ${DESTDIR}${CONFDIR}
+       ${INSTALL} -d ${DESTDIR}${MAN}/man8
+       ${INSTALL} -m 0755 dma ${DESTDIR}${SBIN}
+       ${INSTALL} -m 0644 dma.8 ${DESTDIR}${MAN}/man8/
 
-CFLAGS+= -I${.CURDIR}
+aliases_parse.c: aliases_parse.y
+       ${YACC} -d -o aliases_parse.c aliases_parse.y
 
-DPADD=  ${LIBSSL} ${LIBCRYPTO}
-LDADD=  -lssl -lcrypto
+aliases_scan.c: aliases_scan.l
+       ${LEX} -t aliases_scan.l > aliases_scan.c
 
-PROG=  dma
-SRCS=  aliases_parse.y aliases_scan.l base64.c conf.c crypto.c
-SRCS+= dma.c dns.c local.c mail.c net.c spool.c util.c
-MAN=   dma.8
+.SUFFIXES: .c .o
 
-BINOWN= root
-BINGRP= mail
-BINMODE=2555
-WARNS?=        6
+.c.o:
+       ${CC} ${CFLAGS} ${CPPFLAGS} -include dfcompat.h -o $@ -c $<
 
-.include <bsd.prog.mk>
+dma: ${OBJS}
+       ${CC} ${LDADD} -o $@ ${OBJS}

diff --git a/Makefile.plain b/Makefile.plain
deleted file mode 100644 (file)
index 89db7aa..0000000
--- a/Makefile.plain
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# If you want to compile dma for Linux, you probably have to do:
-# make -f Makefile.plain CPPFLAGS="-DNEED_REALLOCF -DNEED_STRLCPY \
-#      -DNEED_GETPROGNAME"
-#
-
-CC?=           gcc
-CFLAGS?=       -O -pipe
-LDADD?=                -lssl -lcrypto -lresolv
-
-INSTALL?=      install -p
-PREFIX?=       /usr/local
-SBIN?=         ${PREFIX}/sbin
-CONFDIR?=      ${PREFIX}/etc
-MAN?=          ${PREFIX}/share/man
-
-YACC?=         yacc
-LEX?=          lex
-
-OBJS=  aliases_parse.o aliases_scan.o base64.o conf.o crypto.o
-OBJS+= dma.o dns.o local.o mail.o net.o spool.o util.o
-OBJS+= dfcompat.o
-
-all: dma
-
-clean:
-       -rm -f .depend dma *.[do]
-       -rm -f aliases_parse.[ch] aliases_scan.c
- 
-install: all
-       ${INSTALL} -d ${DESTDIR}${SBIN} ${DESTDIR}${CONFDIR}
-       ${INSTALL} -d ${DESTDIR}${MAN}/man8
-       ${INSTALL} -m 0755 dma ${DESTDIR}${SBIN}
-       ${INSTALL} -m 0644 dma.8 ${DESTDIR}${MAN}/man8/
-
-aliases_parse.c: aliases_parse.y
-       ${YACC} -d -o aliases_parse.c aliases_parse.y
-
-aliases_scan.c: aliases_scan.l
-       ${LEX} -t aliases_scan.l > aliases_scan.c
-
-.SUFFIXES: .c .o
-
-.c.o:
-       ${CC} ${CFLAGS} ${CPPFLAGS} -include dfcompat.h -o $@ -c $<
-
-dma: ${OBJS}
-       ${CC} ${LDADD} -o $@ ${OBJS}