From 7f2e95f037300c4957f42d355ed6cb2bdb7a22a7 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 10 May 2001 22:07:21 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/dgraph/Sources.pp              | 32 ++++++++++++++----------
 panda/src/dgraph/numericDataAttribute.I  |  2 +-
 panda/src/dgraph/numericDataAttribute.h  |  1 +
 panda/src/dgraph/numericDataTransition.I |  3 +--
 panda/src/dgraph/numericDataTransition.h |  1 +
 panda/src/dgraph/pointerDataAttribute.I  |  3 +--
 panda/src/dgraph/pointerDataAttribute.h  |  1 +
 panda/src/dgraph/pointerDataTransition.I |  3 +--
 panda/src/dgraph/pointerDataTransition.h |  1 +
 panda/src/dgraph/vectorDataAttribute.I   |  3 +--
 panda/src/dgraph/vectorDataAttribute.h   |  1 +
 panda/src/dgraph/vectorDataTransition.I  |  4 +--
 panda/src/dgraph/vectorDataTransition.h  |  2 ++
 panda/src/pnmimagetypes/Sources.pp       |  3 ++-
 14 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/panda/src/dgraph/Sources.pp b/panda/src/dgraph/Sources.pp
index 5b6a7e70cc..0e04bf1186 100644
--- a/panda/src/dgraph/Sources.pp
+++ b/panda/src/dgraph/Sources.pp
@@ -7,29 +7,35 @@
     sgraph graph putil sgattrib mathutil
 
   #define SOURCES \
-    buttonEventDataAttribute.I buttonEventDataAttribute.cxx \
+    buttonEventDataAttribute.I buttonEventDataAttribute.cxx  \
     buttonEventDataAttribute.h buttonEventDataTransition.I \
     buttonEventDataTransition.cxx buttonEventDataTransition.h \
     config_dgraph.cxx config_dgraph.h dataGraphTraversal.cxx \
-    dataGraphTraversal.h \
-    dataGraphTraverser.I dataGraphTraverser.cxx dataGraphTraverser.h \
-    dataNode.cxx dataNode.h dataRelation.I \
+    dataGraphTraversal.h dataGraphTraverser.I dataGraphTraverser.cxx \
+    dataGraphTraverser.h dataNode.cxx dataNode.h dataRelation.I \
     dataRelation.N dataRelation.cxx dataRelation.h \
     describe_data_verbose.cxx describe_data_verbose.h \
-    doubleDataAttribute.I doubleDataAttribute.cxx doubleDataAttribute.h \
-    doubleDataTransition.I doubleDataTransition.cxx \
-    doubleDataTransition.h doublePtrDataAttribute.I \
-    doublePtrDataAttribute.cxx doublePtrDataAttribute.h \
-    doublePtrDataTransition.I doublePtrDataTransition.cxx \
-    doublePtrDataTransition.h intDataAttribute.I intDataAttribute.cxx \
-    intDataAttribute.h intDataTransition.I intDataTransition.cxx \
-    intDataTransition.h matrixDataAttribute.I matrixDataAttribute.cxx \
+    doubleDataAttribute.I doubleDataAttribute.cxx \
+    doubleDataAttribute.h doubleDataTransition.I \
+    doubleDataTransition.cxx doubleDataTransition.h \
+    doublePtrDataAttribute.I doublePtrDataAttribute.cxx \
+    doublePtrDataAttribute.h doublePtrDataTransition.I \
+    doublePtrDataTransition.cxx doublePtrDataTransition.h \
+    intDataAttribute.I intDataAttribute.cxx intDataAttribute.h \
+    intDataTransition.I intDataTransition.cxx intDataTransition.h \
+    matrixDataAttribute.I matrixDataAttribute.cxx \
     matrixDataAttribute.h matrixDataTransition.I \
     matrixDataTransition.cxx matrixDataTransition.h \
+    numericDataAttribute.I numericDataAttribute.h \
+    numericDataTransition.I numericDataTransition.h \
+    pointerDataAttribute.I pointerDataAttribute.h \
+    pointerDataTransition.I pointerDataTransition.h \
     vec3DataAttribute.I vec3DataAttribute.cxx vec3DataAttribute.h \
     vec3DataTransition.I vec3DataTransition.cxx vec3DataTransition.h \
     vec4DataAttribute.I vec4DataAttribute.cxx vec4DataAttribute.h \
