disambiguate cmd/smyrna #includes

Related to #1242 and #1785.

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index d3d6209ba9c799bac5af1b3e35d05c4e6db5e576..4b53c9e1f6d05b2a98b435e3d40d8d6e5c496c1d 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -5,6 +5,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
        -DSMYRNA_PATH=\""$(pkgdatadir)/smyrna"\" \
+        -I$(top_srcdir)/lib \
         -I$(top_srcdir)/lib/cgraph \
         -I$(top_srcdir)/lib/cdt \
         -I$(top_srcdir)/lib/glcomp \

diff --git a/cmd/smyrna/arcball.c b/cmd/smyrna/arcball.c
index 43f46808ef9519f4688f812a9698210f454e9fb3..6fd04492d8d3e30ce4188139f95cfcd956363fb4 100644 (file)
--- a/cmd/smyrna/arcball.c
+++ b/cmd/smyrna/arcball.c
@@ -25,7 +25,7 @@
 /**                                                                                 **/
 /*************************************************************************************/
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 #define ARCBALL_C
 #include "smyrnadefs.h"
 #include "arcball.h"

diff --git a/cmd/smyrna/arcball.h b/cmd/smyrna/arcball.h
index cd9749618981a309eb63968d682abdee925af733..1f898deabc83e70f7f848aadc628d7fdfc9d3dd0 100644 (file)
--- a/cmd/smyrna/arcball.h
+++ b/cmd/smyrna/arcball.h
@@ -49,7 +49,7 @@
 
 // 8<--Snip here if you have your own math types/funcs-->8 
 
