From 7681defce7926b6fd5ce2773378dfb4d48ce4c9c Mon Sep 17 00:00:00 2001
From: Dave Beazley <dave-swig@dabeaz.com>
Date: Fri, 6 Dec 2002 20:26:55 +0000
Subject: [PATCH] Removed DOH/Include

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4161 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/CParse/Makefile.in                 |  2 +-
 Source/DOH/Include/.cvsignore             |  1 -
 Source/DOH/Include/dohint.h               |  9 ---------
 Source/DOH/Makefile.in                    |  4 ++--
 Source/DOH/{Include => }/doh.h            |  0
 Source/DOH/{Include/dohobj.h => dohint.h} | 17 +++++++++++++----
 Source/Modules/Makefile.in                |  2 +-
 Source/Preprocessor/Makefile.in           |  2 +-
 Source/Swig/Makefile.in                   |  2 +-
 9 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 Source/DOH/Include/.cvsignore
 delete mode 100644 Source/DOH/Include/dohint.h
 rename Source/DOH/{Include => }/doh.h (100%)
 rename Source/DOH/{Include/dohobj.h => dohint.h} (96%)

diff --git a/Source/CParse/Makefile.in b/Source/CParse/Makefile.in
index 648d1b9f9..3faa962cc 100644
--- a/Source/CParse/Makefile.in
+++ b/Source/CParse/Makefile.in
@@ -23,7 +23,7 @@ INCLUDES = -I$(srcdir)/../Include               \
            -I$(srcdir)/.                        \
            -I$(srcdir)/../Swig                  \
            -I$(srcdir)/../Preprocessor          \
-           -I$(srcdir)/../DOH/Include		\
+           -I$(srcdir)/../DOH		\
 	   -I../Include				\
 	   -I.
 
diff --git a/Source/DOH/Include/.cvsignore b/Source/DOH/Include/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/Source/DOH/Include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Source/DOH/Include/dohint.h b/Source/DOH/Include/dohint.h
deleted file mode 100644
index f2f5d2ac9..000000000
--- a/Source/DOH/Include/dohint.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <ctype.h>
-#include <stdarg.h>
-
-#include "doh.h"
-#include "dohobj.h"
diff --git a/Source/DOH/Makefile.in b/Source/DOH/Makefile.in
index f5c6cf371..37063ec66 100644
--- a/Source/DOH/Makefile.in
+++ b/Source/DOH/Makefile.in
@@ -28,9 +28,9 @@ LIBOBJS = void.@OBJEXT@ fio.@OBJEXT@ memory.@OBJEXT@ base.@OBJEXT@ file.@OBJEXT@
 
 LIBSRCS = void.c fio.c memory.c base.c file.c list.c hash.c string.c
 
-LIBHEADERS = $(srcdir)/Include/doh.h
+LIBHEADERS = $(srcdir)/doh.h
 LIB      = libdoh.a
-INCLUDES = -I$(srcdir)/Include
+INCLUDES = -I$(srcdir)
 CFLAGS   = @CFLAGS@
 SHELL  = /bin/sh
 
diff --git a/Source/DOH/Include/doh.h b/Source/DOH/doh.h
similarity index 100%
rename from Source/DOH/Include/doh.h
rename to Source/DOH/doh.h
diff --git a/Source/DOH/Include/dohobj.h b/Source/DOH/dohint.h
similarity index 96%
rename from Source/DOH/Include/dohobj.h
rename to Source/DOH/dohint.h
index 1f3ff19c7..b19427439 100644
--- a/Source/DOH/Include/dohobj.h
+++ b/Source/DOH/dohint.h
@@ -1,5 +1,6 @@
+
 /* -----------------------------------------------------------------------------
- * dohobj.h
+ * dohint.h
  *
  *     This file describes internally managed objects.
  *
@@ -11,8 +12,15 @@
  * $Header$
  * ----------------------------------------------------------------------------- */
 
-#ifndef _DOHOBJ_H
-#define _DOHOBJ_H
+#ifndef _DOHINT_H
+#define _DOHINT_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#include <stdarg.h>
 
 #include "doh.h"
 
@@ -117,7 +125,8 @@ typedef struct {
 extern DOH     *DohObjMalloc(DohObjInfo *type, void *data); /* Allocate a DOH object */
 extern void     DohObjFree(DOH *ptr);               /* Free a DOH object     */
 
-#endif /* DOHOBJ_H */
+#endif /* DOHINT_H */
+
 
 
 
diff --git a/Source/Modules/Makefile.in b/Source/Modules/Makefile.in
index 353a59699..2b705395b 100644
--- a/Source/Modules/Makefile.in
+++ b/Source/Modules/Makefile.in
@@ -17,7 +17,7 @@ OBJS     = main.@OBJEXT@ module.@OBJEXT@ emit.@OBJEXT@ overload.@OBJEXT@ lang.@O
 SRCS     = main.cxx module.cxx emit.cxx overload.cxx lang.cxx typepass.cxx allocate.cxx browser.cxx contract.cxx swigmain.cxx tcl8.cxx python.cxx perl5.cxx guile.cxx ruby.cxx mzscheme.cxx java.cxx php4.cxx ocaml.cxx xml.cxx pike.cxx s-exp.cxx
 
 INCLUDES = -I$(srcdir)/../Include		\
-           -I$(srcdir)/../DOH/Include		\
+           -I$(srcdir)/../DOH		\
            -I$(srcdir)/../Preprocessor          \
            -I$(srcdir)/../Swig                  \
            -I../Include
diff --git a/Source/Preprocessor/Makefile.in b/Source/Preprocessor/Makefile.in
index ac1bed800..e6f1e8723 100644
--- a/Source/Preprocessor/Makefile.in
+++ b/Source/Preprocessor/Makefile.in
@@ -15,7 +15,7 @@ CC            = @CC@
 AR            = @AR@
 RANLIB        = @RANLIB@
 CFLAGS        = @CFLAGS@
-INCLUDES      = -I$(srcdir)/. -I$(srcdir)/../Swig -I$(srcdir)/../DOH/Include -I$(srcdir)/../Include
+INCLUDES      = -I$(srcdir)/. -I$(srcdir)/../Swig -I$(srcdir)/../DOH -I$(srcdir)/../Include
 TARGET        = libcpp.a
 
 .c.@OBJEXT@:
diff --git a/Source/Swig/Makefile.in b/Source/Swig/Makefile.in
index 1186c6887..f054f3f1b 100644
--- a/Source/Swig/Makefile.in
+++ b/Source/Swig/Makefile.in
@@ -17,7 +17,7 @@ CC            = @CC@
 AR            = @AR@
 RANLIB        = @RANLIB@
 CFLAGS        = @CFLAGS@
-INCLUDES      = -I$(srcdir)/. -I$(srcdir)/../DOH/Include -I$(srcdir)/../Include
+INCLUDES      = -I$(srcdir)/. -I$(srcdir)/../DOH -I$(srcdir)/../Include
 TARGET        = libswig.a
 
 .c.@OBJEXT@: