Move the RB_ code from doas.h to env.c, and limit the environment interface to a...

[opendoas.git] / bsd.prog.mk

diff --git a/bsd.prog.mk b/bsd.prog.mk
index c759f72d960b9e6a469eba9571dd587a43ff4220..f5b3efe9fd5fb11e9dbc012dfcec42d353f41494 100644 (file)
--- a/bsd.prog.mk
+++ b/bsd.prog.mk
@@ -2,24 +2,25 @@
 
 default: ${PROG}
 
+CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP -Wno-unused-result
+
 include config.mk
 
-OPENBSD:=$(addprefix libopenbsd/,${OPENBSD:.c=.o})
+OPENBSD := $(addprefix libopenbsd/,${OPENBSD})
+OBJS    := ${SRCS:.y=.c}
+OBJS    := ${OBJS:.c=.o}
+
 libopenbsd.a: ${OPENBSD}
        ${AR} -r $@ $?
 
-CFLAGS:=${CFLAGS} -I${CURDIR}/libopenbsd ${COPTS} -MD -MP
-
-OBJS:=${SRCS:.y=.c}
-OBJS:=${OBJS:.c=.o}
-
 ${PROG}: ${OBJS} libopenbsd.a
-       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@
+       ${CC} ${CFLAGS} $^ -o $@ ${LDFLAGS}
 
-install: ${PROG} ${PAM_DOAS}
+install: ${PROG} ${PAM_DOAS} ${MAN}
        mkdir -p -m 0755 ${DESTDIR}${BINDIR}
        mkdir -p -m 0755 ${DESTDIR}${PAMDIR}
-       mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man{1,5}
+       mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man1
+       mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man5
        cp -f ${PROG} ${DESTDIR}${BINDIR}
        chown ${BINOWN}:${BINGRP} ${DESTDIR}${BINDIR}/${PROG}
        chmod ${BINMODE} ${DESTDIR}${BINDIR}/${PROG}
@@ -28,8 +29,13 @@ install: ${PROG} ${PAM_DOAS}
        cp -f doas.1 ${DESTDIR}${MANDIR}/man1
        cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
 
+uninstall:
+       rm -f ${DESTDIR}${BINDIR}/${PROG}
+       rm -f ${DESTDIR}${PAMDIR}/doas
+       rm -f ${DESTDIR}${MANDIR}/man1/doas.1
+       rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
+
 clean:
-       rm -f version.h
        rm -f libopenbsd.a
        rm -f ${OPENBSD}
        rm -f ${OPENBSD:.o=.d}
@@ -37,7 +43,6 @@ clean:
        rm -f ${OBJS:.o=.d}
        rm -f ${PROG}
 
--include ${objs:.o=.d} ${OPENBSD:.o=.d}
+-include ${OBJS:.o=.d} ${OPENBSD:.o=.d}
 
-.PHONY: default clean install man
-.INTERMEDIATE: .${PROG}.chmod
+.PHONY: default clean install uninstall