From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 30 Aug 2020 01:42:27 +0000 (-0700)
Subject: remove the need to have lib/glcomp in the include path
X-Git-Tag: 2.46.0~20^2^2~52^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da6f68bdf66eee3ac12ea11f777b50cce6115b2d;p=graphviz

remove the need to have lib/glcomp in the include path

Related to #1785.
---

diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index 77698e773..0b63c0a18 100644
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -12,8 +12,6 @@
  *************************************************************************/
 #include "topfisheyeview.h"
 
-//#include "glcomptext.h"
-//#include "glcomptextpng.h"
 #include <math.h>
 #include <common/memory.h>
 #include "viewport.h"
diff --git a/lib/glcomp/glCompTrackBar.h b/lib/glcomp/glCompTrackBar.h
index 607679069..498699110 100644
--- a/lib/glcomp/glCompTrackBar.h
+++ b/lib/glcomp/glCompTrackBar.h
@@ -13,6 +13,6 @@
 #ifndef GLCOMPTRACKBAR_H
 #define GLCOMPTRACKBAR_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #endif
diff --git a/lib/glcomp/glcompbutton.h b/lib/glcomp/glcompbutton.h
index 82e40ba9e..220c5028e 100644
--- a/lib/glcomp/glcompbutton.h
+++ b/lib/glcomp/glcompbutton.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPBUTTON_H
 #define GLCOMPBUTTON_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/glcomp/glcompfont.h b/lib/glcomp/glcompfont.h
index e79958b9a..bb312b3f6 100644
--- a/lib/glcomp/glcompfont.h
+++ b/lib/glcomp/glcompfont.h
@@ -16,13 +16,13 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
-#include "glpangofont.h"
+#include <glcomp/glpangofont.h>
 typedef float GLfloat;
 #else
 #include <unistd.h>
 #include <GL/gl.h>
 #endif
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 #include <GL/glut.h>
 
 #ifdef __cplusplus
diff --git a/lib/glcomp/glcompimage.h b/lib/glcomp/glcompimage.h
index 19b50280f..0241233f4 100644
--- a/lib/glcomp/glcompimage.h
+++ b/lib/glcomp/glcompimage.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPIMAGE_H
 #define GLCOMPIMAGE_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/glcomp/glcomplabel.h b/lib/glcomp/glcomplabel.h
index 37961b125..a86897ef9 100644
--- a/lib/glcomp/glcomplabel.h
+++ b/lib/glcomp/glcomplabel.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPLABEL_H
 #define GLCOMPLABEL_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/glcomp/glcompmouse.h b/lib/glcomp/glcompmouse.h
index cd15d2760..081d913d0 100644
--- a/lib/glcomp/glcompmouse.h
+++ b/lib/glcomp/glcompmouse.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPMOUSE_H
 #define GLCOMPMOUSE_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/glcomp/glcomppanel.h b/lib/glcomp/glcomppanel.h
index a31090a89..21d01af81 100644
--- a/lib/glcomp/glcomppanel.h
+++ b/lib/glcomp/glcomppanel.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPPANEL_H
 #define GLCOMPPANEL_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/glcomp/glcompset.h b/lib/glcomp/glcompset.h
index 399ccdbb5..da0a68f62 100644
--- a/lib/glcomp/glcompset.h
+++ b/lib/glcomp/glcompset.h
@@ -17,8 +17,8 @@
 #ifndef GLCOMPSET_H
 #define GLCOMPSET_H
 
-#include "glcompfont.h"
-#include "glcomptextpng.h"
+#include <glcomp/glcompfont.h>
+#include <glcomp/glcomptextpng.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/glcomp/glcomptext.h b/lib/glcomp/glcomptext.h
index a1ecb3bbd..06f6feba0 100644
--- a/lib/glcomp/glcomptext.h
+++ b/lib/glcomp/glcomptext.h
@@ -16,13 +16,13 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
-#include "glpangofont.h"
+#include <glcomp/glpangofont.h>
 typedef float GLfloat;
 #else
 #include <unistd.h>
 #include <GL/gl.h>
 #endif
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 #include <GL/glut.h>
 
 #ifdef __cplusplus
diff --git a/lib/glcomp/glcomptexture.h b/lib/glcomp/glcomptexture.h
index a31288d0e..bf40ce151 100644
--- a/lib/glcomp/glcomptexture.h
+++ b/lib/glcomp/glcomptexture.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/glcomp/glutils.h b/lib/glcomp/glutils.h
index a6d31d7c1..fc8250bb3 100644
--- a/lib/glcomp/glutils.h
+++ b/lib/glcomp/glutils.h
@@ -19,7 +19,7 @@
 #endif
 #include <GL/gl.h>
 #include <GL/glu.h>
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {