Move the headers under include/X11/...

I kinda hate to do this, it was nice to have everything in one place.
However, the meson build wants to be able to wrap this module as a
dependency, and code that depends on these headers includes them in the
form:

    #include <X11/Xfuncproto.h>

As a result, any include path meson can construct needs to point to the
root of a hierarchy that has the same path layout as an installed copy,
hence this change.

Signed-off-by: Adam Jackson <ajax@redhat.com>

Makefile.am

@@ -1,22 +1,24 @@
 applewmdir = $(includedir)/X11/extensions
 applewm_HEADERS = \
-        applewmconst.h \
-	applewmproto.h
+        include/X11/extensions/applewmconst.h \
+	include/X11/extensions/applewmproto.h
 
 applewmprotopkgconfigdir = $(datadir)/pkgconfig
 applewmprotopkgconfig_DATA = applewmproto.pc
 
 bigreqsdir = $(includedir)/X11/extensions
 bigreqs_HEADERS = \
-	bigreqsproto.h \
-	bigreqstr.h
+	include/X11/extensions/bigreqsproto.h \
+	include/X11/extensions/bigreqstr.h
 
 bigreqsprotopkgconfigdir = $(datadir)/pkgconfig
 bigreqsprotopkgconfig_DATA = bigreqsproto.pc
 
 if LEGACY
 XCalibrateincludedir = $(includedir)/X11/extensions
-XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h
+XCalibrateinclude_HEADERS = 
+	include/X11/extensions/xcalibrateproto.h \
+	include/X11/extensions/xcalibratewire.h
 
 calibrateprotopkgconfigdir = $(datadir)/pkgconfig
 calibrateprotopkgconfig_DATA = xcalibrateproto.pc
@@ -26,36 +28,39 @@ endif
 
 compositedir = $(includedir)/X11/extensions
 composite_HEADERS = \
-	composite.h \
-	compositeproto.h
+	include/X11/extensions/composite.h \
+	include/X11/extensions/compositeproto.h
 
 compositeprotopkgconfigdir = $(datadir)/pkgconfig
 compositeprotopkgconfig_DATA = compositeproto.pc
 
 damagedir = $(includedir)/X11/extensions
 damage_HEADERS = \
-	damageproto.h \
-	damagewire.h
+	include/X11/extensions/damageproto.h \
+	include/X11/extensions/damagewire.h
 
 damageprotopkgconfigdir = $(datadir)/pkgconfig
 damageprotopkgconfig_DATA = damageproto.pc
 
 dmxdir = $(includedir)/X11/extensions
 dmx_HEADERS = \
-	dmx.h \
-	dmxproto.h
+	include/X11/extensions/dmx.h \
+	include/X11/extensions/dmxproto.h
 
 dmxprotopkgconfigdir = $(datadir)/pkgconfig
 dmxprotopkgconfig_DATA = dmxproto.pc
 
 dri2dir = $(includedir)/X11/extensions
-dri2_HEADERS = dri2proto.h dri2tokens.h
+dri2_HEADERS = \
+	include/X11/extensions/dri2proto.h \
+	include/X11/extensions/dri2tokens.h
 
 dri2protopkgconfigdir = $(datadir)/pkgconfig
 dri2protopkgconfig_DATA = dri2proto.pc
 
 dri3dir = $(includedir)/X11/extensions
-dri3_HEADERS = dri3proto.h
+dri3_HEADERS = \
+	include/X11/extensions/dri3proto.h
 
 dri3protopkgconfigdir = $(datadir)/pkgconfig
 dri3protopkgconfig_DATA = dri3proto.pc
@@ -63,8 +68,8 @@ dri3protopkgconfig_DATA = dri3proto.pc
 if LEGACY
 eviedir = $(includedir)/X11/extensions
 evie_HEADERS = \
-	evieproto.h \
-	Xeviestr.h
+	include/X11/extensions/evieproto.h \
+	include/X11/extensions/Xeviestr.h
 
 evieprotopkgconfigdir = $(datadir)/pkgconfig
 evieprotopkgconfig_DATA = evieproto.pc
@@ -74,8 +79,8 @@ endif
 
 fixesdir = $(includedir)/X11/extensions
 fixes_HEADERS = \
-	xfixesproto.h \
-	xfixeswire.h
+	include/X11/extensions/xfixesproto.h \
+	include/X11/extensions/xfixeswire.h
 
 fixesprotopkgconfigdir = $(datadir)/pkgconfig
 fixesprotopkgconfig_DATA = fixesproto.pc
@@ -83,9 +88,9 @@ fixesprotopkgconfig_DATA = fixesproto.pc
 if LEGACY
 fontcachedir = $(includedir)/X11/extensions
 fontcache_HEADERS = \
-	fontcache.h \
-	fontcacheP.h \
-	fontcachstr.h
+	include/X11/extensions/fontcache.h \
+	include/X11/extensions/fontcacheP.h \
+	include/X11/extensions/fontcachstr.h
 
 fontcacheprotopkgconfigdir = $(datadir)/pkgconfig
 fontcacheprotopkgconfig_DATA = fontcacheproto.pc
@@ -95,12 +100,12 @@ endif
 
 fontsdir = $(includedir)/X11/fonts
 fonts_HEADERS = \
-	font.h \
-	fontproto.h \
-	fontstruct.h \
-	FS.h \
-	fsmasks.h \
-	FSproto.h
+	include/X11/fonts/font.h \
+	include/X11/fonts/fontproto.h \
+	include/X11/fonts/fontstruct.h \
+	include/X11/fonts/FS.h \
+	include/X11/fonts/fsmasks.h \
+	include/X11/fonts/FSproto.h
 
 fontsprotopkgconfigdir = $(datadir)/pkgconfig
 fontsprotopkgconfig_DATA = fontsproto.pc
@@ -123,28 +128,29 @@ glproto_EXTRA_DIST = meson.build
 
 inputdir = $(includedir)/X11/extensions
 input_HEADERS = \
-	XI.h \
-	XIproto.h \
-	XI2.h \
-	XI2proto.h
+	include/X11/extensions/XI.h \
+	include/X11/extensions/XIproto.h \
+	include/X11/extensions/XI2.h \
+	include/X11/extensions/XI2proto.h
 
 inputprotopkgconfigdir = $(datadir)/pkgconfig
 inputprotopkgconfig_DATA = inputproto.pc
 
 kbdir = $(includedir)/X11/extensions
 kb_HEADERS = \
-	XKBgeom.h \
-	XKB.h \
-	XKBproto.h \
-	XKBsrv.h \
-	XKBstr.h
+	include/X11/extensions/XKBgeom.h \
+	include/X11/extensions/XKB.h \
+	include/X11/extensions/XKBproto.h \
+	include/X11/extensions/XKBsrv.h \
+	include/X11/extensions/XKBstr.h
 
 kbprotopkgconfigdir = $(datadir)/pkgconfig
 kbprotopkgconfig_DATA = kbproto.pc
 
 if LEGACY
 lg3ddir = $(includedir)/X11/extensions
-lg3d_HEADERS = lgewire.h
+lg3d_HEADERS = \
+	include/X11/extensions/lgewire.h
 
 lg3dprotopkgconfigdir = $(datadir)/pkgconfig
 lg3dprotopkgconfig_DATA = lg3dproto.pc
@@ -154,8 +160,8 @@ endif
 
 xproxymngdir = $(includedir)/X11/PM
 xproxymng_HEADERS = \
-	PM.h \
-	PMproto.h
+	include/X11/PM/PM.h \
+	include/X11/PM/PMproto.h
 
 pmprotopkgconfigdir = $(datadir)/pkgconfig
 pmprotopkgconfig_DATA = xproxymngproto.pc
@@ -163,7 +169,9 @@ pmprotopkgconfig_DATA = xproxymngproto.pc
 pmproto_EXTRA_DIST = xproxymngproto.pc.in
 
 presentdir = $(includedir)/X11/extensions
-present_HEADERS = presentproto.h presenttokens.h
+present_HEADERS = \
+	include/X11/extensions/presentproto.h \
+	include/X11/extensions/presenttokens.h
 
 presentprotopkgconfigdir = $(datadir)/pkgconfig
 presentprotopkgconfig_DATA = presentproto.pc
@@ -171,8 +179,8 @@ presentprotopkgconfig_DATA = presentproto.pc
 if LEGACY
 printdir = $(includedir)/X11/extensions
 print_HEADERS = \
-	Print.h \
-	Printstr.h
+	include/X11/extensions/Print.h \
+	include/X11/extensions/Printstr.h
 
 printprotopkgconfigdir = $(datadir)/pkgconfig
 printprotopkgconfig_DATA = printproto.pc
@@ -215,53 +223,53 @@ endif
 
 randrdir = $(includedir)/X11/extensions
 randr_HEADERS = \
