summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Roper <matthew.d.roper@intel.com>2012-10-04 14:27:39 -0700
committerKristian Høgsberg <krh@bitplanet.net>2012-10-09 23:42:52 -0400
commit0371668dcca5aa29c0fc4b59b974e40bcf073563 (patch)
tree7e3ccd3f94dda4d5fd10e7e665957e39d0f09c9d
parent6685d1930162b71d04fc3d6796b21a28dc025ab4 (diff)
Ensure cursor_data.c is included in distribution tarballsthreads
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
-rw-r--r--cursor/Makefile.am1
-rw-r--r--cursor/convert_font.c2
-rw-r--r--cursor/cursor-data.h (renamed from cursor/cursor_data.c)0
-rw-r--r--cursor/wayland-cursor.c2
4 files changed, 3 insertions, 2 deletions
diff --git a/cursor/Makefile.am b/cursor/Makefile.am
index 3987546..61029b5 100644
--- a/cursor/Makefile.am
+++ b/cursor/Makefile.am
@@ -6,6 +6,7 @@ libwayland_cursor_la_SOURCES = \
wayland-cursor.c \
os-compatibility.c \
os-compatibility.h \
+ cursor-data.h \
xcursor.c \
xcursor.h
libwayland_cursor_la_LIBADD = $(top_builddir)/src/libwayland-client.la
diff --git a/cursor/convert_font.c b/cursor/convert_font.c
index f297125..de1b8ad 100644
--- a/cursor/convert_font.c
+++ b/cursor/convert_font.c
@@ -359,7 +359,7 @@ static void
write_output_file(struct reconstructed_glyph *glyphs, int n)
{
int i, j, counter, size;
- FILE *file = fopen("cursor_data.c", "w");
+ FILE *file = fopen("cursor-data.h", "w");
uint32_t *data;
fprintf(file, "%s\n", cursor_licence);
diff --git a/cursor/cursor_data.c b/cursor/cursor-data.h
index 4c5e672..4c5e672 100644
--- a/cursor/cursor_data.c
+++ b/cursor/cursor-data.h
diff --git a/cursor/wayland-cursor.c b/cursor/wayland-cursor.c
index 33fed04..0d1fec7 100644
--- a/cursor/wayland-cursor.c
+++ b/cursor/wayland-cursor.c
@@ -181,7 +181,7 @@ wl_cursor_destroy(struct wl_cursor *cursor)
free(cursor);
}
-#include "cursor_data.c"
+#include "cursor-data.h"
static struct wl_cursor *
wl_cursor_create_from_data(struct cursor_metadata *metadata,