From 3d86e69de6d9e786ed1a70895bb707151280313c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Tue, 6 Feb 2018 13:08:11 +0100 Subject: [PATCH] Umesonowienie --- .gitignore | 13 +++---------- Makefile.am | 2 -- configure.ac | 14 -------------- meson.build | 3 +++ 4 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 Makefile.am delete mode 100644 configure.ac create mode 100644 meson.build diff --git a/.gitignore b/.gitignore index b0c2afc..5e26f47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,6 @@ *.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 index 4cb0421..0000000 --- a/Makefile.am +++ /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 index bcfe79a..0000000 --- a/configure.ac +++ /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 index 0000000..1d114a8 --- /dev/null +++ b/meson.build @@ -0,0 +1,3 @@ +project('choinka', 'c', default_options: ['c_std=c11']) +ncurses_dep = dependency('ncurses') +executable('choinka', 'choinka.c', dependencies: ncurses_dep) -- 2.43.2