-	randr.h \
-	randrproto.h
+	include/X11/extensions/randr.h \
+	include/X11/extensions/randrproto.h
 
 randrprotopkgconfigdir = $(datadir)/pkgconfig
 randrprotopkgconfig_DATA = randrproto.pc
 
 recorddir = $(includedir)/X11/extensions
 record_HEADERS = \
-	recordconst.h \
-	recordproto.h \
-	recordstr.h
+	include/X11/extensions/recordconst.h \
+	include/X11/extensions/recordproto.h \
+	include/X11/extensions/recordstr.h
 
 recordprotopkgconfigdir = $(datadir)/pkgconfig
 recordprotopkgconfig_DATA = recordproto.pc
 
 renderdir = $(includedir)/X11/extensions
 render_HEADERS = \
-	render.h \
-	renderproto.h
+	include/X11/extensions/render.h \
+	include/X11/extensions/renderproto.h
 
 renderprotopkgconfigdir = $(datadir)/pkgconfig
 renderprotopkgconfig_DATA = renderproto.pc
 
 resourcedir = $(includedir)/X11/extensions
 resource_HEADERS = \
-	XResproto.h
+	include/X11/extensions/XResproto.h
 
 resourceprotopkgconfigdir = $(datadir)/pkgconfig
 resourceprotopkgconfig_DATA = resourceproto.pc
 
 scrnsaverdir = $(includedir)/X11/extensions
 scrnsaver_HEADERS = \
-	saver.h \
-	saverproto.h
+	include/X11/extensions/saver.h \
+	include/X11/extensions/saverproto.h
 
 scrnsaverprotopkgconfigdir = $(datadir)/pkgconfig
 scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc
 
 trapdir = $(includedir)/X11/extensions
 trap_HEADERS = \
-	xtrapbits.h \
-	xtrapddmi.h \
-	xtrapdi.h \
-	xtrapemacros.h \
-	xtraplib.h \
-	xtraplibp.h \
-	xtrapproto.h
+	include/X11/extensions/xtrapbits.h \
+	include/X11/extensions/xtrapddmi.h \
+	include/X11/extensions/xtrapdi.h \
+	include/X11/extensions/xtrapemacros.h \
+	include/X11/extensions/xtraplib.h \
+	include/X11/extensions/xtraplibp.h \
+	include/X11/extensions/xtrapproto.h
 
 trapprotopkgconfigdir = $(datadir)/pkgconfig
 trapprotopkgconfig_DATA = trapproto.pc
@@ -270,139 +278,142 @@ trapproto_EXTRA_DIST = trapproto.pc.in
 
 videodir = $(includedir)/X11/extensions
 video_HEADERS = \
-	vldXvMC.h \
-	Xv.h \
-	XvMC.h \
-	XvMCproto.h \
-	Xvproto.h
+	include/X11/extensions/vldXvMC.h \
+	include/X11/extensions/Xv.h \
+	include/X11/extensions/XvMC.h \
+	include/X11/extensions/XvMCproto.h \
+	include/X11/extensions/Xvproto.h
 
 videoprotopkgconfigdir = $(datadir)/pkgconfig
 videoprotopkgconfig_DATA = videoproto.pc
 
 windowswmdir = $(includedir)/X11/extensions
 windowswm_HEADERS = \
-        windowswm.h \
-	windowswmstr.h
+        include/X11/extensions/windowswm.h \
+	include/X11/extensions/windowswmstr.h
 
 windowswmprotopkgconfigdir = $(datadir)/pkgconfig
 windowswmprotopkgconfig_DATA = windowswmproto.pc
 
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
-	ap_keysym.h \
-	DECkeysym.h \
-	HPkeysym.h \
-	keysymdef.h \
-	keysym.h \
-	Sunkeysym.h \
-	Xalloca.h \
-	Xarch.h \
-	Xatom.h \
-	Xdefs.h \
-	XF86keysym.h \
-	Xfuncs.h \
-	X.h \
-	Xmd.h \
-	Xosdefs.h \
-	Xos.h \
-	Xos_r.h \
-	Xproto.h \
-	Xprotostr.h \
-	Xthreads.h \
-	Xw32defs.h \
-	XWDFile.h \
-	Xwindows.h \
-	Xwinsock.h
+	include/X11/ap_keysym.h \
+	include/X11/DECkeysym.h \
+	include/X11/HPkeysym.h \
+	include/X11/keysymdef.h \
+	include/X11/keysym.h \
+	include/X11/Sunkeysym.h \
+	include/X11/Xalloca.h \
+	include/X11/Xarch.h \
+	include/X11/Xatom.h \
+	include/X11/Xdefs.h \
+	include/X11/XF86keysym.h \
+	include/X11/Xfuncs.h \
+	include/X11/X.h \
+	include/X11/Xmd.h \
+	include/X11/Xosdefs.h \
+	include/X11/Xos.h \
+	include/X11/Xos_r.h \
+	include/X11/Xproto.h \
+	include/X11/Xprotostr.h \
+	include/X11/Xthreads.h \
+	include/X11/Xw32defs.h \
+	include/X11/XWDFile.h \
+	include/X11/Xwindows.h \
+	include/X11/Xwinsock.h
 
 nodist_xproto_HEADERS = \
