Use a non-recursive automake setup.

(fewer files, less clutter)

diff --git a/Makefile.am b/Makefile.am
index f273aef194e24d546e7ffe807b54be72e7e3a1f0..138433035a7e733d9cda5e3ae69f1f9cb3313abf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,6 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = contrib doc
-
 bin_PROGRAMS = sigrok-cli
 
 sigrok_cli_SOURCES = \
@@ -34,6 +32,10 @@ sigrok_cli_SOURCES = \
        parsers.c \
        anykey.c
 
+dist_man_MANS = doc/sigrok-cli.1
+
+EXTRA_DIST = contrib/sigrok-cli_cross.nsi contrib/sigrok-logo-notext.ico
+
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog

diff --git a/configure.ac b/configure.ac
index 65e0b42390bb4745488cc1bf13550f0cc18bf9d1..8ab33aae1f76f1e4f1ede8724f33ba0f492c98dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,10 +82,7 @@ fi
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 
-AC_CONFIG_FILES([Makefile
-                contrib/Makefile
-                contrib/sigrok-cli_cross.nsi
-                doc/Makefile])
+AC_CONFIG_FILES([Makefile contrib/sigrok-cli_cross.nsi])
 
 AC_OUTPUT
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644 (file)
index 9e8ee04..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the sigrok-cli project.
-##
-## Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program 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 2 of the License, or
-## (at your option) any later version.
-##
-## 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 General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-##
-
-EXTRA_DIST = sigrok-cli_cross.nsi sigrok-logo-notext.ico
-

diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644 (file)
index 7a80550..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the sigrok-cli project.
-##
-## Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program 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 2 of the License, or
-## (at your option) any later version.
-##
-## 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 General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-##
-
-dist_man_MANS = sigrok-cli.1
-