mi: move over public SDK headers to include/

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

include/meson.build

@@ -452,6 +452,16 @@ if build_xorg
             'input.h',
             'inputstr.h',
             'list.h',
+            'micmap.h',
+            'micoord.h',
+            'migc.h',
+            'mi.h',
+            'miline.h',
+            'mioverlay.h',
+            'mipointer.h',
+            'mipointrst.h',
+            'mistruct.h',
+            'mizerarc.h',
             'misc.h',
             'miscstruct.h',
             'misync.h',

mi/meson.build

@@ -27,19 +27,6 @@ srcs_mi = [
     'mizerline.c',
 ]
 
-hdrs_mi = [
-  'micmap.h',
-  'micoord.h',
-  'migc.h',
-  'mi.h',
-  'miline.h',
-  'mioverlay.h',
-  'mipointer.h',
-  'mipointrst.h',
-  'mistruct.h',
-  'mizerarc.h',
-]
-
 libxserver_mi = static_library('xserver_mi',
     srcs_mi,
     include_directories: inc,
@@ -48,7 +35,3 @@ libxserver_mi = static_library('xserver_mi',
         m_dep,
     ],
 )
-
-if build_xorg
-    install_data(hdrs_mi, install_dir: xorgsdkdir)
-endif

mi/mi_priv.h

@@ -13,14 +13,14 @@
 #include "include/callback.h"
 #include "include/events.h"
 #include "include/gc.h"
+#include "include/mi.h"
+#include "include/micmap.h"
 #include "include/pixmap.h"
 #include "include/regionstr.h"
 #include "include/screenint.h"
 #include "include/scrnintstr.h"
 #include "include/validate.h"
 #include "include/window.h"
-#include "mi/mi.h"
-#include "mi/micmap.h"
 
 static inline void SetInstalledmiColormap(ScreenPtr s, ColormapPtr c) {
     dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c);

mi/mipointer_priv.h

@@ -9,7 +9,7 @@
 
 #include "dix/screenint_priv.h"
 #include "include/input.h"
-#include "mi/mipointer.h"
+#include "include/mipointer.h"
 
 void miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 void miPointerSetScreen(DeviceIntPtr pDev, int screen_num, int x, int y);

test/meson.build

@@ -174,7 +174,7 @@ if build_xorg
      '../mi/miinitext.c',
      '../mi/miinitext.h',
      '../mi/micmap.c',
-     '../mi/micmap.h',
+     '../include/micmap.h',
      'fixes.c',
      'input.c',
      'list.c',