-	Xfuncproto.h \
-	Xpoll.h
+	include/X11/Xfuncproto.h \
+	include/X11/Xpoll.h
 
 x11protopkgconfigdir = $(datadir)/pkgconfig
 x11protopkgconfig_DATA = xproto.pc
 
 xcmiscdir = $(includedir)/X11/extensions
 xcmisc_HEADERS = \
-	xcmiscproto.h \
-	xcmiscstr.h
+	include/X11/extensions/xcmiscproto.h \
+	include/X11/extensions/xcmiscstr.h
 
 xcmiscprotopkgconfigdir = $(datadir)/pkgconfig
 xcmiscprotopkgconfig_DATA = xcmiscproto.pc
 
 xextdir = $(includedir)/X11/extensions
 xext_HEADERS = \
-	dpmsconst.h \
-	dpmsproto.h \
-        ge.h \
-        geproto.h \
-	lbx.h \
-	lbxproto.h \
-	mitmiscconst.h \
-	mitmiscproto.h \
-	multibufconst.h \
-	multibufproto.h \
-	secur.h \
-	securproto.h \
-	shapeconst.h \
-	shapeproto.h \
-	shm.h \
-	shmproto.h \
-	syncconst.h \
-	syncproto.h \
-	ag.h \
-	agproto.h \
-	cup.h \
-	cupproto.h \
-	dbe.h \
-	dbeproto.h \
-	EVI.h \
-	EVIproto.h \
-	xtestext1proto.h \
-	xtestext1const.h \
-	xtestconst.h \
-	xtestproto.h
+	include/X11/extensions/dpmsconst.h \
+	include/X11/extensions/dpmsproto.h \
+        include/X11/extensions/ge.h \
+        include/X11/extensions/geproto.h \
+	include/X11/extensions/lbx.h \
+	include/X11/extensions/lbxproto.h \
+	include/X11/extensions/mitmiscconst.h \
+	include/X11/extensions/mitmiscproto.h \
+	include/X11/extensions/multibufconst.h \
+	include/X11/extensions/multibufproto.h \
+	include/X11/extensions/secur.h \
+	include/X11/extensions/securproto.h \
+	include/X11/extensions/shapeconst.h \
+	include/X11/extensions/shapeproto.h \
+	include/X11/extensions/shm.h \
+	include/X11/extensions/shmproto.h \
+	include/X11/extensions/syncconst.h \
+	include/X11/extensions/syncproto.h \
+	include/X11/extensions/ag.h \
+	include/X11/extensions/agproto.h \
+	include/X11/extensions/cup.h \
+	include/X11/extensions/cupproto.h \
+	include/X11/extensions/dbe.h \
+	include/X11/extensions/dbeproto.h \
+	include/X11/extensions/EVI.h \
+	include/X11/extensions/EVIproto.h \
+	include/X11/extensions/xtestext1proto.h \
+	include/X11/extensions/xtestext1const.h \
+	include/X11/extensions/xtestconst.h \
+	include/X11/extensions/xtestproto.h
 
 compatdir = $(xextdir)
 compat_HEADERS = \
-	shapestr.h \
-	shmstr.h \
-	syncstr.h
+	include/X11/extensions/shapestr.h \
+	include/X11/extensions/shmstr.h \
+	include/X11/extensions/syncstr.h
 
 xextprotopkgconfigdir = $(datadir)/pkgconfig
 xextprotopkgconfig_DATA = xextproto.pc
 
 xf86bigfontdir = $(includedir)/X11/extensions
 xf86bigfont_HEADERS = \