-    vec4DataTransition.I vec4DataTransition.cxx vec4DataTransition.h
+    vec4DataTransition.I vec4DataTransition.cxx vec4DataTransition.h \
+    vectorDataAttribute.I vectorDataAttribute.h vectorDataTransition.I \
+    vectorDataTransition.h
 
   #define INSTALL_HEADERS \
     buttonEventDataAttribute.I buttonEventDataAttribute.h \
diff --git a/panda/src/dgraph/numericDataAttribute.I b/panda/src/dgraph/numericDataAttribute.I
index 7e07622406..5d7f712fbd 100644
--- a/panda/src/dgraph/numericDataAttribute.I
+++ b/panda/src/dgraph/numericDataAttribute.I
@@ -3,9 +3,9 @@
 // 
 ////////////////////////////////////////////////////////////////////
 
+/* okcircular */
 #include "numericDataTransition.h"
 
-#include <indent.h>
 
 template<class NumType>
 TypeHandle NumericDataAttribute<NumType>::_type_handle;
diff --git a/panda/src/dgraph/numericDataAttribute.h b/panda/src/dgraph/numericDataAttribute.h
index e171cb076e..a2673d2ee0 100644
--- a/panda/src/dgraph/numericDataAttribute.h
+++ b/panda/src/dgraph/numericDataAttribute.h
@@ -8,6 +8,7 @@
 
 #include <pandabase.h>
 
+#include <indent.h>
 #include <nodeAttribute.h>
 
 template<class NumType>
diff --git a/panda/src/dgraph/numericDataTransition.I b/panda/src/dgraph/numericDataTransition.I
index fe92048027..bc643fb40b 100644
--- a/panda/src/dgraph/numericDataTransition.I
+++ b/panda/src/dgraph/numericDataTransition.I
@@ -3,10 +3,9 @@
 // 
 ////////////////////////////////////////////////////////////////////
 
+/* okcircular */
 #include "numericDataAttribute.h"
 
-#include <indent.h>
-
 template<class NumType>
 TypeHandle NumericDataTransition<NumType>::_type_handle;
 
diff --git a/panda/src/dgraph/numericDataTransition.h b/panda/src/dgraph/numericDataTransition.h
index a4a5a7ea4c..6dc32eb98b 100644
--- a/panda/src/dgraph/numericDataTransition.h
+++ b/panda/src/dgraph/numericDataTransition.h
@@ -9,6 +9,7 @@
 #include <pandabase.h>
 
 #include <nodeTransition.h>
+#include <indent.h>
 
 ////////////////////////////////////////////////////////////////////
 // 	 Class : NumericDataTransition
diff --git a/panda/src/dgraph/pointerDataAttribute.I b/panda/src/dgraph/pointerDataAttribute.I
index 4239ac2e7f..1b5922d706 100644
--- a/panda/src/dgraph/pointerDataAttribute.I
+++ b/panda/src/dgraph/pointerDataAttribute.I
@@ -3,10 +3,9 @@
 // 
 ////////////////////////////////////////////////////////////////////
 
+/* okcircular */
 #include "pointerDataTransition.h"
 
-#include <indent.h>
-
 template<class PtrType>
 TypeHandle PointerDataAttribute<PtrType>::_type_handle;
 
diff --git a/panda/src/dgraph/pointerDataAttribute.h b/panda/src/dgraph/pointerDataAttribute.h
index 580acf673c..cec92fc4fb 100644
--- a/panda/src/dgraph/pointerDataAttribute.h
+++ b/panda/src/dgraph/pointerDataAttribute.h
@@ -9,6 +9,7 @@
 #include <pandabase.h>
 
 #include <nodeAttribute.h>
+#include <indent.h>
 
 template<class PtrType>
 class PointerDataTransition;
