Merge branch 'meson'

8 files changed, 36 insertions, 124 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 2c819b6..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) 2015-2017 Gediminas Jakutis
-#
-# This Makefile.am is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; version 2.1
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-SUBDIRS = float diagnostic gpio
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include/ \
-	-Wall \
-	-Wextra
-
-RIN_VER_MAJOR = 0
-RIN_VER_MINOR = 0
-RIN_VER_PATCH = 0
-
-lib_LTLIBRARIES = librin.la
-
-librin_la_LDFLAGS = -version-info $(RIN_VER_MAJOR):$(RIN_VER_MINOR):$(RIN_VER_PATCH)
-
-librin_la_SOURCES =
-
-librin_la_LIBADD = \
-	float/librin_float.la \
-	diagnostic/librin_diagnostic.la \
-	gpio/librin_gpio.la
-
-librin_includedir = $(includedir)/rin
-librin_include_HEADERS = \
-	$(top_srcdir)/include/rin/float.h \
-	$(top_srcdir)/include/rin/float_types.h \
-	$(top_srcdir)/include/rin/definitions.h \
-	$(top_srcdir)/include/rin/diagnostic.h \
-	$(top_srcdir)/include/rin/gpio.h
diff --git a/src/diagnostic/Makefile.am b/src/diagnostic/Makefile.am
deleted file mode 100644
index 8787230..0000000
--- a/src/diagnostic/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# Copyright (C) 2015 Gediminas Jakutis
-#
-# This Makefile.am is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; version 2.1
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include/ \
-	-Wall \
-	-Wextra
-
-noinst_LTLIBRARIES = librin_diagnostic.la
-
-librin_diagnostic_la_SOURCES = \
-	diagnostic.c \
-	diagnostic_private.h
diff --git a/src/diagnostic/meson.build b/src/diagnostic/meson.build
new file mode 100644
index 0000000..5f066c1
--- /dev/null
+++ b/src/diagnostic/meson.build
@@ -0,0 +1,10 @@
+if get_option('diagnostic')
+	diagnostic_filenames = [
+		'diagnostic.c',
+		'diagnostic_private.h',
+	]
+else
+	diagnostic_filenames = []
+endif
+
+diagnostic_sources = files(diagnostic_filenames)
diff --git a/src/float/Makefile.am b/src/float/Makefile.am
deleted file mode 100644
index d8d2675..0000000
--- a/src/float/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2015 Gediminas Jakutis
-#
-# This Makefile.am is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; version 2.1
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include/ \
-	-Wall \
-	-Wextra
-
-noinst_LTLIBRARIES = librin_float.la
-
-librin_float_la_SOURCES = \
-	float.c \
-	float_private.h
diff --git a/src/float/meson.build b/src/float/meson.build
new file mode 100644
index 0000000..129053e
--- /dev/null
+++ b/src/float/meson.build
@@ -0,0 +1,10 @@
+if get_option('float')
+	float_filenames = [
+		'float.c',
+		'float_private.h',
+	]
+else
+	float_filenames = []
+endif
+
+float_sources = files(float_filenames)
diff --git a/src/gpio/Makefile.am b/src/gpio/Makefile.am
deleted file mode 100644
index e009cab..0000000
--- a/src/gpio/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2016 Gediminas Jakutis
-#
-# This Makefile.am is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; version 2.1
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include/ \
-	-Wall \
-	-Wextra
-
-noinst_LTLIBRARIES = librin_gpio.la
-
-librin_gpio_la_SOURCES = \
-	gpio.c \
-	gpio_private.h
diff --git a/src/gpio/meson.build b/src/gpio/meson.build
new file mode 100644
index 0000000..82887cb
--- /dev/null
+++ b/src/gpio/meson.build
@@ -0,0 +1,10 @@
+if get_option('gpio')
+	gpio_filenames = [
+		'gpio.c',
+		'gpio_private.h',
+	]
+else
+	gpio_filenames = []
+endif
+
+gpio_sources = files(gpio_filenames)
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..1d98b67
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,6 @@
+subdir('float')
+subdir('gpio')
+subdir('diagnostic')
+
+sources = [float_sources, gpio_sources, diagnostic_sources]
+