disambiguate lib/glcomp/*.c #includes

Related to #1242 and #1785.

diff --git a/lib/glcomp/Makefile.am b/lib/glcomp/Makefile.am
index 35eb263d692b1b1e8b78b7265a700c5da96d028c..3d689b5ea7ad2fb4ce0ee2403d833945c9167939 100644 (file)
--- a/lib/glcomp/Makefile.am
+++ b/lib/glcomp/Makefile.am
@@ -2,6 +2,7 @@
 # ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        $(GTK_CFLAGS) $(GLUT_CFLAGS) $(GTKGL_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(XRENDER_CFLAGS)
 

diff --git a/lib/glcomp/glCompTrackBar.c b/lib/glcomp/glCompTrackBar.c
index 42c2bd688d5d4a38fe7ab410afffd734a7b6f312..2fe695fad8569dfd84b02b92d60f82c7e723185a 100644 (file)
--- a/lib/glcomp/glCompTrackBar.c
+++ b/lib/glcomp/glCompTrackBar.c
@@ -10,9 +10,9 @@
  *
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
-#include "glCompTrackBar.h"
-#include "glcomptext.h"
-#include "memory.h"
+#include <glcomp/glCompTrackBar.h>
+#include <glcomp/glcomptext.h>
+#include <common/memory.h>
 
 glCompTrackBar *glCompTrackBarNew(GLfloat x, GLfloat y, GLfloat w,
                                  GLfloat h, glCompOrientation orientation)

diff --git a/lib/glcomp/glcomp.vcxproj b/lib/glcomp/glcomp.vcxproj
index 30026baff69896ac7d7e9116a7e1c7c10d416367..bf369ebe31ed74c16f3a57073ad4ba3a3d9fe4a1 100644 (file)
--- a/lib/glcomp/glcomp.vcxproj
+++ b/lib/glcomp/glcomp.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/glcomp/glcompbutton.c b/lib/glcomp/glcompbutton.c
index d14ef31b47613febdf773555e243e6ffc3b10f4a..ba18ae8c0ebfae610921705af7ea6eed3b134d37 100644 (file)
--- a/lib/glcomp/glcompbutton.c
+++ b/lib/glcomp/glcompbutton.c
@@ -11,13 +11,13 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcompbutton.h"
-#include "glcomplabel.h"
-#include "glcompimage.h"
-#include "glcompfont.h"
-#include "glutils.h"
-#include "glcompset.h"
-#include "memory.h"
+#include <glcomp/glcompbutton.h>
+#include <glcomp/glcomplabel.h>
+#include <glcomp/glcompimage.h>
+#include <glcomp/glcompfont.h>
+#include <glcomp/glutils.h>
+#include <glcomp/glcompset.h>
+#include <common/memory.h>
 #include <string.h>
 #include <GL/glut.h>
 

diff --git a/lib/glcomp/glcompfont.c b/lib/glcomp/glcompfont.c
index aceb4175240af29bb354a8d983ed927ea4291f81..1be8a11797b6e27ac71efff168c9e0673e30b23a 100644 (file)
--- a/lib/glcomp/glcompfont.c
+++ b/lib/glcomp/glcompfont.c
@@ -11,12 +11,12 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcompfont.h"
-#include "glcompset.h"
-#include "glpangofont.h"
-#include "glcomptexture.h"
-#include "glutils.h"
-#include "memory.h"
+#include <glcomp/glcompfont.h>
+#include <glcomp/glcompset.h>
+#include <glcomp/glpangofont.h>
+#include <glcomp/glcomptexture.h>
+#include <glcomp/glutils.h>
+#include <common/memory.h>
 #include <GL/glut.h>
 
 static void print_bitmap_string(void *font, char *s)

diff --git a/lib/glcomp/glcompimage.c b/lib/glcomp/glcompimage.c
index ca0bb4963999b5ada0cf735ad935daad0919f5f7..3a6483c603df46a6b00f674ff24daa5593b2bbf7 100644 (file)
--- a/lib/glcomp/glcompimage.c
+++ b/lib/glcomp/glcompimage.c
@@ -11,12 +11,12 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcompimage.h"
-#include "glcompfont.h"
-#include "glcompset.h"
-#include "glutils.h"
-#include "glcomptexture.h"
-#include "memory.h"
+#include <glcomp/glcompimage.h>
+#include <glcomp/glcompfont.h>
+#include <glcomp/glcompset.h>
+#include <glcomp/glutils.h>
+#include <glcomp/glcomptexture.h>
+#include <common/memory.h>
 
 glCompImage *glCompImageNew(glCompObj * par, GLfloat x, GLfloat y)
 {

diff --git a/lib/glcomp/glcomplabel.c b/lib/glcomp/glcomplabel.c
index 0463a231bb1309d05c97ab9f7d58d4c69405bd35..cbf1b3a9cc5021c61a22513a8aa071384c5677be 100644 (file)
--- a/lib/glcomp/glcomplabel.c
+++ b/lib/glcomp/glcomplabel.c
@@ -11,11 +11,11 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcomplabel.h"
-#include "glcompfont.h"
-#include "glcompset.h"
-#include "glutils.h"
-#include "memory.h"
+#include <glcomp/glcomplabel.h>
+#include <glcomp/glcompfont.h>
+#include <glcomp/glcompset.h>
+#include <glcomp/glutils.h>
+#include <common/memory.h>
 
 glCompLabel *glCompLabelNew(glCompObj * par, GLfloat x, GLfloat y,
                            char *text)

diff --git a/lib/glcomp/glcompmouse.c b/lib/glcomp/glcompmouse.c
index 05ed2b283a8fa31ca4bc12fa8a2286396fcc9c2b..866429a45a265dc56c01baf369be399d5d4d22ca 100644 (file)
--- a/lib/glcomp/glcompmouse.c
+++ b/lib/glcomp/glcompmouse.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcompmouse.h"
-#include "glcompfont.h"
-#include "glcompset.h"
-#include "glutils.h"
+#include <glcomp/glcompmouse.h>
+#include <glcomp/glcompfont.h>
+#include <glcomp/glcompset.h>
+#include <glcomp/glutils.h>
 
 void glCompMouseInit(glCompMouse * m)
 {

diff --git a/lib/glcomp/glcomppanel.c b/lib/glcomp/glcomppanel.c
index a8022f71f1d9ef8fe71e19ee4bdd734b17eb8ea3..6bf84d87c74740befc31f6af71e42aec6fdaf821 100644 (file)
--- a/lib/glcomp/glcomppanel.c
+++ b/lib/glcomp/glcomppanel.c
@@ -12,12 +12,12 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcomppanel.h"
-#include "glcompfont.h"
-#include "glcompset.h"
-#include "glcomptexture.h"
-#include "glutils.h"
-#include "memory.h"
+#include <glcomp/glcomppanel.h>
+#include <glcomp/glcompfont.h>
+#include <glcomp/glcompset.h>
+#include <glcomp/glcomptexture.h>
+#include <glcomp/glutils.h>
+#include <common/memory.h>
 
 glCompPanel *glCompPanelNew(glCompObj * parentObj, GLfloat x, GLfloat y,
                            GLfloat w, GLfloat h)

diff --git a/lib/glcomp/glcompset.c b/lib/glcomp/glcompset.c
index ada1c5b35c4892bb74a5e81328d26073fc9156ec..7a260b14d51de38b907eadc83598fee30353e4c1 100644 (file)
--- a/lib/glcomp/glcompset.c
+++ b/lib/glcomp/glcompset.c
@@ -11,14 +11,14 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcompset.h"
-#include "memory.h"
-#include "glcomppanel.h"
-#include "glcomplabel.h"
-#include "glcompbutton.h"
-#include "glcompmouse.h"
-
-#include "glutils.h"
+#include <glcomp/glcompset.h>
+#include <common/memory.h>
+#include <glcomp/glcomppanel.h>
+#include <glcomp/glcomplabel.h>
+#include <glcomp/glcompbutton.h>
+#include <glcomp/glcompmouse.h>
+
+#include <glcomp/glutils.h>
 //typedef enum {glPanelObj,glbuttonObj,glLabelObj,glImageObj}glObjType;
 
 static GLfloat startX, startY;

diff --git a/lib/glcomp/glcomptext.c b/lib/glcomp/glcomptext.c
index 6c67e25e3f61893c353eca4e029c83b9a7d95ec4..3a9062b165ce84dc3019fee9ef2ea57bf41b183a 100644 (file)
--- a/lib/glcomp/glcomptext.c
+++ b/lib/glcomp/glcomptext.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcomptext.h"
-#include "glpangofont.h"
-#include "glutils.h"
-#include "memory.h"
+#include <glcomp/glcomptext.h>
+#include <glcomp/glpangofont.h>
+#include <glcomp/glutils.h>
+#include <common/memory.h>
 #include <GL/glut.h>
 
 void print_bitmap_string(void *font, char *s)

diff --git a/lib/glcomp/glcomptextpng.c b/lib/glcomp/glcomptextpng.c
index 82093cb30974536df8311f28d580ec09ed80739f..1a06317ddd88ce58f301dd0830c78e517c5e5104 100644 (file)
--- a/lib/glcomp/glcomptextpng.c
+++ b/lib/glcomp/glcomptextpng.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcompfont.h"
-#include "memory.h"
+#include <glcomp/glcompfont.h>
+#include <common/memory.h>
 #include <gtk/gtk.h>
 #include <png.h>
 

diff --git a/lib/glcomp/glcomptexture.c b/lib/glcomp/glcomptexture.c
index ba1c8f533ade4d7e459b561ba4d7147f5bd110cb..872a7ceb8266ef1645e308459958b115435f878b 100644 (file)
--- a/lib/glcomp/glcomptexture.c
+++ b/lib/glcomp/glcomptexture.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glcomptexture.h"
-#include "glpangofont.h"
+#include <glcomp/glcomptexture.h>
+#include <glcomp/glpangofont.h>
 
-#include "memory.h"
+#include <common/memory.h>
 
 #if 0
 void glCompSetRemoveTexLabel(glCompSet * s, glCompFont * t)

diff --git a/lib/glcomp/glpangofont.c b/lib/glcomp/glpangofont.c
index 04236294592c1615c16e8f28ea0ea180dc495fa8..57333f26e43951df061d9ada73f4f04a4cf77163 100644 (file)
--- a/lib/glcomp/glpangofont.c
+++ b/lib/glcomp/glpangofont.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glpangofont.h"
+#include <glcomp/glpangofont.h>
 
 #define DEFAULT_FONT_FAMILY "Arial"
 #define DEFAULT_FONT_SIZE 32

diff --git a/lib/glcomp/glutils.c b/lib/glcomp/glutils.c
index acac20debeef6abfd03c627f6c7675e28a1486ad..80443d475c568b064ec9ef8e96a4d273c9d54b49 100644 (file)
--- a/lib/glcomp/glutils.c
+++ b/lib/glcomp/glutils.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "glutils.h"
-#include "stdlib.h"
-#include "string.h"
-#include "glcompdefs.h"
+#include <glcomp/glutils.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glcomp/glcompdefs.h>
 /* #include "glexpose.h" */
 
 /* at given depth value, tranforms 2d Window location to 3d gl coords*/