Build: Switch to non-recursive make

diff --git a/Makefile.am b/Makefile.am
index 0d894449224987c7927a42db77a9e17879ae944b..d6a9fdb298925a489fc7624088b4366581a74d6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,19 @@
 
 GNUMAKEFLAGS = --no-print-directory
 
-SUBDIRS = asix-sigma sysclk-lwla
+dist_pkgdata_DATA = \
+       asix-sigma/asix-sigma-100.fw \
+       asix-sigma/asix-sigma-200.fw \
+       asix-sigma/asix-sigma-50.fw \
+       asix-sigma/asix-sigma-50sync.fw \
+       sysclk-lwla/sysclk-lwla1034-extneg.rbf \
+       sysclk-lwla/sysclk-lwla1034-extpos.rbf \
+       sysclk-lwla/sysclk-lwla1034-int.rbf \
+       sysclk-lwla/sysclk-lwla1034-off.rbf
+
+dist_noinst_DATA = \
+       asix-sigma/LICENSE.Sigma \
+       sysclk-lwla/LICENSE.LWLA
 
 MAINTAINERCLEANFILES = ChangeLog
 

diff --git a/asix-sigma/Makefile.am b/asix-sigma/Makefile.am
deleted file mode 100644 (file)
index 7e4b2bb..0000000
--- a/asix-sigma/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## This file is part of the sigrok-firmware 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
-##
-
-dist_pkgdata_DATA = \
-       asix-sigma-100.fw \
-       asix-sigma-200.fw \
-       asix-sigma-50.fw \
-       asix-sigma-50sync.fw
-
-EXTRA_DIST = LICENSE.Sigma
-

diff --git a/configure.ac b/configure.ac
index 9ba54a9acc73412d1491402f66d44e138098b3b3..f788ad8cf50d8c40c72a63a4efd9f39b445487a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,5 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_INSTALL
 
-AC_CONFIG_FILES([Makefile
-                asix-sigma/Makefile
-                sysclk-lwla/Makefile
-               ])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/sysclk-lwla/Makefile.am b/sysclk-lwla/Makefile.am
deleted file mode 100644 (file)
index 5b785b4..0000000
--- a/sysclk-lwla/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## This file is part of the sigrok-firmware project.
-##
-## Copyright (C) 2014 Daniel Elstner <daniel.kitta@gmail.com>
-##
-## 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 3 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, see <http://www.gnu.org/licenses/>.
-##
-
-dist_pkgdata_DATA = \
-       sysclk-lwla1034-extneg.rbf \
-       sysclk-lwla1034-extpos.rbf \
-       sysclk-lwla1034-int.rbf \
-       sysclk-lwla1034-off.rbf
-
-EXTRA_DIST = LICENSE.LWLA