X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=Makefile;h=9cca8ca26322cae9607ecb6de5ba2ad00b1f142d;hb=025db698803cbd722444ba2745ead9a5c51efcb4;hp=4399611801c493b27b54baeb5b122ca47d641a68;hpb=cb888450540a9a9efbca1badb056fc6cce9f9feb;p=opendoas.git

diff --git a/Makefile b/Makefile
index 4399611..9cca8ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,16 @@
 #	$OpenBSD: Makefile,v 1.9 2014/01/13 01:41:00 tedu Exp $
-#
-# Copyright 2015 Nathan Holstein
 
-SRCS=	parse.y doas.c
+SRCS=	parse.y doas.c env.c
 
 PROG=	doas
 MAN=	doas.1 doas.conf.5
 
 BINOWN= root
-BINGRP= wheel
-BINMODE=4511
+BINGRP= root
+BINMODE=4111
 
-COPTS+= -Wall -Wextra -Werror -pedantic -std=c11
-CFLAGS+= -I${CURDIR} -I${CURDIR}/libopenbsd ${COPTS}
-LDFLAGS+= -lpam
+CFLAGS+= -I${CURDIR}
+COPTS+=	-Wall -Wextra -Werror -pedantic
+YFLAGS=
 
-BINDIR?=/usr/bin
-MANDIR?=/usr/share/man
-
-default: ${PROG}
-
-OPENBSD:=reallocarray.c strtonum.c execvpe.c setresuid.c \
-	auth_userokay.c setusercontext.c explicit_bzero.c
-OPENBSD:=$(addprefix libopenbsd/,${OPENBSD:.c=.o})
-libopenbsd.a: ${OPENBSD}
-	${AR} -r $@ $?
-
-OBJS:=${SRCS:.y=.c}
-OBJS:=${OBJS:.c=.o}
-
-${PROG}: ${OBJS} libopenbsd.a
-	${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@
-
-.%.chmod: %
-	cp $< $@
-	chmod ${BINMODE} $@
-	chown ${BINOWN}:${BINGRP} $@
-
-${BINDIR}:
-	mkdir -pm 0755 $@
-
-${BINDIR}/${PROG}: .${PROG}.chmod ${BINDIR}
-	mv $< $@
-
-MAN:=$(join $(addprefix ${MANDIR}/man,$(patsubst .%,%/,$(suffix ${MAN}))),${MAN})
-$(foreach M,${MAN},$(eval $M: $(notdir $M); cp $$< $$@))
-
-install: ${BINDIR}/${PROG} ${MAN}
-
-clean:
-	rm -f libopenbsd.a
-	rm -f ${OPENBSD}
-	rm -f ${OBJS}
-	rm -f ${PROG}
-
-.PHONY: default clean install man
-.INTERMEDIATE: .${PROG}.chmod
+include bsd.prog.mk