11 files changed, 153 insertions, 132 deletions

diff --git a/.gitignore b/.gitignore
index a712fcb..fcda02c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,24 @@ core
 .gdbinit
 tmp
 *.tar.gz
+.deps
+Makefile
+Makefile.in
+.deps
+.libs/
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+*.lo
+install-sh
+*.in
+*.la
+libtool
+ltmain.sh
+missing
diff --git a/Make.am b/Make.am
new file mode 100644
index 0000000..fe56d41
--- /dev/null
+++ b/Make.am
@@ -0,0 +1,41 @@
+# Main Makefile.am source for runcap
+# Copyright (C) 2017 Sergey Poznyakoff
+#
+# Runcap is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
+#
+# Runcap 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Runcap. If not, see <http://www.gnu.org/licenses/>.
+
+# The runcap library can be built in three distinct flavours:
+#   1. as a standalone library
+#   2. as a shared convenience library
+#   3. as a static convenience library
+# Due to various Automake/libtools subtleties, the three builds cannot be
+# defined in a single Makefile.am. Therefore, three distinct Automake sources
+# are provided for each of the above types. Each of them contains the rules
+# and variables for its particular build flavour, and obtains common rules and
+# and variables by including Make.am. The actual build flavour is determined by
+# the second argument to the RUNCAP_SETUP macro invocation (see runcap.m4).
+# The files and the corresponding 2nd argument for each build type are:
+#   1. install.am   install
+#   2. shared.am    shared
+#   3. static.am    static
+
+RUNCAP_SRC = \
+ getc.c\
+ getl.c\
+ runcap.c\
+ seek.c\
+ tell.c
+EXTRA_DIST = Make.am installed.am shared.am static.am
+check:
+        $(MAKE) -C t check
+SUBDIRS = . t
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 47bcf17..0000000
--- a/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-# runcap - run program and capture its output
-# Copyright (C) 2017 Sergey Poznyakoff
-#
-# Runcap is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your
-# option) any later version.
-#
-# Runcap 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with Runcap. If not, see <http://www.gnu.org/licenses/>.
-
-PREFIX = /usr
-BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/share/man
-
-MAN3DIR = $(MANDIR)/man3
-MAN3FILES = runcap.3
-
-# The install program.  Use cp(1) if not available.
-INSTALL = install
-# Program to make directory hierarchy.
-MKHIER  = install -d
-
-# Compiler options
-O = -ggdb -Wall
-
-PROJECT = libruncap
-VERSION = 1.0
-
-SOURCES = runcap.c getc.c getl.c seek.c tell.c
-OBJECTS = $(SOURCES:.c=.o)
-HEADERS = runcap.h
-
-CFLAGS  = $(O)
-LDFLAGS =
-ARFLAGS = cru
-
-.c.o:
-        $(CC) -c -o$@ $(CPPFLAGS) $(CFLAGS) $<
-
-all: libruncap.a
-
-$(OBJECTS): $(HEADERS)
-
-libruncap.a: $(OBJECTS)
-        ar $(ARFLAGS) libruncap.a $(OBJECTS)
-        ranlib libruncap.a
-
-clean: subdirs-clean
-        rm -f libruncap.a $(OBJECTS)
-
-subdirs-clean:
-        @$(MAKE) -C t clean
-
-install: install-lib install-headers install-man
-
-install-lib: libruncap.a
-        $(MKHIER) $(DESTDIR)$(LIBDIR)
-        $(INSTALL) libruncap.a $(DESTDIR)$(LIBDIR)
-
-install-headers: runcap.h
-        $(MKHIER) $(DESTDIR)$(INCLUDEDIR)
-        $(INSTALL) runcap.h $(DESTDIR)$(INCLUDEDIR)
-
-install-man:;
-        $(MKHIER) $(DESTDIR)$(MAN3DIR)
-        $(INSTALL) $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
-
-.PHONY: check distdir
-check: all
-        $(MAKE) -C t check
-
-DISTDIR=$(PROJECT)-$(VERSION)
-DISTFILES=Makefile $(SOURCES) $(HEADERS) $(MAN3FILES)
-
-distdir:
-        test -d $(DISTDIR) || mkdir $(DISTDIR)
-        cp $(DISTFILES) $(DISTDIR)
-        $(MAKE) -C t distdir TOPDISTDIR=`cd $(DISTDIR); pwd`
-
-dist: distdir
-        tar hzcf $(DISTDIR).tar.gz $(DISTDIR)
-        rm -rf $(DISTDIR)
-
-distcheck: dist
-        @mkdir _build _inst; \
-        cd _build; \
-        tar xzf ../$(DISTDIR).tar.gz; \
-        if $(MAKE) -C $(DISTDIR) check \
-           && $(MAKE) -C $(DISTDIR) install DESTDIR=`cd ../_inst; pwd`; then \
-                cd ..; \
-                rm -rf _build _inst; \
-                echo "$(DISTDIR).tar.gz is ready for distribution";\
-        else \
-                echo "Please, inspect " `pwd`;\
-        fi
-
-
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..365a128
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,15 @@
+AC_PREREQ(2.63)
+AC_INIT([libruncap], [1.0], [gray+runcap@gnu.org.ua])
+AC_CONFIG_SRCDIR([runcap.c])
+AM_INIT_AUTOMAKE([1.11 foreign tar-ustar silent-rules])
+
+# Enable silent rules by default:
+AM_SILENT_RULES([yes])
+
+# Checks for programs.
+AC_PROG_CC
+
+RUNCAP_SETUP([.],[install])
+              
+# Generate files
+AC_OUTPUT
diff --git a/install.am b/install.am
new file mode 100644
index 0000000..3426aee
--- /dev/null
+++ b/install.am
@@ -0,0 +1,7 @@
+# Automake settings for a standalone installable build of runcap.
+# See Make.am for details.
+include Make.am
+lib_LTLIBRARIES=libruncap.la
+libruncap_la_SOURCES = $(RUNCAP_SRC)
+include_HEADERS=runcap.h
+dist_man_MANS=runcap.3
diff --git a/runcap.3 b/runcap.3
index 61e7337..0a5a89c 100644
--- a/runcap.3
+++ b/runcap.3
@@ -1,5 +1,5 @@
 .\" This file is part of runcap -*- nroff -*-
-.\" Copyright (C) 2016 Sergey Poznyakoff
+.\" Copyright (C) 2017 Sergey Poznyakoff
 .\"
 .\" Runcap is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with runcap.  If not, see <http://www.gnu.org/licenses/>.
-.TH RUNCAP 2 "July 24, 2017" "RUNCAP" "User Commands"
+.TH RUNCAP 2 "August 19, 2017" "RUNCAP" "User Commands"
 .SH NAME
 runcap \- run external process and capture its stdout and stderr
 .SH SYNOPSIS
diff --git a/runcap.m4 b/runcap.m4
new file mode 100644
index 0000000..cd4c234
--- /dev/null
+++ b/runcap.m4
@@ -0,0 +1,39 @@
+# This file is part of runcap -*- autoconf -*-
+# Copyright (C) 2017 Sergey Poznyakoff
+#
+# Runcap is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Runcap 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Runcap.  If not, see <http://www.gnu.org/licenses/>.
+AC_DEFUN([RUNCAP_SETUP],[
+  m4_pushdef([runcapdir],m4_if($1,[.],,$1,,[runcap/],$1/))
+  AC_SUBST([RUNCAP_INC],['-I$(top_srcdir)/]runcapdir')
+  AC_SUBST([RUNCAP_BUILD_TYPE])