-	xf86bigfont.h \
-	xf86bigfproto.h \
-	xf86bigfstr.h
+	include/X11/extensions/xf86bigfont.h \
+	include/X11/extensions/xf86bigfproto.h \
+	include/X11/extensions/xf86bigfstr.h
 
 xf86bigfontprotopkgconfigdir = $(datadir)/pkgconfig
 xf86bigfontprotopkgconfig_DATA = xf86bigfontproto.pc
 
 xf86dgadir = $(includedir)/X11/extensions
 xf86dga_HEADERS = \
-	xf86dga.h \
-	xf86dga1const.h \
-	xf86dga1str.h \
-	xf86dga1proto.h \
-	xf86dgaconst.h \
-	xf86dgaproto.h \
-	xf86dgastr.h
+	include/X11/extensions/xf86dga.h \
+	include/X11/extensions/xf86dga1const.h \
+	include/X11/extensions/xf86dga1str.h \
+	include/X11/extensions/xf86dga1proto.h \
+	include/X11/extensions/xf86dgaconst.h \
+	include/X11/extensions/xf86dgaproto.h \
+	include/X11/extensions/xf86dgastr.h
 
 xf86dgaprotopkgconfigdir = $(datadir)/pkgconfig
 xf86dgaprotopkgconfig_DATA = xf86dgaproto.pc
 
 xf86dridir = $(includedir)/X11/dri
-xf86dri_HEADERS = xf86dri.h xf86dristr.h xf86driproto.h
+xf86dri_HEADERS = \
+	include/X11/dri/xf86dri.h \
+	include/X11/dri/xf86dristr.h \
+	include/X11/dri/xf86driproto.h
 
 xf86driprotopkgconfigdir = $(datadir)/pkgconfig
 xf86driprotopkgconfig_DATA = xf86driproto.pc
 
 xf86miscdir = $(includedir)/X11/extensions
 xf86misc_HEADERS = \
-	xf86misc.h \
-	xf86mscstr.h
+	include/X11/extensions/xf86misc.h \
+	include/X11/extensions/xf86mscstr.h
 
 xf86miscprotopkgconfigdir = $(datadir)/pkgconfig
 xf86miscprotopkgconfig_DATA = xf86miscproto.pc
@@ -412,8 +423,8 @@ xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in
 if LEGACY
 xf86rushdir = $(includedir)/X11/extensions
 xf86rush_HEADERS = \
-	xf86rush.h \
-	xf86rushstr.h
+	include/X11/extensions/xf86rush.h \
+	include/X11/extensions/xf86rushstr.h
 
 xf86rushprotopkgconfigdir = $(datadir)/pkgconfig
 xf86rushprotopkgconfig_DATA = xf86rushproto.pc
@@ -423,16 +434,16 @@ endif
 
 xf86vidmodedir = $(includedir)/X11/extensions
 xf86vidmode_HEADERS = \
-	xf86vm.h \
-	xf86vmproto.h \
-	xf86vmstr.h
+	include/X11/extensions/xf86vm.h \
+	include/X11/extensions/xf86vmproto.h \
+	include/X11/extensions/xf86vmstr.h
 
 xf86vidmodeprotopkgconfigdir = $(datadir)/pkgconfig
 xf86vidmodeprotopkgconfig_DATA = xf86vidmodeproto.pc
 
 xineramadir = $(includedir)/X11/extensions
 xinerama_HEADERS = \
-	panoramiXproto.h
+	include/X11/extensions/panoramiXproto.h
 
 xineramaprotopkgconfigdir = $(datadir)/pkgconfig
 xineramaprotopkgconfig_DATA = xineramaproto.pc

configure.ac

@@ -38,7 +38,7 @@ XORG_WITH_XSLTPROC
 XORG_CHECK_SGML_DOCTOOLS(1.8)
 
 AC_CONFIG_HEADERS([do-not-use-config.h])
-AC_CONFIG_HEADERS([Xfuncproto.h])
+AC_CONFIG_HEADERS([include/X11/Xfuncproto.h])
 
 AC_CANONICAL_HOST
 
@@ -247,6 +247,7 @@ AC_CONFIG_FILES([applewmproto.pc
 		 fontcacheproto.pc
 		 fontsproto.pc
 		 glproto.pc
+		 include/X11/Xpoll.h
 		 inputproto.pc
 		 kbproto.pc
 		 lg3dproto.pc
@@ -271,7 +272,6 @@ AC_CONFIG_FILES([applewmproto.pc
 		 xf86rushproto.pc
 		 xf86vidmodeproto.pc
 		 xineramaproto.pc
-		 Xpoll.h
 		 xproto.pc
 		 xproxymngproto.pc])