From d471a2192015440ec9b8c409268ba6433511f421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Fri, 29 Jun 2012 13:01:19 -0700 Subject: build: simplify headers management and remove recursion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no real reason to keep the include directory a multi-level recursion, so instead declare everything within include (so that we can use proper nobase_ declarations) and be it. Please note that since we removed the sub-Makefile.am, ./configure will not create the directory structure for us on out-of-tree builds, so we have to make sure the directory we're generating to exists first. Signed-off-by: Diego Elio Pettenò --- include/osmocom/gsm/Makefile.am | 8 -------- include/osmocom/gsm/protocol/Makefile.am | 6 ------ 2 files changed, 14 deletions(-) delete mode 100644 include/osmocom/gsm/Makefile.am delete mode 100644 include/osmocom/gsm/protocol/Makefile.am (limited to 'include/osmocom/gsm') diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am deleted file mode 100644 index 60ba48b9..00000000 --- a/include/osmocom/gsm/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -osmogsm_HEADERS = a5.h comp128.h gsm0808.h gsm48_ie.h mncc.h rxlev_stat.h \ - gsm0480.h gsm48.h gsm_utils.h rsl.h tlv.h abis_nm.h \ - sysinfo.h prim.h gsm0502.h lapd_core.h lapdm.h \ - gsm0411_utils.h gsm0411_smc.h gsm0411_smr.h gan.h - -SUBDIRS = protocol - -osmogsmdir = $(includedir)/osmocom/gsm diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am deleted file mode 100644 index 6ed55e46..00000000 --- a/include/osmocom/gsm/protocol/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -osmogsm_proto_HEADERS = gsm_03_41.h \ - gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \ - gsm_08_08.h gsm_08_58.h gsm_44_318.h \ - gsm_12_21.h ipaccess.h - -osmogsm_protodir = $(includedir)/osmocom/gsm/protocol -- cgit v1.2.3