]> git.bzium.org/ - embe/choinka.git/commitdiff
Umesonowienie
authorMichał Bartoszkiewicz <mbartoszkiewicz@gmail.com>
Tue, 6 Feb 2018 12:08:11 +0000 (13:08 +0100)
committerMichał Bartoszkiewicz <mbartoszkiewicz@gmail.com>
Tue, 6 Feb 2018 12:08:11 +0000 (13:08 +0100)
.gitignore
Makefile.am [deleted file]
configure.ac [deleted file]
meson.build [new file with mode: 0644]

index b0c2afcbd624bff6ae389587a8413076d0e0ff80..5e26f479358006c082c38b9b3482830fbab24be6 100644 (file)
@@ -1,13 +1,6 @@
 *.o
 choinka
 
 *.o
 choinka
 
-# autotools
-.deps
-aclocal.m4
-autom4te.cache
-build-aux
-config.log
-config.status
-configure
-Makefile
-Makefile.in
+# dla Mesona
+/build/
+/build-*/
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644 (file)
index 4cb0421..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin_PROGRAMS := choinka
-choinka_SOURCES := choinka.c
diff --git a/configure.ac b/configure.ac
deleted file mode 100644 (file)
index bcfe79a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-AC_PREREQ([2.65])
-AC_INIT([choinka], [1.0])
-AC_CONFIG_SRCDIR([choinka.c])
-AC_CONFIG_AUX_DIR([build-aux])
-
-AM_INIT_AUTOMAKE([1.11 foreign])
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC_C99
-
-AC_SEARCH_LIBS([setupterm], [ncurses])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/meson.build b/meson.build
new file mode 100644 (file)
index 0000000..1d114a8
--- /dev/null
@@ -0,0 +1,3 @@
+project('choinka', 'c', default_options: ['c_std=c11'])
+ncurses_dep = dependency('ncurses')
+executable('choinka', 'choinka.c', dependencies: ncurses_dep)