summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-03-08 01:33:36 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-03-08 01:33:36 -0800
commitea72bf8742673daa1b4130cb518537f2bdd0a68f (patch)
treec867031365601d5e7b5237e9442c7e60e8c2f4a3
parent83e1aec8cfa59bd016912c6e5f22ef32408637b7 (diff)
Fix make distcheck
Rename input to nested_input to avoid conflict with xorg/input.h and actually include it in the dist tarball. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/Makefile.am2
-rw-r--r--src/driver.c2
-rw-r--r--src/nested_input.c (renamed from src/input.c)2
-rw-r--r--src/nested_input.h (renamed from src/input.h)0
-rw-r--r--src/xlibclient.c2
5 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 282127a..57f661d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,4 +27,4 @@ nested_drv_la_LTLIBRARIES = nested_drv.la
nested_drv_la_LDFLAGS = -module -avoid-version $(X11_LIBS) $(XEXT_LIBS)
nested_drv_ladir = @moduledir@/drivers
-nested_drv_la_SOURCES = driver.c input.c xlibclient.c client.h
+nested_drv_la_SOURCES = driver.c nested_input.c nested_input.h xlibclient.c client.h
diff --git a/src/driver.c b/src/driver.c
index c1ddad0..5ff6e23 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -47,7 +47,7 @@
#endif
#include "client.h"
-#include "input.h"
+#include "nested_input.h"
#define NESTED_VERSION 0
#define NESTED_NAME "NESTED"
diff --git a/src/input.c b/src/nested_input.c
index cfb54ac..9d2e0d3 100644
--- a/src/input.c
+++ b/src/nested_input.c
@@ -52,7 +52,7 @@
#endif
#include "client.h"
-#include "input.h"
+#include "nested_input.h"
#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
diff --git a/src/input.h b/src/nested_input.h
index 58002d6..58002d6 100644
--- a/src/input.h
+++ b/src/nested_input.h
diff --git a/src/xlibclient.c b/src/xlibclient.c
index 0ef3d84..f58106a 100644
--- a/src/xlibclient.c
+++ b/src/xlibclient.c
@@ -47,7 +47,7 @@
#include "client.h"
-#include "input.h"
+#include "nested_input.h"
struct NestedClientPrivate {
Display *display;