Step 2: blow away roff.h, as all of its functions have been moved into

libmandoc.h and there's nothing left.

4 files changed, 5 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index d4874058..d0a2dd34 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ DATAS	   = arch.in att.in lib.in msec.in st.in \
 	     vol.in chars.in
 
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
-	     libmandoc.h html.h chars.h out.h main.h roff.h \
+	     libmandoc.h html.h chars.h out.h main.h \
 	     mandoc.h libroff.h
 
 GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml \
@@ -108,7 +108,7 @@ XHTMLS	   = mandoc.1.xhtml mdoc.3.xhtml \
 	     roff.7.xhtml roff.3.xhtml tbl.7.xhtml eqn.7.xhtml
 
 HTMLS	   = ChangeLog.html index.html man.h.html mdoc.h.html \
-	     mandoc.h.html roff.h.html mandoc.1.html mdoc.3.html \
+	     mandoc.h.html mandoc.1.html mdoc.3.html \
 	     man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
 	     roff.7.html roff.3.html tbl.7.html eqn.7.html
 
@@ -225,7 +225,7 @@ mdoc.ln mdoc.o: mdoc.c libmdoc.h
 
 man.ln man.o: man.c libman.h
 
-main.ln main.o: main.c mdoc.h man.h roff.h
+main.ln main.o: main.c mdoc.h man.h 
 
 compat.ln compat.o: compat.c 
 
diff --git a/read.c b/read.c
index 75e0d615..f78d2983 100644
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.4 2011/03/20 16:05:21 kristaps Exp $ */
+/*	$Id: read.c,v 1.5 2011/03/22 09:50:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,7 +31,6 @@
 #include "libmandoc.h"
 #include "mdoc.h"
 #include "man.h"
-#include "roff.h"
 
 #ifndef MAP_FILE
 #define	MAP_FILE	0
diff --git a/roff.c b/roff.c
index a6ec0795..43cf0257 100644
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.128 2011/03/20 16:02:05 kristaps Exp $ */
+/*	$Id: roff.c,v 1.129 2011/03/22 09:50:11 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,7 +28,6 @@
 #include <stdio.h>
 
 #include "mandoc.h"
-#include "roff.h"
 #include "libroff.h"
 #include "libmandoc.h"
 
diff --git a/roff.h b/roff.h
deleted file mode 100644
index 171033f8..00000000
--- a/roff.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$Id: roff.h,v 1.26 2011/03/22 09:48:13 kristaps Exp $ */
-/*
- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#ifndef ROFF_H
-#define ROFF_H
-
-__BEGIN_DECLS
-
-__END_DECLS
-
-#endif /*!ROFF_H*/