From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 16 Aug 2020 23:19:20 +0000 (-0700)
Subject: disambiguate lib/glcomp/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b715573422b4ec683ffaed1d48604d07592301a;p=graphviz

disambiguate lib/glcomp/*.c #includes

Related to #1242 and #1785.
---

diff --git a/lib/glcomp/Makefile.am b/lib/glcomp/Makefile.am
index 35eb263d6..3d689b5ea 100644
--- 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 42c2bd688..2fe695fad 100644
--- 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 30026baff..bf369ebe3 100644
--- 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 d14ef31b4..ba18ae8c0 100644
--- 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 aceb41752..1be8a1179 100644
--- 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 ca0bb4963..3a6483c60 100644
--- 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 0463a231b..cbf1b3a9c 100644
--- 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 05ed2b283..866429a45 100644
--- 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 a8022f71f..6bf84d87c 100644
--- 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 ada1c5b35..7a260b14d 100644
--- 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 6c67e25e3..3a9062b16 100644
--- 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 82093cb30..1a06317dd 100644
--- 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 ba1c8f533..872a7ceb8 100644
--- 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 042362945..57333f26e 100644
--- 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 acac20deb..80443d475 100644
--- 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*/