libtwin includes are in $(includedir)/libtwin

This change modifies the twin sources to expect twin libraries in the
libtwin/ directory. Consequently, we need to move the headers (and
sources to keep things clean) into the libtwin/ directory in the source
tree.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

41 files changed, 55 insertions, 50 deletions

diff --git a/Makefile.am b/Makefile.am
index 57ad4ea..0adae5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,60 +3,61 @@ AM_CFLAGS = @WARN_CFLAGS@
 EXTRA_PROGRAMS =
 
 bin_PROGRAMS =
-lib_LTLIBRARIES = libtwin.la
-pkginclude_HEADERS = twin.h twin_def.h
-
-libtwin_la_LDFLAGS = -version-info @LIB_VERSION@
-libtwin_la_SOURCES = \
-	twin_box.c \
-	twin_button.c \
-	twin_convolve.c \
-	twin_cursor.c \
-	twin_dispatch.c \
-	twin_draw.c \
-	twin_hull.c \
-	twin_icon.c \
-	twin_file.c \
-	twin_fixed.c \
-	twin_font.c \
-	twin_font_default.c \
-	twin_geom.c \
-	twin_label.c \
-	twin_matrix.c \
-	twin_path.c \
-	twin_pattern.c \
-	twin_pixmap.c \
-	twin_poly.c \
-	twin_primitive.c \
-	twin_queue.c \
-	twin_screen.c \
-	twin_spline.c \
-	twin_timeout.c \
-	twin_toplevel.c \
-	twin_trig.c \
-	twin_widget.c \
-	twin_window.c \
-	twin_work.c \
-	twinint.h
+lib_LTLIBRARIES = libtwin/libtwin.la
+pkginclude_HEADERS = libtwin/twin.h
+
+libtwin_libtwin_la_LDFLAGS = -version-info @LIB_VERSION@
+libtwin_libtwin_la_SOURCES = \
+	libtwin/twin_box.c \
+	libtwin/twin_button.c \
+	libtwin/twin_convolve.c \
+	libtwin/twin_cursor.c \
+	libtwin/twin_dispatch.c \
+	libtwin/twin_draw.c \
+	libtwin/twin_hull.c \
+	libtwin/twin_icon.c \
+	libtwin/twin_file.c \
+	libtwin/twin_fixed.c \
+	libtwin/twin_font.c \
+	libtwin/twin_font_default.c \
+	libtwin/twin_geom.c \
+	libtwin/twin_label.c \
+	libtwin/twin_matrix.c \
+	libtwin/twin_path.c \
+	libtwin/twin_pattern.c \
+	libtwin/twin_pixmap.c \
+	libtwin/twin_poly.c \
+	libtwin/twin_primitive.c \
+	libtwin/twin_queue.c \
+	libtwin/twin_screen.c \
+	libtwin/twin_spline.c \
+	libtwin/twin_timeout.c \
+	libtwin/twin_toplevel.c \
+	libtwin/twin_trig.c \
+	libtwin/twin_widget.c \
+	libtwin/twin_window.c \
+	libtwin/twin_work.c \
+	libtwin/twin_def.h \
+	libtwin/twinint.h
 
 if TWIN_X11
-pkginclude_HEADERS += twin_x11.h
-libtwin_la_SOURCES += twin_x11.c
+pkginclude_HEADERS += libtwin/twin_x11.h
+libtwin_libtwin_la_SOURCES += libtwin/twin_x11.c
 endif
 
 if TWIN_FB
-pkginclude_HEADERS += twin_fbdev.h
-libtwin_la_SOURCES += twin_fbdev.c
+pkginclude_HEADERS += libtwin/twin_fbdev.h
+libtwin_libtwin_la_SOURCES += libtwin/twin_fbdev.c
 endif
 
 if TWIN_MOUSE
-pkginclude_HEADERS += twin_linux_mouse.h
-libtwin_la_SOURCES += twin_linux_mouse.c
+pkginclude_HEADERS += libtwin/twin_linux_mouse.h
+libtwin_libtwin_la_SOURCES += libtwin/twin_linux_mouse.c
 endif
 
 if TWIN_PNG
-pkginclude_HEADERS += twin_png.h
-libtwin_la_SOURCES += twin_png.c
+pkginclude_HEADERS += libtwin/twin_png.h
+libtwin_libtwin_la_SOURCES += libtwin/twin_png.c
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -77,12 +78,12 @@ endif
 
 twin_demos_xtwin_SOURCES = twin_demos/xtwin.c
 twin_demos_xtwin_CFLAGS = @TWIN_DEP_CFLAGS@ -I$(top_srcdir)/twin_demos
-twin_demos_xtwin_LDADD = twin_demos/libtwin_demos.a libtwin.la \
+twin_demos_xtwin_LDADD = twin_demos/libtwin_demos.a libtwin/libtwin.la \
 	@TWIN_DEP_LDFLAGS@
 
 twin_demos_ftwin_SOURCES = twin_demos/ftwin.c
 twin_demos_ftwin_CFLAGS = @TWIN_DEP_CFLAGS@ -I$(top_srcdir)/twin_demos
