summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-02-01 14:55:30 -0500
committerAdam Jackson <ajax@redhat.com>2018-02-01 14:55:30 -0500
commit7409bb66128a2ed853825132d5a0a9376574c97d (patch)
tree4330fcd32cb3675fdb8fcefd80ccd9be6ae45ea6
parentc9120fbdcec3bd8b52d97dd8a91e6e02b36c374e (diff)
xproto: Stop generating Xfuncproto.h
This no longer varies at compile time, yay. Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--include/X11/Xfuncproto.h (renamed from include/X11/Xfuncproto.h.in)0
3 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 9074747..f351d96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -308,6 +308,7 @@ xproto_HEADERS = \
include/X11/Xatom.h \
include/X11/Xdefs.h \
include/X11/XF86keysym.h \
+ include/X11/Xfuncproto.h \
include/X11/Xfuncs.h \
include/X11/X.h \
include/X11/Xmd.h \
@@ -323,7 +324,6 @@ xproto_HEADERS = \
include/X11/Xwinsock.h
nodist_xproto_HEADERS = \
- include/X11/Xfuncproto.h \
include/X11/Xpoll.h
x11protopkgconfigdir = $(datadir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index bc0892b..64796f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,9 +37,6 @@ XORG_WITH_FOP
XORG_WITH_XSLTPROC
XORG_CHECK_SGML_DOCTOOLS(1.8)
-AC_CONFIG_HEADERS([do-not-use-config.h])
-AC_CONFIG_HEADERS([include/X11/Xfuncproto.h])
-
AC_CANONICAL_HOST
AC_ARG_ENABLE(legacy,
diff --git a/include/X11/Xfuncproto.h.in b/include/X11/Xfuncproto.h
index 89bc96f..89bc96f 100644
--- a/include/X11/Xfuncproto.h.in
+++ b/include/X11/Xfuncproto.h