From 814e39f9baa643eac2bbdd2db874f18a8da29ad4 Mon Sep 17 00:00:00 2001
From: reyk <reyk@openbsd.org>
Date: Tue, 19 Jul 2016 18:14:08 +0000
Subject: [PATCH] The -DNAME=switch flag is an artifact from the PoC when I
 couldn't decide on a name.  Remove it and fix the name to switchd now.

---
 usr.sbin/switchctl/Makefile | 15 ++++++---------
 usr.sbin/switchd/Makefile   | 11 ++++-------
 usr.sbin/switchd/types.h    |  4 +---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/usr.sbin/switchctl/Makefile b/usr.sbin/switchctl/Makefile
index e894ddd044f..892c4c19cb3 100644
--- a/usr.sbin/switchctl/Makefile
+++ b/usr.sbin/switchctl/Makefile
@@ -1,18 +1,15 @@
-# $OpenBSD: Makefile,v 1.1 2016/07/19 16:54:26 reyk Exp $
+# $OpenBSD: Makefile,v 1.2 2016/07/19 18:14:08 reyk Exp $
 
-NAME=		switch
+.PATH:		${.CURDIR}/../switchd
 
-.PATH:		${.CURDIR}/../${NAME}d
-
-PROG=		${NAME}ctl
-MAN=		${NAME}ctl.8
-SRCS=		log.c ${NAME}ctl.c parser.c util.c
+PROG=		switchctl
+MAN=		switchctl.8
+SRCS=		log.c switchctl.c parser.c util.c
 
 LDADD=		-lutil
 DPADD=		${LIBUTIL}
 
-CFLAGS+=	-DOFD_NAME=\"${NAME}\"
-CFLAGS+=	-Wall -I${.CURDIR} -I${.CURDIR}/../${NAME}d
+CFLAGS+=	-Wall -I${.CURDIR} -I${.CURDIR}/../switchd
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
 CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual
diff --git a/usr.sbin/switchd/Makefile b/usr.sbin/switchd/Makefile
index 2f546532cbb..3bcbb546b0b 100644
--- a/usr.sbin/switchd/Makefile
+++ b/usr.sbin/switchd/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2016/07/19 16:54:26 reyk Exp $
+# $OpenBSD: Makefile,v 1.2 2016/07/19 18:14:08 reyk Exp $
 
-NAME=		switch
-
-PROG=		${NAME}d
-MAN=		${NAME}d.8 ${NAME}d.conf.5
+PROG=		switchd
+MAN=		switchd.8 switchd.conf.5
 
 SRCS=		imsg_util.c log.c packet.c switch.c timer.c util.c
 SRCS+=		switchd.c ofp.c ofp10.c ofp13.c control.c proc.c
@@ -13,8 +11,7 @@ SRCS+=		parse.y ofcconn.c
 LDADD=		-levent -lutil
 DPADD=		${LIBEVENT} ${LIBUTIL}
 
-CFLAGS+=	-DSWITCHD_NAME=\"${NAME}\"
-CFLAGS+=	-Wall -I${.CURDIR} -I${.CURDIR}/../${NAME}d
+CFLAGS+=	-Wall -I${.CURDIR} -I${.CURDIR}/../switchd
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
 CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual
diff --git a/usr.sbin/switchd/types.h b/usr.sbin/switchd/types.h
index 7dba07ec190..9e905acaa39 100644
--- a/usr.sbin/switchd/types.h
+++ b/usr.sbin/switchd/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.1 2016/07/19 16:54:26 reyk Exp $	*/
+/*	$OpenBSD: types.h,v 1.2 2016/07/19 18:14:08 reyk Exp $	*/
 
 /*
  * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org>
@@ -23,9 +23,7 @@
 #define SWITCHD_USER	"_hostapd"
 #endif
 
-#ifndef SWITCHD_NAME
 #define SWITCHD_NAME	"switch"
-#endif
 
 #ifndef SWITCHD_CONFIG
 #define SWITCHD_CONFIG	"/etc/" SWITCHD_NAME "d.conf"
-- 
2.20.1