-twin_demos_ftwin_LDADD = twin_demos/libtwin_demos.a libtwin.la \
+twin_demos_ftwin_LDADD = twin_demos/libtwin_demos.a libtwin/libtwin.la \
 	@TWIN_DEP_LDFLAGS@
 
 twin_demos_libtwin_demos_a_CFLAGS = @WARN_CFLAGS@ -I$(top_srcdir)/twin_demos
@@ -95,6 +96,11 @@ twin_demos_libtwin_demos_a_SOURCES = \
 	twin_demos/twin_hello.c twin_demos/twin_hello.h \
 	twin_demos/twin_text.c twin_demos/twin_text.h
 
+# at the moment, the twin demos require twinint.h :(
+twin_demos_xtwin_CFLAGS += -I$(top_srcdir)/libtwin
+twin_demos_ftwin_CFLAGS += -I$(top_srcdir)/libtwin
+twin_demos_libtwin_demos_a_CFLAGS += -I$(top_srcdir)/libtwin
+
 # twin_ttf
 EXTRA_PROGRAMS += twin_ttf/twin_ttf
 
diff --git a/twin.h b/libtwin/twin.h
index b437861..8755da6 100644
--- a/twin.h
+++ b/libtwin/twin.h
@@ -24,7 +24,6 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <twin_def.h>
 
 typedef uint8_t	    twin_a8_t;
 typedef uint16_t    twin_a16_t;
diff --git a/twin_box.c b/libtwin/twin_box.c
index 72ed5e1..72ed5e1 100644
--- a/twin_box.c
+++ b/libtwin/twin_box.c
diff --git a/twin_button.c b/libtwin/twin_button.c
index a250753..a250753 100644
--- a/twin_button.c
+++ b/libtwin/twin_button.c
diff --git a/twin_convolve.c b/libtwin/twin_convolve.c
index 83769c7..83769c7 100644
--- a/twin_convolve.c
+++ b/libtwin/twin_convolve.c
diff --git a/twin_cursor.c b/libtwin/twin_cursor.c
index f0e5fc3..f0e5fc3 100644
--- a/twin_cursor.c
+++ b/libtwin/twin_cursor.c
diff --git a/twin_dispatch.c b/libtwin/twin_dispatch.c
index bf31fc7..bf31fc7 100644
--- a/twin_dispatch.c
+++ b/libtwin/twin_dispatch.c
diff --git a/twin_draw.c b/libtwin/twin_draw.c
index 48a9da6..48a9da6 100644
--- a/twin_draw.c
+++ b/libtwin/twin_draw.c
diff --git a/twin_fbdev.c b/libtwin/twin_fbdev.c
index a81a658..a81a658 100644
--- a/twin_fbdev.c
+++ b/libtwin/twin_fbdev.c
diff --git a/twin_fbdev.h b/libtwin/twin_fbdev.h
index 0b3bcb3..a939b2b 100644
--- a/twin_fbdev.h
+++ b/libtwin/twin_fbdev.h
@@ -21,7 +21,7 @@
 #ifndef _TWIN_FBDEV_H_
 #define _TWIN_FBDEV_H_
 
-#include "twin.h"
+#include <libtwin/twin.h>
 
 #include <termios.h>
 #include <linux/fb.h>
diff --git a/twin_file.c b/libtwin/twin_file.c
index 30ae2c1..30ae2c1 100644
--- a/twin_file.c
+++ b/libtwin/twin_file.c
diff --git a/twin_fixed.c b/libtwin/twin_fixed.c
index 060fb08..060fb08 100644
--- a/twin_fixed.c
+++ b/libtwin/twin_fixed.c
diff --git a/twin_font.c b/libtwin/twin_font.c
index f7e5d70..f7e5d70 100644
--- a/twin_font.c
+++ b/libtwin/twin_font.c
diff --git a/twin_font_default.c b/libtwin/twin_font_default.c
index 2b1c44c..2b1c44c 100644
--- a/twin_font_default.c
+++ b/libtwin/twin_font_default.c
diff --git a/twin_geom.c b/libtwin/twin_geom.c
index c292dc6..c292dc6 100644
--- a/twin_geom.c
+++ b/libtwin/twin_geom.c
diff --git a/twin_hull.c b/libtwin/twin_hull.c
index 8bd974f..8bd974f 100644
--- a/twin_hull.c
+++ b/libtwin/twin_hull.c
diff --git a/twin_icon.c b/libtwin/twin_icon.c
index 10d41b7..10d41b7 100644
--- a/twin_icon.c
+++ b/libtwin/twin_icon.c
diff --git a/twin_label.c b/libtwin/twin_label.c
index b7676f5..b7676f5 100644
--- a/twin_label.c
+++ b/libtwin/twin_label.c
diff --git a/twin_linux_mouse.c b/libtwin/twin_linux_mouse.c
index c755495..c755495 100644
--- a/twin_linux_mouse.c
+++ b/libtwin/twin_linux_mouse.c
diff --git a/twin_linux_mouse.h b/libtwin/twin_linux_mouse.h
index 1f6cc0c..1725b99 100644
--- a/twin_linux_mouse.h
+++ b/libtwin/twin_linux_mouse.h
@@ -21,7 +21,7 @@
 #ifndef _TWIN_LINUX_MOUSE_H_
 #define _TWIN_LINUX_MOUSE_H_
 
