install missing headers

inc/ztoolkit/meson.build

@@ -16,11 +16,26 @@
 # along with ZToolkit.  If not, see <https://www.gnu.org/licenses/>.
 
 installable_headers += files([
+  'colors.h',
+  'log.h',
+  'math.h',
+  'rect.h',
+  'rsvg.h',
+  'types.h',
+  'ztk.h',
   'ztk_app.h',
+  'ztk_button.h',
+  'ztk_cairo.h',
   'ztk_color.h',
+  'ztk_combo_box.h',
+  'ztk_control.h',
+  'ztk_dialog.h',
+  'ztk_drawing_area.h',
   'ztk_knob.h',
   'ztk_knob_with_label.h',
   'ztk_label.h',
+  'ztk_theme.h',
   'ztk_widget.h',
-  'ztk.h',
+  join_paths ('..', '..', 'pugl', 'pugl', 'pugl.h'),
+  join_paths ('..', '..', 'pugl', 'pugl', 'pugl_cairo.h'),
   ])

inc/ztoolkit/ztk.h

@@ -21,6 +21,8 @@
 #define __Z_TOOLKIT_ZTK_H__
 
 #include "ztoolkit_config.h"
+#include "pugl.h"
+
 #include "math.h"
 #include "log.h"
 #include "rect.h"

inc/ztoolkit/ztk_app.h

@@ -23,7 +23,9 @@
 #include "ztoolkit/ztk_theme.h"
 
 #include <cairo.h>
-#include <pugl/pugl.h>
+
+typedef struct PuglWorldImpl PuglWorld;
+typedef struct PuglViewImpl PuglView;
 
 typedef struct ZtkWidget ZtkWidget;
 typedef struct ZtkRect ZtkRect;

inc/ztoolkit/ztk_button.h

@@ -20,9 +20,9 @@
 #ifndef __Z_TOOLKIT_ZTK_BUTTON_H__
 #define __Z_TOOLKIT_ZTK_BUTTON_H__
 
-#include "ztoolkit/rsvg.h"
-#include "ztoolkit/ztk_color.h"
-#include "ztoolkit/ztk_widget.h"
+#include "rsvg.h"
+#include "ztk_color.h"
+#include "ztk_widget.h"
 
 typedef struct ZtkButton ZtkButton;
 

inc/ztoolkit/ztk_control.h

@@ -20,7 +20,7 @@
 #ifndef __Z_TOOLKIT_ZTK_CONTROL_H__
 #define __Z_TOOLKIT_ZTK_CONTROL_H__
 
-#include "ztoolkit/ztk_widget.h"
+#include "ztk_widget.h"
 
 typedef struct ZtkControl ZtkControl;
 

inc/ztoolkit/ztk_dialog.h

@@ -20,9 +20,9 @@
 #ifndef __Z_TOOLKIT_ZTK_DIALOG_H__
 #define __Z_TOOLKIT_ZTK_DIALOG_H__
 
-#include "ztoolkit/rsvg.h"
-#include "ztoolkit/ztk_color.h"
-#include "ztoolkit/ztk_widget.h"
+#include "rsvg.h"
+#include "ztk_color.h"
+#include "ztk_widget.h"
 
 /**
  * Dialog type.

inc/ztoolkit/ztk_drawing_area.h

@@ -26,7 +26,7 @@
 #ifndef __Z_TOOLKIT_ZTK_DRAWING_AREA_H__
 #define __Z_TOOLKIT_ZTK_DRAWING_AREA_H__
 
-#include "ztoolkit/ztk_widget.h"
+#include "ztk_widget.h"
 
 /**
  * @addtogroup ztoolkit

inc/ztoolkit/ztk_knob.h

@@ -20,8 +20,8 @@
 #ifndef __Z_TOOLKIT_ZTK_KNOB_H__
 #define __Z_TOOLKIT_ZTK_KNOB_H__
 
-#include "ztoolkit/ztk_color.h"
-#include "ztoolkit/ztk_widget.h"
+#include "ztk_color.h"
+#include "ztk_widget.h"
 
 /**
  * Knob widget.

inc/ztoolkit/ztk_knob_with_label.h

@@ -26,7 +26,7 @@
 #ifndef __Z_TOOLKIT_ZTK_KNOB_WITH_LABEL_H__
 #define __Z_TOOLKIT_ZTK_KNOB_WITH_LABEL_H__
 
-#include "ztoolkit/ztk.h"
+#include "ztk.h"
 
 typedef struct ZtkKnob ZtkKnob;
 typedef struct ZtkLabel ZtkLabel;

inc/ztoolkit/ztk_label.h

@@ -20,7 +20,7 @@
 #ifndef __Z_TOOLKIT_ZTK_LABEL_H__
 #define __Z_TOOLKIT_ZTK_LABEL_H__
 
-#include "ztoolkit/ztk.h"
+#include "ztk.h"
 
 /**
  * Label widget.

inc/ztoolkit/ztk_theme.h

@@ -20,7 +20,7 @@
 #ifndef __Z_TOOLKIT_ZTK_THEME_H__
 #define __Z_TOOLKIT_ZTK_THEME_H__
 
-#include "ztoolkit/ztk_color.h"
+#include "ztk_color.h"
 
 /**
  * Theme colors.

inc/ztoolkit/ztk_widget.h

@@ -26,10 +26,10 @@
 #ifndef __Z_TOOLKIT_ZTK_WIDGET_H__
 #define __Z_TOOLKIT_ZTK_WIDGET_H__
 
+#include "pugl.h"
 #include "rect.h"
 
 #include <cairo.h>
-#include <pugl/pugl.h>
 
 typedef struct ZtkApp ZtkApp;
 

meson.build

@@ -87,6 +87,8 @@ inc_dirs = [
   include_directories('.'),
   include_directories('inc'),
   include_directories('pugl'),
+  include_directories(
+    join_paths ('pugl', 'pugl')),
   ]
 
 # cflags

src/ztk_app.c

@@ -23,8 +23,8 @@
 
 #include "ztoolkit/ztk.h"
 
-#include <pugl/pugl.h>
-#include <pugl/pugl_cairo.h>
+#include "pugl/pugl.h"
+#include "pugl/pugl_cairo.h"
 
 static void
 on_close (PuglView* view)

src/ztk_button.c

@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include <ztoolkit/ztk.h>
+#include "pugl.h"
 
 static void
 button_draw_cb (