Switch to meson build systemHEADmaster

20 files changed, 38 insertions, 102 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c08c06a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+build*
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 3a7ce7e..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = src
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/src/colormap.c b/colormap.c
index e31a899..e31a899 100644
--- a/src/colormap.c
+++ b/colormap.c
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 6e77f4e..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,33 +0,0 @@
-AC_PREREQ([2.64])
-
-AC_INIT([csx],
-        [0.1],
-        [no bugs],
-        [csx],
-        [http://wayland.freedesktop.org/])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
-
-AM_SILENT_RULES([yes])
-
-# Check for programs
-AC_PROG_CC
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT
-
-PKG_PROG_PKG_CONFIG()
-PKG_CHECK_MODULES(CSX, [wayland-client pixman-1])
-
-if test "x$GCC" = "xyes"; then
-	GCC_CFLAGS="-Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden"
-fi
-AC_SUBST(GCC_CFLAGS)
-
-AC_CONFIG_FILES([Makefile
-		 src/Makefile])
-AC_OUTPUT
diff --git a/src/display.c b/display.c
index f83e274..f83e274 100644
--- a/src/display.c
+++ b/display.c
diff --git a/src/draw.c b/draw.c
index e7f9134..e7f9134 100644
--- a/src/draw.c
+++ b/draw.c
diff --git a/src/event.c b/event.c
index 8e527e4..8e527e4 100644
--- a/src/event.c
+++ b/event.c
diff --git a/src/font.c b/font.c
index fc3c04c..fc3c04c 100644
--- a/src/font.c
+++ b/font.c
diff --git a/src/hints.c b/hints.c
index 128e826..128e826 100644
--- a/src/hints.c
+++ b/hints.c
diff --git a/src/input.c b/input.c
index aacd5c3..aacd5c3 100644
--- a/src/input.c
+++ b/input.c
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..f4e1d21
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,29 @@
+project('csx', 'c')
+
+c = meson.get_compiler('c')
+
+wayland = dependency('wayland-client')
+pixman = dependency('pixman-1')
+xlib = dependency('x11')
+
+csx_files = files('private.h', 'display.c', 'resource.c', 'window.c',
+		  'pixmap.c', 'event.c', 'input.c', 'hints.c', 'xim.c',
+		  'draw.c', 'font.c', 'colormap.c', 'xfixes.c', 'randr.c')
+
+csx = shared_library('csx',
+		     csx_files,
+		     c_args : [ '-Wall', '-Wextra', '-Wno-unused-parameter',
+				'-Wno-missing-field-initializers', '-fvisibility=hidden',
+				'-Wstrict-prototypes', '-Wmissing-prototypes' ],
+		     dependencies : [ wayland, pixman ],
+		     install : true)
+
+executable('csx-test',
+	   files('test.c'),
+	   link_with : csx,
+	   install : false)
+
+executable('xlib-test',
+	   files('test.c'),
+	   dependencies : [ xlib ],
+	   install : false)
diff --git a/src/pixmap.c b/pixmap.c
index 8c35dff..8c35dff 100644
--- a/src/pixmap.c
+++ b/pixmap.c
diff --git a/src/private.h b/private.h
index 0ad198d..0ad198d 100644
--- a/src/private.h
+++ b/private.h
diff --git a/src/randr.c b/randr.c
index 82b65b8..7f2434c 100644
--- a/src/randr.c
+++ b/randr.c
@@ -1,31 +1,3 @@
-/*
- * Copyright © 2000 Compaq Computer Corporation, Inc.
- * Copyright © 2002 Hewlett-Packard Company, Inc.
- * Copyright © 2006 Intel Corporation
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- * Author:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.
- *	    Keith Packard, Intel Corporation
- */
-
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -423,7 +395,7 @@ XRRGetOutputProperty(Display *xdisplay, RROutput output,
 }
 
 WL_EXPORT XRRModeInfo *
-XRRAllocModeInfo(char *name, int nameLength)
+XRRAllocModeInfo(_Xconst char *name, int nameLength)
 {
 	STUB();
 
@@ -587,12 +559,12 @@ XRRGetScreenResourcesCurrent(Display *xdisplay, Window window)
 }
 
 WL_EXPORT void
-XRRSetCrtcTransform(Display	*xdisplay,
-		     RRCrtc	crtc,
-		     XTransform	*transform,
-		     char	*filter,
-		     XFixed	*params,
-		     int	nparams)
+XRRSetCrtcTransform(Display		*xdisplay,
+		    RRCrtc		 crtc,
+		    XTransform		*transform,
+		    _Xconst char	*filter,
+		    XFixed		*params,
+		    int			 nparams)
 {
 	struct csx_display *display = csx_display(xdisplay);
 	struct csx_randr *randr = display->randr;
diff --git a/src/resource.c b/resource.c
index 38f16be..38f16be 100644
--- a/src/resource.c
+++ b/resource.c
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 67e1339..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AM_CFLAGS = -Wall -Wextra -Wno-unused-parameter \
-	-Wno-missing-field-initializers -g -fvisibility=hidden \
-	-Wstrict-prototypes -Wmissing-prototypes
-
-lib_LTLIBRARIES = libcsx.la
-
-libcsx_la_LIBADD = $(CSX_LIBS)
-libcsx_la_CPPFLAGS = $(CSX_CFLAGS)
-libcsx_la_SOURCES =				\
-	private.h				\
-	display.c				\
-	resource.c				\
-	window.c				\
-	pixmap.c				\
-	event.c					\
-	input.c					\
-	hints.c					\
-	xim.c					\
-	draw.c					\
-	font.c					\
-	colormap.c				\
-	xfixes.c				\
-	randr.c
-
-noinst_PROGRAMS = csx-test xlib-test
-
-csx_test_SOURCES = test.c
-csx_test_LDADD = libcsx.la
-
-xlib_test_SOURCES = test.c
-xlib_test_LDADD = -lX11
diff --git a/src/test.c b/test.c
index f4b3990..f4b3990 100644
--- a/src/test.c
+++ b/test.c
diff --git a/src/window.c b/window.c
index 582212c..582212c 100644
--- a/src/window.c
+++ b/window.c
diff --git a/src/xfixes.c b/xfixes.c
index 4222cc3..4222cc3 100644
--- a/src/xfixes.c
+++ b/xfixes.c
diff --git a/src/xim.c b/xim.c
index f3985cb..f3985cb 100644
--- a/src/xim.c
+++ b/xim.c