From e9208d693ee21a062dc2b3f2dd16a9d6b8926b90 Mon Sep 17 00:00:00 2001 From: Martin Lund Date: Wed, 9 Feb 2022 20:50:50 +0100 Subject: [PATCH] Replace autotools with meson To introduce much simpler build configuration which is also easier to maintain. --- .gitignore | 24 +- INSTALL | 375 ----------------------------- Makefile.am | 1 - autogen.sh | 1 - configure.ac | 95 -------- man/Makefile.am | 1 - man/meson.build | 17 ++ man/{tio.1 => tio.1.in} | 2 +- meson.build | 65 +++++ meson_options.txt | 3 + src/Makefile.am | 24 -- src/bash-completion/meson.build | 19 ++ src/bash-completion/tio.in | 2 +- src/error.c | 6 +- src/{include/tio => }/error.h | 0 src/log.c | 6 +- src/{include/tio => }/log.h | 0 src/main.c | 10 +- src/meson.build | 24 ++ src/{time.c => misc.c} | 6 +- src/{include/tio/time.h => misc.h} | 5 +- src/options.c | 4 +- src/{include/tio => }/options.h | 0 src/{include/tio => }/print.h | 0 src/tty.c | 16 +- src/{include/tio => }/tty.h | 0 26 files changed, 156 insertions(+), 550 deletions(-) delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 man/Makefile.am create mode 100644 man/meson.build rename man/{tio.1 => tio.1.in} (98%) create mode 100644 meson.build create mode 100644 meson_options.txt delete mode 100644 src/Makefile.am create mode 100644 src/bash-completion/meson.build rename src/{include/tio => }/error.h (100%) rename src/{include/tio => }/log.h (100%) create mode 100644 src/meson.build rename src/{time.c => misc.c} (93%) rename src/{include/tio/time.h => misc.h} (95%) rename src/{include/tio => }/options.h (100%) rename src/{include/tio => }/print.h (100%) rename src/{include/tio => }/tty.h (100%) diff --git a/.gitignore b/.gitignore index b00ed42..b5da578 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,2 @@ -*.tar.xz -src/*.o -src/tio -Makefile.in -Makefile -aclocal.m4 -autom4te.cache/ -configure -compile -depcomp -install-sh -missing -src/Makefile.in -src/Makefile -config.log -config.status -src/.deps/ -src/include/config.h -src/include/config.h.in -src/include/config.h.in~ -src/include/stamp-h1 +/build *.swp -/tio-* -/src/bash-completion/tio diff --git a/INSTALL b/INSTALL deleted file mode 100644 index c1722d1..0000000 --- a/INSTALL +++ /dev/null @@ -1,375 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell command `./configure && make && make install' -should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - - On macOS, automake and autoconf are not part of the default OS. In -order to overcome this, you should install them manually. For example: - - brew install automake autoconf - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 9f0d419..0000000 --- a/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = src man diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 9b56201..0000000 --- a/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -autoreconf --force -v --install diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 55da367..0000000 --- a/configure.ac +++ /dev/null @@ -1,95 +0,0 @@ -AC_PREREQ([2.68]) -AC_INIT([tio], [1.32], [], [tio], [https://tio.github.io]) -AC_CONFIG_HEADERS([src/include/config.h]) -AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip -Wall -Werror]) -AM_SILENT_RULES([yes]) -AC_PROG_CC -AC_LANG([C]) -AC_PROG_INSTALL -AC_SYS_LARGEFILE - -# Handle bash completion -AC_ARG_WITH([bash-completion-dir], - AS_HELP_STRING([--with-bash-completion-dir[=PATH]], - [Install the bash auto-completion script in this directory. @<:@default=yes@:>@]), - [], - [with_bash_completion_dir=yes]) - -if test "x$with_bash_completion_dir" = "xyes"; then - BASH_COMPLETION_DIR="${datadir}/bash-completion/completions" -else - BASH_COMPLETION_DIR="$with_bash_completion_dir" -fi -AC_SUBST([BASH_COMPLETION_DIR]) -AM_CONDITIONAL([ENABLE_BASH_COMPLETION],[test "x$with_bash_completion_dir" != "xno"]) - -# TIO_CHECK_BAUDRATE(N) -AC_DEFUN( - [TIO_CHECK_BAUDRATE], - [ - AC_CHECK_DECL([B$1], [tio_have_decl=1], [tio_have_decl=0], [[#include ]]) - AS_IF([test $tio_have_decl = 1], [ - AC_SUBST([BAUDRATES], ["$BAUDRATES $1"]) - AC_SUBST([BAUDRATE_CASES], ["$BAUDRATE_CASES case $1: baudrate = B$1; break;"])] - ) - ] -) - -# TIO_CHECK_BAUDRATES(N1, N2, ...) -AC_DEFUN( - [TIO_CHECK_BAUDRATES], - [m4_foreach([n], [$@], [TIO_CHECK_BAUDRATE(m4_normalize(n))])] -) - -# Check for available terminal I/O speeds -BAUDRATES= -BAUDRATE_CASES= -TIO_CHECK_BAUDRATES( - 0, - 50, - 75, - 110, - 134, - 150, - 200, - 300, - 600, - 1200, - 1800, - 2400, - 4800, - 7200, - 9600, - 14400, - 19200, - 28800, - 38400, - 57600, - 76800, - 115200, - 230400, - 460800, - 500000, - 576000, - 921600, - 1000000, - 1152000, - 1500000, - 2000000, - 2500000, - 3000000, - 3500000, - 4000000 -) - -AC_DEFINE_UNQUOTED([AUTOCONF_BAUDRATE_CASES],[$BAUDRATE_CASES],[Switch cases for detected baud rates]) - -# Check for interface for setting arbitrary I/O speeds -AC_CHECK_DECL([TCGETS2], [AC_DEFINE([HAVE_TERMIOS2],[1],[Define if termios2 exists.]) have_termios2=yes], , [[#include ]]) -AM_CONDITIONAL([ADD_SETSPEED2],[test "x$have_termios2" = "xyes"]) - -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([src/Makefile]) -AC_CONFIG_FILES([src/bash-completion/tio]) -AC_CONFIG_FILES([man/Makefile]) -AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index a7398bb..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -dist_man_MANS = tio.1 diff --git a/man/meson.build b/man/meson.build new file mode 100644 index 0000000..9945923 --- /dev/null +++ b/man/meson.build @@ -0,0 +1,17 @@ +mandir = join_paths(get_option('prefix'), get_option('mandir')) +man1dir = join_paths(mandir, 'man1') + +conf = configuration_data() +conf.set('version', meson.project_version()) +conf.set('version_date', version_date) + +manpage = configure_file( + input: files('tio.1.in'), + output: 'tio.1', + configuration: conf, +) + +install_man( + manpage, + install_dir: man1dir, +) diff --git a/man/tio.1 b/man/tio.1.in similarity index 98% rename from man/tio.1 rename to man/tio.1.in index 57927fc..3bb5282 100644 --- a/man/tio.1 +++ b/man/tio.1.in @@ -1,4 +1,4 @@ -.TH "tio" "1" "June 2018" +.TH "tio" "1" "@version_date@" "tio @version@" "User Commands" .SH "NAME" tio \- a simple TTY terminal I/O application diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..cde16fe --- /dev/null +++ b/meson.build @@ -0,0 +1,65 @@ +project('tio', 'c', + version : '1.33', + license : [ 'GPL-2'], + meson_version : '>= 0.53.2', + default_options : [ 'warning_level=2', 'buildtype=release', 'c_std=gnu17' ] +) + +# The tag date of the project_version(), update when the version bumps. +version_date = '2022-02-10' + +# Test for dynamic baudrate configuration interface +compiler = meson.get_compiler('c') +tcgets2 = compiler.get_define('TCGETS2', prefix: '#include ') + +# Test for supported baudrates +test_baudrates = [ + 0, + 50, + 75, + 110, + 134, + 150, + 200, + 300, + 600, + 1200, + 1800, + 2400, + 4800, + 7200, + 9600, + 14400, + 19200, + 28800, + 38400, + 57600, + 76800, + 115200, + 230400, + 460800, + 500000, + 576000, + 921600, + 1000000, + 1152000, + 1500000, + 2000000, + 2500000, + 3000000, + 3500000, + 4000000 ] + +baudrates = '' +baudrate_cases = '' +foreach rate : test_baudrates + baudrate = rate.to_string() + value = compiler.get_define('B' + baudrate, prefix: '#include ') + if value != '' + baudrates = baudrates + baudrate + ' ' + baudrate_cases = baudrate_cases + ' case ' + baudrate + ': baudrate = B' + baudrate + '; break;' + endif +endforeach + +subdir('src') +subdir('man') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..ddb4225 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,3 @@ +option('bashcompletiondir', + type : 'string', + description : 'Directory for bash completion scripts ["no" disables]') diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 046c599..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/include -AM_CFLAGS = -Wall -bin_PROGRAMS = tio -tio_SOURCES = tty.c \ - options.c \ - time.c \ - main.c \ - log.c \ - error.c \ - include/tio/tty.h \ - include/tio/options.h \ - include/tio/time.h \ - include/tio/print.h \ - include/tio/log.h \ - include/tio/error.h - -if ADD_SETSPEED2 -tio_SOURCES += setspeed2.c -endif - -if ENABLE_BASH_COMPLETION -bashcompletiondir=@BASH_COMPLETION_DIR@ -bashcompletion_DATA=bash-completion/tio -endif diff --git a/src/bash-completion/meson.build b/src/bash-completion/meson.build new file mode 100644 index 0000000..00ae184 --- /dev/null +++ b/src/bash-completion/meson.build @@ -0,0 +1,19 @@ +conf = configuration_data() +conf.set('baudrates', baudrates) + +completion_file = configure_file( input: files('tio.in'), + output: 'tio', + configuration: conf, + ) + +bashcompletiondir = get_option('bashcompletiondir') +if bashcompletiondir == '' + bash_completion_dep = dependency('bash-completion', required: false) + if bash_completion_dep.found() + bashcompletiondir = join_paths(get_option('datadir'), 'bash-completion', 'completions') + endif +endif + +if (bashcompletiondir != 'no') and (bashcompletiondir != '') + install_data(completion_file, install_dir: bashcompletiondir) +endif diff --git a/src/bash-completion/tio.in b/src/bash-completion/tio.in index 9c468ea..ac8ec76 100644 --- a/src/bash-completion/tio.in +++ b/src/bash-completion/tio.in @@ -27,7 +27,7 @@ _tio() # Complete the arguments to the options. case "${prev}" in -b | --baudrate) - local baudrates="@BAUDRATES@" + local baudrates="@baudrates@" COMPREPLY=( $(compgen -W "$baudrates" -- ${cur}) ) return 0 ;; diff --git a/src/error.c b/src/error.c index b7624d8..6382833 100644 --- a/src/error.c +++ b/src/error.c @@ -24,9 +24,9 @@ #include #include #include -#include "tio/options.h" -#include "tio/print.h" -#include "tio/error.h" +#include "options.h" +#include "print.h" +#include "error.h" char error[2][1000]; diff --git a/src/include/tio/error.h b/src/error.h similarity index 100% rename from src/include/tio/error.h rename to src/error.h diff --git a/src/log.c b/src/log.c index 0bad55d..8950884 100644 --- a/src/log.c +++ b/src/log.c @@ -24,9 +24,9 @@ #include #include #include -#include "tio/options.h" -#include "tio/print.h" -#include "tio/error.h" +#include "options.h" +#include "print.h" +#include "error.h" static FILE *fp; static bool log_error = false; diff --git a/src/include/tio/log.h b/src/log.h similarity index 100% rename from src/include/tio/log.h rename to src/log.h diff --git a/src/main.c b/src/main.c index 6e9b9d0..3a979d0 100644 --- a/src/main.c +++ b/src/main.c @@ -23,11 +23,11 @@ #include #include #include -#include "tio/options.h" -#include "tio/tty.h" -#include "tio/log.h" -#include "tio/error.h" -#include "tio/print.h" +#include "options.h" +#include "tty.h" +#include "log.h" +#include "error.h" +#include "print.h" int main(int argc, char *argv[]) { diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..4c20399 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,24 @@ +config_h = configuration_data() +config_h.set_quoted('VERSION', meson.project_version()) +config_h.set('BAUDRATE_CASES', baudrate_cases) +configure_file(output: 'config.h', configuration: config_h) + +tio_sources = [ + 'error.c', + 'log.c', + 'main.c', + 'options.c', + 'misc.c', + 'tty.c' + ] + +if tcgets2 != '' + tio_sources += 'setspeed2.c' +endif + +executable('tio', + tio_sources, + install: true, +) + +subdir('bash-completion') diff --git a/src/time.c b/src/misc.c similarity index 93% rename from src/time.c rename to src/misc.c index de59624..d65e9fd 100644 --- a/src/time.c +++ b/src/misc.c @@ -25,8 +25,8 @@ #include #include #include -#include "tio/error.h" -#include "tio/print.h" +#include "error.h" +#include "print.h" // "YYYY-MM-DDThh:mm:ss.sss" (ISO-8601 format). #define TIME_STRING_SIZE 24 @@ -51,7 +51,7 @@ char * current_time(void) len = snprintf(time_string + len, TIME_STRING_SIZE - len, ".%03ld", (long)tv.tv_usec / 1000); } - return (len >= 0) && (len < TIME_STRING_SIZE) ? time_string : NULL; + return (len < TIME_STRING_SIZE) ? time_string : NULL; } void delay(long ms) diff --git a/src/include/tio/time.h b/src/misc.h similarity index 95% rename from src/include/tio/time.h rename to src/misc.h index b395f5a..786c8e2 100644 --- a/src/include/tio/time.h +++ b/src/misc.h @@ -19,10 +19,7 @@ * 02110-1301, USA. */ -#ifndef TIME_H -#define TIME_H +#pragma once char * current_time(void); void delay(long ms); - -#endif diff --git a/src/options.c b/src/options.c index 86128b2..706daf2 100644 --- a/src/options.c +++ b/src/options.c @@ -30,8 +30,8 @@ #include #include #include -#include "tio/options.h" -#include "tio/error.h" +#include "options.h" +#include "error.h" /* Default options */ struct option_t option = diff --git a/src/include/tio/options.h b/src/options.h similarity index 100% rename from src/include/tio/options.h rename to src/options.h diff --git a/src/include/tio/print.h b/src/print.h similarity index 100% rename from src/include/tio/print.h rename to src/print.h diff --git a/src/tty.c b/src/tty.c index 975eea2..4449983 100644 --- a/src/tty.c +++ b/src/tty.c @@ -38,12 +38,12 @@ #include #include #include "config.h" -#include "tio/tty.h" -#include "tio/print.h" -#include "tio/options.h" -#include "tio/time.h" -#include "tio/log.h" -#include "tio/error.h" +#include "tty.h" +#include "print.h" +#include "options.h" +#include "misc.h" +#include "log.h" +#include "error.h" #ifdef HAVE_TERMIOS2 extern int setspeed2(int fd, int baudrate); @@ -364,9 +364,9 @@ void tty_configure(void) * Only switch cases for baud rates detected supported by the host * system are inserted. * - * To see which baud rates are being probed see configure.ac + * To see which baud rates are being probed see meson.build */ - AUTOCONF_BAUDRATE_CASES + BAUDRATE_CASES default: #ifdef HAVE_TERMIOS2 diff --git a/src/include/tio/tty.h b/src/tty.h similarity index 100% rename from src/include/tio/tty.h rename to src/tty.h