From fa4b5143699a6b4e20b575bfb0ea997a4397e31c Mon Sep 17 00:00:00 2001
From: wiire-a <wi7ire@gmail.com>
Date: Sun, 24 Dec 2017 16:43:30 +0100
Subject: [PATCH] Moved Makefile to top dir

Also added the installation of the man page.
---
 Makefile     | 41 +++++++++++++++++++++++++++++++++++++++++
 README.md    |  1 -
 src/Makefile | 30 ------------------------------
 3 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 src/Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..d67220d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,41 @@
+CFLAGS = -std=c99 -O3
+
+PREFIX ?= /usr/local
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/share/man
+
+SRCDIR = src
+
+LIBS = -lpthread
+ifeq ($(OPENSSL),1)
+LIBS += -lcrypto
+CFLAGS += -DUSE_OPENSSL
+else
+CRYDIR = $(SRCDIR)/mbedtls
+CRYPTO = $(CRYDIR)/sha256.c $(CRYDIR)/md.c $(CRYDIR)/md_wrap.c
+endif
+
+TARGET = pixiewps
+SOURCE = $(SRCDIR)/pixiewps.c $(CRYPTO)
+
+-include config.mak
+
+.PHONY: all install install-bin install-man clean
+
+all: $(TARGET)
+
+$(TARGET):
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(TARGET) $(SOURCE) $(LIBS) $(LDFLAGS)
+
+install: install-bin install-man
+
+install-bin: $(TARGET)
+	install -d $(DESTDIR)$(BINDIR)
+	install -m 755 $< $(DESTDIR)$(BINDIR)
+
+install-man: pixiewps.1
+	install -d $(DESTDIR)$(MANDIR)/man1
+	install -m 644 $< $(DESTDIR)$(MANDIR)/man1
+
+clean:
+	rm -f $(TARGET)
diff --git a/README.md b/README.md
index fa8c223..968efaa 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,6 @@ or
 
 ```bash
 cd pixiewps*/
-cd src/
 make
 ```
 Optionally, you can run `make OPENSSL=1` to use faster OpenSSL SHA-256 functions.
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 1be4605..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-CFLAGS = -std=c99 -O3
-
-LIBS = -lpthread
-ifeq ($(OPENSSL),1)
-LIBS += -lcrypto
-CFLAGS += -DUSE_OPENSSL
-else
-CRYPTO = mbedtls/sha256.c mbedtls/md.c mbedtls/md_wrap.c
-endif
-
-PREFIX = /usr/local
-BINDIR = $(PREFIX)/bin
-
-TARGET = pixiewps
-SOURCE = $(TARGET).c $(CRYPTO)
-
--include config.mak
-
-all:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(TARGET) $(SOURCE) $(LIBS) $(LDFLAGS)
-
-debug:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $(TARGET) $(SOURCE) $(LIBS) $(LDFLAGS)
-
-install:
-	install -d $(DESTDIR)$(BINDIR)
-	install -m 755 $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
-
-clean:
-	rm -f $(TARGET)