-# include "assert.h"
+# include <assert.h>
 
 //Math types derived from the KempoApi tMath library
 typedef union Tuple2f_t {

diff --git a/cmd/smyrna/btree.c b/cmd/smyrna/btree.c
index ac62b51f59b205d2804e0874c11905a679068b4a..47cde7e3f8c08d935e773ca2649a1a7f4022c342 100644 (file)
--- a/cmd/smyrna/btree.c
+++ b/cmd/smyrna/btree.c
@@ -13,12 +13,12 @@
 
 #include "btree.h"
 #ifdef _WIN32
-#include "regex_win32.h"
+#include <regex_win32.h>
 #else
-#include "regex.h"
+#include <regex.h>
 #endif
 
-#include <memory.h>
+#include <common/memory.h>
 
 btree_node *new_node(char *attribute, char *regex, float min, float max)
 {

diff --git a/cmd/smyrna/btree.h b/cmd/smyrna/btree.h
index ac6d1493b16f57cf2b07ec8c2ea85129233accc7..862e3b9cc3fc3f33e482fe6cabb3ad7b3b0d3079 100644 (file)
--- a/cmd/smyrna/btree.h
+++ b/cmd/smyrna/btree.h
@@ -16,7 +16,7 @@
 
 #include "tvnodes.h"
 #ifdef _WIN32
-#include "regex_win32.h"
+#include <regex_win32.h>
 #endif
 
 #ifdef __cplusplus

diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index 519db0bbbc2fd9ab3211b9e786c93c8868c48dc2..414fc87a84ceab394d03f7c34c079b91ff9b5313 100644 (file)
--- a/cmd/smyrna/draw.c
+++ b/cmd/smyrna/draw.c
@@ -18,18 +18,18 @@ XDOT DRAWING FUNCTIONS, maybe need to move them somewhere else
 */
 #include "draw.h"
 /* #include "topview.h" */
-#include "colorprocs.h"
+#include <common/colorprocs.h>
 #include "smyrna_utils.h"
-#include "glutils.h"
-#include "math.h"
+#include <glcomp/glutils.h>
+#include <math.h>
 
-#include "xdot.h"
+#include <xdot/xdot.h>
 #include "viewport.h"
 #include "topfisheyeview.h"
 #include "appmouse.h"
 #include "hotkeymap.h"
 #include "polytess.h"
-#include "glcompimage.h"
+#include <glcomp/glcompimage.h>
 
 
 //delta values

diff --git a/cmd/smyrna/draw.h b/cmd/smyrna/draw.h
index 96aea9ea49634f3536d66665ebe4ebee68a3d9f4..3a5d6390a850d40cb3ee9261ba31818e3344197c 100644 (file)
--- a/cmd/smyrna/draw.h
+++ b/cmd/smyrna/draw.h
@@ -15,11 +15,11 @@
 #define DRAW_H
 #include "smyrnadefs.h"
 #include <gtk/gtkgl.h>
-#include "xdot.h"
+#include <xdot/xdot.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "glcompfont.h"
+#include <glcomp/glcompfont.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cmd/smyrna/filter.c b/cmd/smyrna/filter.c
index 48d7fadaaeeae6b8906e93d2c7570835022f3201..34db700b1d86c6c340903ddbeef6abd243e8262c 100644 (file)
--- a/cmd/smyrna/filter.c
+++ b/cmd/smyrna/filter.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include "filter.h"
-#include "memory.h"
+#include <common/memory.h>
 
 int clear_filter(tv_filter * f)
 {

diff --git a/cmd/smyrna/glexpose.c b/cmd/smyrna/glexpose.c
index b4f5a68aa47008848bcd8b459088258d5028358b..5c334a54f58a815288ad434c16f76a870b131c1e 100644 (file)
--- a/cmd/smyrna/glexpose.c
+++ b/cmd/smyrna/glexpose.c
@@ -13,7 +13,7 @@
 #include "glexpose.h"
 #include "draw.h"
 #include "topviewfuncs.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "topfisheyeview.h"
 #include "gui/toolboxcallbacks.h"
 #include "arcball.h"

diff --git a/cmd/smyrna/glmotion.c b/cmd/smyrna/glmotion.c
index 552f6fb234b7df4dbf0802a4508c0b53d9b6518c..dc93f3a27fda8c1ae02d093602f75c8a21fc6c7d 100644 (file)
--- a/cmd/smyrna/glmotion.c
+++ b/cmd/smyrna/glmotion.c
@@ -18,7 +18,7 @@
 #include <gdk/gdkcursor.h>
 #include "draw.h"
 /* #include "topview.h" */
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "hotkeymap.h"
 
 gboolean redraw = FALSE;

diff --git a/cmd/smyrna/gltemplate.c b/cmd/smyrna/gltemplate.c
index af85abdb57d3d262dfa6fa226d1223b0c91fb9ec..8ac4857d18f5b0b2f527d09e093a857833bac73f 100644 (file)
--- a/cmd/smyrna/gltemplate.c
+++ b/cmd/smyrna/gltemplate.c
@@ -18,11 +18,11 @@
 #include "viewport.h"
 /* #include "topview.h" */
 #include "gltemplate.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "glexpose.h"
 #include "glmotion.h"
 
-#include "glcompset.h"
+#include <glcomp/glcompset.h>
 #include "viewportcamera.h"
 #include "gui/menucallbacks.h"
 #include "arcball.h"

diff --git a/cmd/smyrna/gui/callbacks.c b/cmd/smyrna/gui/callbacks.c
index e943bd14eb3fd3765247f63d530d2a6c6d1d0876..ee07cf424f677823b6ced9a03ad96eb877696021 100644 (file)
--- a/cmd/smyrna/gui/callbacks.c
+++ b/cmd/smyrna/gui/callbacks.c
@@ -18,7 +18,7 @@
 #include "viewport.h"
 /* #include "topview.h" */
 #include "selectionfuncs.h"
-#include "memory.h"
+#include <common/memory.h>
 
 //Menu Items 
 

diff --git a/cmd/smyrna/gui/frmobjectui.c b/cmd/smyrna/gui/frmobjectui.c
index 005582b71f7edf8b0484fa885be4386a0f63c67b..18008f0c2c008b24498ed03f4777cbe7155cf4be 100644 (file)
--- a/cmd/smyrna/gui/frmobjectui.c
+++ b/cmd/smyrna/gui/frmobjectui.c
@@ -20,12 +20,12 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include "viewport.h"
-#include "memory.h"
+#include <common/memory.h>
 #include "frmobjectui.h"
 #include <assert.h>
-#include "sfstr.h"
+#include <ast/sfstr.h>
 #include "gvprpipe.h"
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 static attr_t *binarySearch(attr_list * l, char *searchKey);
 static int sel_node;

diff --git a/cmd/smyrna/gui/glcompui.c b/cmd/smyrna/gui/glcompui.c
index 56f36e07b89c43ebe8f56e527c02dbdf0394b409..d03190c8d5f297ea2df6b43dc14975aa72723bfb 100644 (file)
--- a/cmd/smyrna/gui/glcompui.c
+++ b/cmd/smyrna/gui/glcompui.c
@@ -12,12 +12,12 @@
  *************************************************************************/
 
 #include "glcompui.h"
-#include "glcompbutton.h"
-#include "glcomppanel.h"
-#include "glcomplabel.h"
-#include "glcompimage.h"
+#include <glcomp/glcompbutton.h>
+#include <glcomp/glcomppanel.h>
+#include <glcomp/glcomplabel.h>
+#include <glcomp/glcompimage.h>
 #include "gltemplate.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "glmotion.h"
 #include "topfisheyeview.h"
 #include "toolboxcallbacks.h"

diff --git a/cmd/smyrna/gui/gui.c b/cmd/smyrna/gui/gui.c
index a16ee1274272fc669bf3ee8f798dc29f78316fcc..2d3ac2605616b4036c65e71c8bb4e60e1d8df6a0 100644 (file)
--- a/cmd/smyrna/gui/gui.c
+++ b/cmd/smyrna/gui/gui.c
@@ -19,8 +19,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include "viewport.h"
-#include "memory.h"
-#include "strcasecmp.h"
+#include <common/memory.h>
+#include <cgraph/strcasecmp.h>
 
 
 static char guibuffer[BUFSIZ]; //general purpose buffer

diff --git a/cmd/smyrna/gui/gui.h b/cmd/smyrna/gui/gui.h
index 3e189036da4c877ecb1cdb17fd7adaea3e003719..53c5338e7e6c052e3ff19737839fdc86321188a3 100644 (file)
--- a/cmd/smyrna/gui/gui.h
+++ b/cmd/smyrna/gui/gui.h
@@ -20,8 +20,8 @@
 #include <gtk/gtkgl.h>
 #include <glade/glade.h>
 #include "callbacks.h"
-#include "cgraph.h"
-#include <agxbuf.h>
+#include <cgraph/cgraph.h>
+#include <cgraph/agxbuf.h>
 
 #define MAXIMUM_WIDGET_COUNT   97
 

diff --git a/cmd/smyrna/gui/menucallbacks.c b/cmd/smyrna/gui/menucallbacks.c
index 48685c7f644690ca506b21dbf1bd6c9cf425106e..97604c9de3767375fc91fd32451a90a9f0b06466 100644 (file)
--- a/cmd/smyrna/gui/menucallbacks.c
+++ b/cmd/smyrna/gui/menucallbacks.c
@@ -19,9 +19,9 @@
 #include "gvprpipe.h"
 #include "topviewsettings.h"
 #include "gltemplate.h"
-#include "memory.h"
-#include <const.h>
-#include <agxbuf.h>
+#include <common/memory.h>
+#include <common/const.h>
+#include <cgraph/agxbuf.h>
 #include <assert.h>
 #include <ctype.h>
 #include  "frmobjectui.h"

diff --git a/cmd/smyrna/gui/toolboxcallbacks.c b/cmd/smyrna/gui/toolboxcallbacks.c
index 2c1c2250cd16ef2b959a2479a908339e4f50c1c8..2ff83473b8bdf041cfc7941726ad41e50c6fd532 100644 (file)
--- a/cmd/smyrna/gui/toolboxcallbacks.c
+++ b/cmd/smyrna/gui/toolboxcallbacks.c
@@ -15,7 +15,7 @@
 #include "viewport.h"
 
 #include "gltemplate.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "glmotion.h"
 
 

diff --git a/cmd/smyrna/gui/topviewsettings.c b/cmd/smyrna/gui/topviewsettings.c
index 82ccd0be5a1bed4cb2132402a76b9385611dfdb0..9036259c4a967b6f5c69097daf3b2590f96ed8cd 100644 (file)
--- a/cmd/smyrna/gui/topviewsettings.c
+++ b/cmd/smyrna/gui/topviewsettings.c
@@ -14,9 +14,9 @@
 #include "topviewfuncs.h"
 #include "topviewsettings.h"
 #include "gui.h"
-#include "colorprocs.h"
+#include <common/colorprocs.h>
 #include "viewport.h"
-#include "memory.h"
+#include <common/memory.h>
 
 void color_change_request(GtkWidget * widget, gpointer user_data)
 {

diff --git a/cmd/smyrna/gvprpipe.c b/cmd/smyrna/gvprpipe.c
index 821455dd8d9a2bb3be582975529e05573b9402cb..ed417ed969a57df99180c9ec081aca384c090348 100644 (file)
--- a/cmd/smyrna/gvprpipe.c
+++ b/cmd/smyrna/gvprpipe.c
@@ -13,7 +13,7 @@
 
 #include "smyrnadefs.h"
 #include "gvprpipe.h"
-#include "const.h"
+#include <common/const.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -26,7 +26,7 @@
 #include <viewport.h>
 //#include <gltemplate.h> 
 
-#include <gvpr.h>
+#include <gvpr/gvpr.h>
 extern GladeXML *xml;          //global libglade vars
 
 /*    typedef struct {

diff --git a/cmd/smyrna/gvprpipe.h b/cmd/smyrna/gvprpipe.h
index 5e188411f5755d7f3fd4b57feb53132489389f0f..031a12a39f19e279ab53129ef5c40568f1d5fdb3 100644 (file)
--- a/cmd/smyrna/gvprpipe.h
+++ b/cmd/smyrna/gvprpipe.h
@@ -14,7 +14,7 @@
 #ifndef GVPRPIPE_H
 #define GVPRPIPE_H
 
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cmd/smyrna/hier.c b/cmd/smyrna/hier.c
index af94713e542f961f4b6b11b1cbe74cf5d6a74a85..e65dd2c291cbf9961cbc16787e72a986a79ef1e5 100644 (file)
--- a/cmd/smyrna/hier.c
+++ b/cmd/smyrna/hier.c
@@ -13,8 +13,8 @@
 
 #include "smyrnadefs.h"
 #include "hier.h"
-#include "delaunay.h"
-#include "memory.h"
+#include <neatogen/delaunay.h>
+#include <common/memory.h>
 
 /* scale_coords:
  */

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 5f417ebf04d6e3f55e6e0e7cf26e2366006e50c9..b742c370ee489e0ba4a926736818df6111d5507e 100644 (file)
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -28,7 +28,7 @@
 #include "support.h"
 #include "menucallbacks.h"
 #include "gltemplate.h"
-#include "memory.h"
+#include <common/memory.h>
 #include "gvprpipe.h"
 #include "frmobjectui.h"
 #ifdef ENABLE_NLS

diff --git a/cmd/smyrna/polytess.c b/cmd/smyrna/polytess.c
index 2c96d6fc180fc3e5bc66b54b33e4ae9d90ffe4c5..2727045faaf22116aeedad2a7a3c1d63f3450954 100644 (file)
--- a/cmd/smyrna/polytess.c
+++ b/cmd/smyrna/polytess.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include "polytess.h"
-#include "xdot.h"
+#include <xdot/xdot.h>
 tessPoly TP;
 #if 0
 GLdouble star[5][3] = { 0.6f,  -0.1f, 0.0f,

diff --git a/cmd/smyrna/smyrna.vcxproj b/cmd/smyrna/smyrna.vcxproj
index b88bd1af8350c95fcf234caddd023abc4532dfe6..5575358754f3565dbc07dcdb24fad30cddf844be 100644 (file)
--- a/cmd/smyrna/smyrna.vcxproj
+++ b/cmd/smyrna/smyrna.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\freeglut.dll $(OutDir)
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/smyrna/smyrna_utils.c b/cmd/smyrna/smyrna_utils.c
index d4e29a33c6ffa790a1e201e5c7f8466acfe77842..9cd0076dee1c8f0ddb557cfec6d55747b7d2e026 100644 (file)
--- a/cmd/smyrna/smyrna_utils.c
+++ b/cmd/smyrna/smyrna_utils.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 #include "smyrna_utils.h"
-#include "memory.h"
-#include "strcasecmp.h"
+#include <common/memory.h>
+#include <cgraph/strcasecmp.h>
 /* many of these functions are available in libcommon.
  * We cannot use those because dependencies cause a great
  * deal of libcommon to be brought in, which complicates

diff --git a/cmd/smyrna/smyrna_utils.h b/cmd/smyrna/smyrna_utils.h
index f8e45dc069dd01333869bd39cf5e17c4463aa7be..6da2a885360248996b25ee9c146d646c0d3a8561 100644 (file)
--- a/cmd/smyrna/smyrna_utils.h
+++ b/cmd/smyrna/smyrna_utils.h
@@ -14,7 +14,7 @@
 #define SMYRNA_UTILS_H
 
 #include "smyrnadefs.h"
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 
 extern char *xml_string(char *s);
 extern int l_int(void *obj, Agsym_t * attr, int def);

diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index 0106af2f2c0b86a94609987441fc9f59b2412e46..4124675c7f0d1997e059268717370c3bd3521d9d 100644 (file)
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -24,16 +24,16 @@
 #define _BB
 #endif
 
-#include "xdot.h"
+#include <xdot/xdot.h>
 #include <gtk/gtk.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <gtk/gtkgl.h>
-#include "cgraph.h"
-#include "glcompset.h"
+#include <cgraph/cgraph.h>
+#include <glcomp/glcompset.h>
 #include "hier.h"
 #include "md5.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index e173a25878fb06fbd3f456d9bad177c9d2187bfc..77698e7737623c1c82943158eabb98e66a5deb72 100644 (file)
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -14,19 +14,19 @@
 
 //#include "glcomptext.h"
 //#include "glcomptextpng.h"
-#include "math.h"
-#include "memory.h"
+#include <math.h>
+#include <common/memory.h>
 #include "viewport.h"
 #include "viewportcamera.h"
 #include "draw.h"
 #include "smyrna_utils.h"
 
-#include "assert.h"
+#include <assert.h>
 #include "hier.h"
 #include "topfisheyeview.h"
 #include <string.h>
-#include "color.h"
-#include "colorprocs.h"
+#include <common/color.h>
+#include <common/colorprocs.h>
 
 #ifdef _WIN32
 #include <wincrypt.h>

diff --git a/cmd/smyrna/topviewdata.c b/cmd/smyrna/topviewdata.c
index 01771c46378c8c57905140e7f8ce034c7969c0aa..5b34ad59db85e447650317f1a94fa5ed0407f294 100644 (file)
--- a/cmd/smyrna/topviewdata.c
+++ b/cmd/smyrna/topviewdata.c
@@ -13,10 +13,10 @@
 
 #include "topviewdata.h"
 #include "btree.h"
-#include "glcomppanel.h"
-#include "glcompbutton.h"
+#include <glcomp/glcomppanel.h>
+#include <glcomp/glcompbutton.h>
 
-#include <memory.h>
+#include <common/memory.h>
 
 static int validate_group_node(tv_node * TV_Node, char *regex_string)
 {

diff --git a/cmd/smyrna/topviewdata.h b/cmd/smyrna/topviewdata.h
index b02e4335bfbf59207592be90c36505c7425db6a4..b9b7f89ebd6f4450d3e4d10d844b3b119e47323a 100644 (file)
--- a/cmd/smyrna/topviewdata.h
+++ b/cmd/smyrna/topviewdata.h
@@ -14,7 +14,7 @@
 #define TOPVIEWDATA_H
 
 #include <gtk/gtk.h>
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 #include "smyrnadefs.h"
 #include "tvnodes.h"
 

diff --git a/cmd/smyrna/topviewdefs.h b/cmd/smyrna/topviewdefs.h
index 12a0c64a5cbd503f3ce2fce9c2056bf13ac99aae..b5b075fd9f3b4cec8d7f02168b730f2676dc913f 100644 (file)
--- a/cmd/smyrna/topviewdefs.h
+++ b/cmd/smyrna/topviewdefs.h
@@ -15,7 +15,7 @@
 #include "smyrnadefs.h"
 #include "gui.h"
 #include "tvnodes.h"
-#include "glcompset.h"
+#include <glcomp/glcompset.h>
 
 
 

diff --git a/cmd/smyrna/topviewfuncs.c b/cmd/smyrna/topviewfuncs.c
index cc90415e297569db8c9a86d2c0ac7790d8c9ae34..3c8eb5fa33d440715aeb907188ac0c465d1c94b4 100644 (file)
--- a/cmd/smyrna/topviewfuncs.c
+++ b/cmd/smyrna/topviewfuncs.c
@@ -12,15 +12,15 @@
  *************************************************************************/
 
 #include "topviewfuncs.h"
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 #include "smyrna_utils.h"
-#include "colorprocs.h"
+#include <common/colorprocs.h>
 #include "draw.h"
 #include "frmobjectui.h"
-#include "xdot.h"
-#include "glutils.h"
+#include <xdot/xdot.h>
+#include <glcomp/glutils.h>
 #include "selectionfuncs.h"
-#include "memory.h"
+#include <common/memory.h>
 #include <ctype.h>
 
 static xdot *parseXdotwithattrs(void *e)

diff --git a/cmd/smyrna/tvnodes.c b/cmd/smyrna/tvnodes.c
index 664b5f912669a48ac129ae61fdc81e385ca89e73..cd94e7b16c9c6da4168be8fba0a58809bdc40101 100644 (file)
--- a/cmd/smyrna/tvnodes.c
+++ b/cmd/smyrna/tvnodes.c
@@ -14,7 +14,7 @@
 #include "tvnodes.h"
 #include "viewport.h"
 #include "topviewfuncs.h"
-#include "memory.h"
+#include <common/memory.h>
 
 typedef struct {
     GType type;

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index 1850d5878447b58167352e3d2e8bd4765b4806b6..964c3bc15d0661fd78c9d9e805a31a9124ad30e5 100644 (file)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -14,26 +14,26 @@
 #include <windows.h>
 #include <io.h>
 #else
-#include "unistd.h"
+#include <unistd.h>
 #endif
 #include "viewport.h"
 #include "draw.h"
-#include "color.h"
+#include <common/color.h>
 #include <glade/glade.h>
 #include "gui.h"
 #include "menucallbacks.h"
-#include "string.h"
+#include <string.h>
 #include "glcompui.h"
 /* #include "topview.h" */
 #include "gltemplate.h"
-#include "colorprocs.h"
-#include "memory.h"
+#include <common/colorprocs.h>
+#include <common/memory.h>
 #include "topviewsettings.h"
 #include "md5.h"
 #include "arcball.h"
 #include "hotkeymap.h"
 #include "topviewfuncs.h"
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 
   /* Forward declarations */

diff --git a/cmd/smyrna/viewport.h b/cmd/smyrna/viewport.h
index c337de6b68d9397769d11b6152aa50c55dac5d09..deacd17ef0425660e286832eaa7dee2ffb10e7ef 100644 (file)
--- a/cmd/smyrna/viewport.h
+++ b/cmd/smyrna/viewport.h
@@ -17,8 +17,8 @@
 #define bool int
 #include "smyrnadefs.h"
 #include <gtk/gtk.h>
-#include "xdot.h"
-#include "cgraph.h"
+#include <xdot/xdot.h>
+#include <cgraph/cgraph.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cmd/smyrna/viewportcamera.c b/cmd/smyrna/viewportcamera.c
index 82fa9d284f2ba6eb1b6d15de6b95beb87335a441..57aeaab2320c466ee294fad0cd4638b8517da8c1 100644 (file)
--- a/cmd/smyrna/viewportcamera.c
+++ b/cmd/smyrna/viewportcamera.c
@@ -13,11 +13,11 @@
 
 #include "viewportcamera.h"
 #include "gui.h"
-#include "math.h"
-#include "memory.h"
-#include "glcompbutton.h"
-#include "glcomplabel.h"
-#include "glcomppanel.h"
+#include <math.h>
+#include <common/memory.h>
+#include <glcomp/glcompbutton.h>
+#include <glcomp/glcomplabel.h>
+#include <glcomp/glcomppanel.h>
 
 
 static viewport_camera *new_viewport_camera(ViewInfo * view)

diff --git a/cmd/smyrna/viewportcamera.h b/cmd/smyrna/viewportcamera.h
index d3eb268320b24e412aac6e6eb633bff8594d02e2..075f43b4ea9a718e9d8b17bab3648cb172c97b53 100644 (file)
--- a/cmd/smyrna/viewportcamera.h
+++ b/cmd/smyrna/viewportcamera.h
@@ -14,7 +14,7 @@
 #define VIEWPORTCAMERA_H
 
 #include "smyrnadefs.h"
-#include "glcompset.h"
+#include <glcomp/glcompset.h>
 
 #ifdef __cplusplus
 extern "C" {