Merge branch 'meson'

2 files changed, 10 insertions, 27 deletions

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)