diff --git a/panda/src/dgraph/pointerDataTransition.I b/panda/src/dgraph/pointerDataTransition.I
index 5d0427b583..b62133232b 100644
--- a/panda/src/dgraph/pointerDataTransition.I
+++ b/panda/src/dgraph/pointerDataTransition.I
@@ -3,10 +3,9 @@
 // 
 ////////////////////////////////////////////////////////////////////
 
+/* okcircular */
 #include "pointerDataAttribute.h"
 
-#include <indent.h>
-
 template<class PtrType>
 TypeHandle PointerDataTransition<PtrType>::_type_handle;
 
diff --git a/panda/src/dgraph/pointerDataTransition.h b/panda/src/dgraph/pointerDataTransition.h
index 430fc30bca..3fea0679c4 100644
--- a/panda/src/dgraph/pointerDataTransition.h
+++ b/panda/src/dgraph/pointerDataTransition.h
@@ -9,6 +9,7 @@
 #include <pandabase.h>
 
 #include <nodeTransition.h>
+#include <indent.h>
 
 ////////////////////////////////////////////////////////////////////
 // 	 Class : PointerDataTransition
diff --git a/panda/src/dgraph/vectorDataAttribute.I b/panda/src/dgraph/vectorDataAttribute.I
index 0844569036..653952f30f 100644
--- a/panda/src/dgraph/vectorDataAttribute.I
+++ b/panda/src/dgraph/vectorDataAttribute.I
@@ -3,10 +3,9 @@
 // 
 ////////////////////////////////////////////////////////////////////
 
+/* okcircular */
 #include "vectorDataTransition.h"
 
-#include <indent.h>
-
 template<class VecType, class MatType>
 TypeHandle VectorDataAttribute<VecType, MatType>::_type_handle;
 
diff --git a/panda/src/dgraph/vectorDataAttribute.h b/panda/src/dgraph/vectorDataAttribute.h
index 84a7ca1958..121fbe9f8a 100644
--- a/panda/src/dgraph/vectorDataAttribute.h
+++ b/panda/src/dgraph/vectorDataAttribute.h
@@ -9,6 +9,7 @@
 #include <pandabase.h>
 
 #include <nodeAttribute.h>
+#include <indent.h>
 
 template<class VecType, class MatType>
 class VectorDataTransition;
diff --git a/panda/src/dgraph/vectorDataTransition.I b/panda/src/dgraph/vectorDataTransition.I
index 9c9b0ba7d6..1fcad80831 100644
--- a/panda/src/dgraph/vectorDataTransition.I
+++ b/panda/src/dgraph/vectorDataTransition.I
@@ -3,11 +3,9 @@
 // 
 ////////////////////////////////////////////////////////////////////
 
+/* okcircular */
 #include "vectorDataAttribute.h"
 
-#include <indent.h>
-#include <pointerTo.h>
-
 template<class VecType, class MatType>
 TypeHandle VectorDataTransition<VecType, MatType>::_type_handle;
 
diff --git a/panda/src/dgraph/vectorDataTransition.h b/panda/src/dgraph/vectorDataTransition.h
index 89eaea3f27..4ca2d83148 100644
--- a/panda/src/dgraph/vectorDataTransition.h
+++ b/panda/src/dgraph/vectorDataTransition.h
@@ -10,6 +10,8 @@
 
 #include <nodeTransition.h>
 #include <luse.h>
+#include <indent.h>
+#include <pointerTo.h>
 
 ////////////////////////////////////////////////////////////////////
 // 	 Class : VectorDataTransition
diff --git a/panda/src/pnmimagetypes/Sources.pp b/panda/src/pnmimagetypes/Sources.pp
index 1f2978bb4c..80b669b530 100644
--- a/panda/src/pnmimagetypes/Sources.pp
+++ b/panda/src/pnmimagetypes/Sources.pp
@@ -21,7 +21,8 @@
     color.c colrops.c resolu.c header.c
 
   #define IF_JPEG_SOURCES \
-    pnmFileTypeJPG.cxx pnmFileTypeJPGReader.cxx pnmFileTypeJPGWriter.cxx
+    pnmFileTypeJPG.cxx pnmFileTypeJPG.h \
+    pnmFileTypeJPGReader.cxx pnmFileTypeJPGWriter.cxx
 
   #define INSTALL_HEADERS \
     config_pnmimagetypes.h