some more cleanup and refactoring of pam code

[opendoas.git] / bsd.prog.mk

diff --git a/bsd.prog.mk b/bsd.prog.mk
index 39d35f19d86e382b92019cc2439a2b3cd7962411..f5b3efe9fd5fb11e9dbc012dfcec42d353f41494 100644 (file)
--- a/bsd.prog.mk
+++ b/bsd.prog.mk
@@ -2,7 +2,7 @@
 
 default: ${PROG}
 
-CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP
+CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP -Wno-unused-result
 
 include config.mk
 
@@ -14,7 +14,7 @@ libopenbsd.a: ${OPENBSD}
        ${AR} -r $@ $?
 
 ${PROG}: ${OBJS} libopenbsd.a
-       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@
+       ${CC} ${CFLAGS} $^ -o $@ ${LDFLAGS}
 
 install: ${PROG} ${PAM_DOAS} ${MAN}
        mkdir -p -m 0755 ${DESTDIR}${BINDIR}
@@ -29,8 +29,13 @@ install: ${PROG} ${PAM_DOAS} ${MAN}
        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}
@@ -40,4 +45,4 @@ clean:
 
 -include ${OBJS:.o=.d} ${OPENBSD:.o=.d}
 
-.PHONY: default clean install
+.PHONY: default clean install uninstall