From 6da249da0628ad1ecfb880a19bbe4795ada755c7 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 4 May 2014 16:49:01 +0200 Subject: [PATCH] Use a non-recursive automake setup. (fewer files, less clutter) --- Makefile.am | 6 ++++-- configure.ac | 5 +---- contrib/Makefile.am | 22 ---------------------- doc/Makefile.am | 22 ---------------------- 4 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 contrib/Makefile.am delete mode 100644 doc/Makefile.am diff --git a/Makefile.am b/Makefile.am index f273aef..1384330 100644 --- 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 65e0b42..8ab33aa 100644 --- 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 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 -## -## 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 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 -## -## 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 - -- 2.30.2