Convert Makefile to being POSIX compatible

diff --git a/.gitignore b/.gitignore
index a5224e90386279ca6254b813fc071a35154dd171..d7ea15a8088e2f0caf9a4fbfec30b8a609910201 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ doas
 
 parse.c
 version.h
+y.tab.h
 
 *.a
 *.d

diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644 (file)
index f19deab..0000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PROG=  doas
-MAN=   doas.1 doas.conf.5
-
-SRCS=  parse.y doas.c env.c
-
-include config.mk
-
-override CFLAGS:=-I. -Ilibopenbsd -O2 -Wall -Wextra ${OS_CFLAGS} ${CFLAGS}
-
-all: ${PROG}
-
-OBJS:= ${SRCS:.y=.c}
-OBJS:= ${OBJS:.c=.o}
-
-${PROG}: ${OBJS}
-       ${CC} ${CFLAGS} $^ -o $@ ${LDFLAGS} ${LDLIBS}
-
-install: ${PROG} ${MAN}
-       mkdir -p -m 0755 ${DESTDIR}${BINDIR}
-       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}
-       cp -f doas.1 ${DESTDIR}${MANDIR}/man1
-       cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
-
-uninstall:
-       rm -f ${DESTDIR}${BINDIR}/${PROG}
-       rm -f ${DESTDIR}${MANDIR}/man1/doas.1
-       rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
-
-clean:
-       rm -f ${PROG} ${OBJS} ${OBJS:.o=.d} parse.c
-
--include ${OBJS:.o=.d}
-
-.PHONY: all clean install uninstall

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..8b0f258
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,38 @@
+PROG = doas
+MAN = doas.1 doas.conf.5
+
+SRCS = parse.y doas.c env.c
+
+include config.mk
+
+CFLAGS := -I. -Ilibopenbsd -O2 -Wall -Wextra ${OS_CFLAGS} ${CFLAGS}
+
+all: ${PROG}
+
+OBJS := ${SRCS:.y=.c}
+OBJS := ${OBJS:.c=.o}
+
+${PROG}: ${OBJS}
+       ${CC} ${CFLAGS} *.o -o $@ ${LDFLAGS} ${LDLIBS}
+
+install: ${PROG} ${MAN}
+       mkdir -p -m 0755 ${DESTDIR}${BINDIR}
+       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}
+       cp -f doas.1 ${DESTDIR}${MANDIR}/man1
+       cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
+
+uninstall:
+       rm -f ${DESTDIR}${BINDIR}/${PROG}
+       rm -f ${DESTDIR}${MANDIR}/man1/doas.1
+       rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
+
+clean:
+       rm -f ${PROG} ${OBJS} ${OBJS:.o=.d} parse.c
+
+-include ${OBJS:.o=.d}
+
+.PHONY: all clean install uninstall