-#include "twin.h"
+#include <libtwin/twin.h>
 
 typedef struct _twin_linux_mouse {
 	twin_screen_t   *screen;
diff --git a/twin_matrix.c b/libtwin/twin_matrix.c
index 20780ec..20780ec 100644
--- a/twin_matrix.c
+++ b/libtwin/twin_matrix.c
diff --git a/twin_path.c b/libtwin/twin_path.c
index edeb517..edeb517 100644
--- a/twin_path.c
+++ b/libtwin/twin_path.c
diff --git a/twin_pattern.c b/libtwin/twin_pattern.c
index 3ba43cf..3ba43cf 100644
--- a/twin_pattern.c
+++ b/libtwin/twin_pattern.c
diff --git a/twin_pixmap.c b/libtwin/twin_pixmap.c
index e056093..e056093 100644
--- a/twin_pixmap.c
+++ b/libtwin/twin_pixmap.c
diff --git a/twin_png.c b/libtwin/twin_png.c
index afe492a..afe492a 100644
--- a/twin_png.c
+++ b/libtwin/twin_png.c
diff --git a/twin_png.h b/libtwin/twin_png.h
index a4f1e3b..dbbe595 100644
--- a/twin_png.h
+++ b/libtwin/twin_png.h
@@ -21,7 +21,7 @@
 #ifndef _TWIN_PNG_H_
 #define _TWIN_PNG_H_
 
-#include "twin.h"
+#include <libtwin/twin.h>
 
 #include <png.h>
 
diff --git a/twin_poly.c b/libtwin/twin_poly.c
index 71e5578..71e5578 100644
--- a/twin_poly.c
+++ b/libtwin/twin_poly.c
diff --git a/twin_primitive.c b/libtwin/twin_primitive.c
index 362cbf1..362cbf1 100644
--- a/twin_primitive.c
+++ b/libtwin/twin_primitive.c
diff --git a/twin_queue.c b/libtwin/twin_queue.c
index 171a6eb..171a6eb 100644
--- a/twin_queue.c
+++ b/libtwin/twin_queue.c
diff --git a/twin_screen.c b/libtwin/twin_screen.c
index 9ea46c7..9ea46c7 100644
--- a/twin_screen.c
+++ b/libtwin/twin_screen.c
diff --git a/twin_spline.c b/libtwin/twin_spline.c
index a9523d9..a9523d9 100644
--- a/twin_spline.c
+++ b/libtwin/twin_spline.c
diff --git a/twin_thread.c b/libtwin/twin_thread.c
index a38dc96..a38dc96 100644
--- a/twin_thread.c
+++ b/libtwin/twin_thread.c
diff --git a/twin_timeout.c b/libtwin/twin_timeout.c
index eeffc5f..eeffc5f 100644
--- a/twin_timeout.c
+++ b/libtwin/twin_timeout.c
diff --git a/twin_toplevel.c b/libtwin/twin_toplevel.c
index a8fd246..a8fd246 100644
--- a/twin_toplevel.c
+++ b/libtwin/twin_toplevel.c
diff --git a/twin_trig.c b/libtwin/twin_trig.c
index 1694d65..1694d65 100644
--- a/twin_trig.c
+++ b/libtwin/twin_trig.c
diff --git a/twin_widget.c b/libtwin/twin_widget.c
index 30b3ae0..30b3ae0 100644
--- a/twin_widget.c
+++ b/libtwin/twin_widget.c
diff --git a/twin_window.c b/libtwin/twin_window.c
index e1933fa..e1933fa 100644
--- a/twin_window.c
+++ b/libtwin/twin_window.c
diff --git a/twin_work.c b/libtwin/twin_work.c
index 99acbb3..99acbb3 100644
--- a/twin_work.c
+++ b/libtwin/twin_work.c
diff --git a/twin_x11.c b/libtwin/twin_x11.c
index b2f9d1e..b2f9d1e 100644
--- a/twin_x11.c
+++ b/libtwin/twin_x11.c
diff --git a/twin_x11.h b/libtwin/twin_x11.h
index 0b45215..90bdb07 100644
--- a/twin_x11.h
+++ b/libtwin/twin_x11.h
@@ -22,7 +22,7 @@
 #ifndef _TWIN_X11_H_
 #define _TWIN_X11_H_
 
-#include "twin.h"
+#include <libtwin/twin.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/twinint.h b/libtwin/twinint.h
index aa46686..aa46686 100644
--- a/twinint.h
+++ b/libtwin/twinint.h