[libosmo-sccp PATCH 3/7] build: flatten headers installation in include/Makefile.am

This avoids recursing multiple times for no reason. Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- configure.ac | 3 --- include/Makefile.am | 8 +++++++- include/m2ua/Makefile.am | 2 -- include/mtp/Makefile.am | 2 -- include/sccp/Makefile.am | 2 -- 5 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 include/m2ua/Makefile.am delete mode 100644 include/mtp/Makefile.am delete mode 100644 include/sccp/Makefile.am diff --git a/configure.ac b/configure.ac index 98a6b1f..ae35518 100644 --- a/configure.ac +++ b/configure.ac @@ -31,9 +31,6 @@ AC_SUBST(SYMBOL_VISIBILITY) AC_OUTPUT( libosmo-sccp.pc libosmo-mtp.pc - include/sccp/Makefile - include/mtp/Makefile - include/m2ua/Makefile include/Makefile src/Makefile tests/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 882d1e2..580d3a5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1,7 @@ -SUBDIRS = sccp mtp m2ua +pkgincludedir = $(includedir)/osmocom +nobase_pkginclude_HEADERS = m2ua/m2ua_msg.h \ + m2ua/m2ua_types.h \ + mtp/mtp_level3.h \ + mtp/mtp_pcap.h \ + sccp/sccp.h \ + sccp/sccp_types.h diff --git a/include/m2ua/Makefile.am b/include/m2ua/Makefile.am deleted file mode 100644 index d740a6c..0000000 --- a/include/m2ua/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -m2ua_HEADERS = m2ua_types.h m2ua_msg.h -m2uadir = $(includedir)/osmocom/m2ua diff --git a/include/mtp/Makefile.am b/include/mtp/Makefile.am deleted file mode 100644 index dbd0e79..0000000 --- a/include/mtp/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -mtp_HEADERS = mtp_level3.h mtp_pcap.h -mtpdir = $(includedir)/osmocom/mtp diff --git a/include/sccp/Makefile.am b/include/sccp/Makefile.am deleted file mode 100644 index c64db26..0000000 --- a/include/sccp/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -sccp_HEADERS = sccp_types.h sccp.h -sccpdir = $(includedir)/osmocom/sccp -- 1.7.8.6