disambiguate lib/inkpot/*.c #includes

Related to #1785.

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index f52d57b8aeda0b21c74826bf66551ab49528755c..e95dd2a7fcf53d9558b65c1d23496d80eb825e53 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -6,6 +6,8 @@ INKPOT_VERSION="1:0:0"
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+
 pkginclude_HEADERS = inkpot.h
 lib_LTLIBRARIES = libinkpot.la
 pkgconfig_DATA = libinkpot.pc

diff --git a/lib/inkpot/data/xcolors.c b/lib/inkpot/data/xcolors.c
index bdd106ddec9ef3460249593923222a6564ab26e7..0617da0f5d5ae541b9c55f615a220e5659fb5df7 100644 (file)
--- a/lib/inkpot/data/xcolors.c
+++ b/lib/inkpot/data/xcolors.c
@@ -13,7 +13,7 @@
  */
 
 #include <tkInt.h>
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 /*
  * This value will be set to the number of colors in the color table

diff --git a/lib/inkpot/inkpot.c b/lib/inkpot/inkpot.c
index 49d93af0517031940aa97ffa4277f55052f680d9..44b4b10712dbc485c9c296a4750d6965eccaff9b 100644 (file)
--- a/lib/inkpot/inkpot.c
+++ b/lib/inkpot/inkpot.c
@@ -17,7 +17,7 @@
 #include <getopt.h>
 #include <assert.h>
 
-#include "inkpot.h"
+#include <inkpot/inkpot.h>
 
 char *Info[] = {
     "inkpot",                   /* Program */

diff --git a/lib/inkpot/inkpot_scheme.c b/lib/inkpot/inkpot_scheme.c
index 1cc10d326e534d9a744a75a974b511735d3dd35b..2c94c8cf920d1c04d4ddf0077273d94fe39e8c97 100644 (file)
--- a/lib/inkpot/inkpot_scheme.c
+++ b/lib/inkpot/inkpot_scheme.c
@@ -17,14 +17,14 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "inkpot.h"
-
-#include "inkpot_lib_define.h"
-#include "inkpot_value.h"
-#include "inkpot_scheme.h"
-#include "inkpot_xlate.h"
-#include "inkpot_lib_scheme.h"
-#include "inkpot_lib_string.h"
+#include <inkpot/inkpot.h>
+
+#include <inkpot/inkpot_lib_define.h>
+#include <inkpot/inkpot_value.h>
+#include <inkpot/inkpot_scheme.h>
+#include <inkpot/inkpot_xlate.h>
+#include <inkpot/inkpot_lib_scheme.h>
+#include <inkpot/inkpot_lib_string.h>
 
 static size_t inkpot_writer (void *closure, const char *data, size_t length)
 {

diff --git a/lib/inkpot/inkpot_value.c b/lib/inkpot/inkpot_value.c
index f4accbc2c31a777500d581afce76370db69b4368..ec43c9cc509528abca2264ab53503d3a2b85a4f3 100644 (file)
--- a/lib/inkpot/inkpot_value.c
+++ b/lib/inkpot/inkpot_value.c
@@ -15,10 +15,10 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "inkpot.h"
-#include "inkpot_lib_define.h"
-#include "inkpot_value.h"
-#include "inkpot_lib_value.h"
+#include <inkpot/inkpot.h>
+#include <inkpot/inkpot_lib_define.h>
+#include <inkpot/inkpot_value.h>
+#include <inkpot/inkpot_lib_value.h>
 
 inkpot_status_t inkpot_value_set ( inkpot_values_t *values, inkpot_value_t *value )
 {

diff --git a/lib/inkpot/inkpot_xlate.c b/lib/inkpot/inkpot_xlate.c
index ed35dd63a43b5b80fa8c8d6b612d87e6d302075a..b897f8f1169b08191933a94bea35bc78029d859f 100644 (file)
--- a/lib/inkpot/inkpot_xlate.c
+++ b/lib/inkpot/inkpot_xlate.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "inkpot_xlate.h"
+#include <inkpot/inkpot_xlate.h>
 
 void hsva2rgba(double hsva[4], double rgba[4])
 {