Instead of using recursive Makefile.am, declare all the headers on the
top-level Makefile.am, which will take care of all of them.
Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu>
---
Makefile.am | 21 ++++++++++++++++++++-
configure.ac | 5 -----
include/Makefile.am | 1 -
include/osmocom/Makefile.am | 1 -
include/osmocom/gmr1/Makefile.am | 3 ---
include/osmocom/gmr1/l1/Makefile.am | 3 ---
include/osmocom/gmr1/sdr/Makefile.am | 1 -
7 files changed, 20 insertions(+), 15 deletions(-)
delete mode 100644 include/Makefile.am
delete mode 100644 include/osmocom/Makefile.am
delete mode 100644 include/osmocom/gmr1/Makefile.am
delete mode 100644 include/osmocom/gmr1/l1/Makefile.am
delete mode 100644 include/osmocom/gmr1/sdr/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index c866969..5167991 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,26 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
ACLOCAL_AMFLAGS = -I m4
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = include src
+SUBDIRS = src
+
+noinst_HEADERS = include/osmocom/gmr1/gsmtap.h \
+ include/osmocom/gmr1/l1/a5.h \
+ include/osmocom/gmr1/l1/bcch.h \
+ include/osmocom/gmr1/l1/ccch.h \
+ include/osmocom/gmr1/l1/conv.h \
+ include/osmocom/gmr1/l1/crc.h \
+ include/osmocom/gmr1/l1/defs.h \
+ include/osmocom/gmr1/l1/facch3.h \
+ include/osmocom/gmr1/l1/interleave.h \
+ include/osmocom/gmr1/l1/punct.h \
+ include/osmocom/gmr1/l1/rach.h \
+ include/osmocom/gmr1/l1/scramb.h \
+ include/osmocom/gmr1/l1/tch3.h \
+ include/osmocom/gmr1/sdr/defs.h \
+ include/osmocom/gmr1/sdr/dkab.h \
+ include/osmocom/gmr1/sdr/fcch.h \
+ include/osmocom/gmr1/sdr/nb.h \
+ include/osmocom/gmr1/sdr/pi4cxpsk.h
BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index 60c850b..a4f3952 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,6 @@ dnl Generate the output
AM_CONFIG_HEADER(config.h)
AC_OUTPUT(
- include/Makefile
- include/osmocom/Makefile
- include/osmocom/gmr1/Makefile
- include/osmocom/gmr1/l1/Makefile
- include/osmocom/gmr1/sdr/Makefile
src/Makefile
src/l1/Makefile
src/sdr/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 3578a80..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = osmocom
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
deleted file mode 100644
index 950eae8..0000000
--- a/include/osmocom/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = gmr1
diff --git a/include/osmocom/gmr1/Makefile.am b/include/osmocom/gmr1/Makefile.am
deleted file mode 100644
index 91c5c44..0000000
--- a/include/osmocom/gmr1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = l1 sdr
-
-noinst_HEADERS = gsmtap.h
diff --git a/include/osmocom/gmr1/l1/Makefile.am b/include/osmocom/gmr1/l1/Makefile.am
deleted file mode 100644
index 40f2bd2..0000000
--- a/include/osmocom/gmr1/l1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_HEADERS = \
- conv.h crc.h interleave.h punct.h scramb.h \
- a5.h bcch.h ccch.h rach.h facch3.h tch3.h
diff --git a/include/osmocom/gmr1/sdr/Makefile.am b/include/osmocom/gmr1/sdr/Makefile.am
deleted file mode 100644
index 03c9769..0000000
--- a/include/osmocom/gmr1/sdr/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-noinst_HEADERS = defs.h dkab.h fcch.h nb.h pi4cxpsk.h
--
1.7.8.6