[libosmo-dsp PATCH 1/5] build: flatten build to a single Makefile.am

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/OpenBSC@lists.osmocom.org/.

Diego Elio Pettenò flameeyes at flameeyes.eu
Wed Jul 4 11:15:46 UTC 2012


This is especially important because the library is so small, that
even the single recursion within src/ can have a (relative) overhead
on the whole build.

Signed-off-by: Diego Elio Pettenò <flameeyes at flameeyes.eu>
---
 Makefile.am                     |   16 +++++++++++++++-
 configure.ac                    |    4 ----
 include/Makefile.am             |    1 -
 include/osmocom/Makefile.am     |    1 -
 include/osmocom/dsp/Makefile.am |    3 ---
 src/Makefile.am                 |   11 -----------
 6 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 include/Makefile.am
 delete mode 100644 include/osmocom/Makefile.am
 delete mode 100644 include/osmocom/dsp/Makefile.am
 delete mode 100644 src/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ec16da9..de7600d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = include src
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosmodsp.pc
@@ -15,6 +14,21 @@ dist-hook:
 
 EXTRA_DIST = git-version-gen
 
+pkgincludedir = $(includedir)/osmocom/dsp
+pkginclude_HEADERS = include/osmocom/dsp/cxvec.h \
+                     include/osmocom/dsp/cfile.h \
+                     include/osmocom/dsp/cxvec_math.h
+
+# This is _NOT_ the library release version, it's an API version.
+# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
+LIBVERSION=0:0:0
+AM_CFLAGS = -fPIC -Wall -ffast-math
+
+lib_LTLIBRARIES = libosmodsp.la
+
+libosmodsp_la_SOURCES = src/cfile.c src/cxvec.c src/cxvec_math.c
+libosmodsp_la_LDFLAGS = -version-info $(LIBVERSION)
+
 if HAVE_DOXYGEN
 
 pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION)
diff --git a/configure.ac b/configure.ac
index 2e60a72..6ed54c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,10 +39,6 @@ AM_CONFIG_HEADER(config.h)
 
 AC_OUTPUT(
 	libosmodsp.pc
-	include/Makefile
-	include/osmocom/Makefile
-	include/osmocom/dsp/Makefile
-	src/Makefile
 	Makefile
 	Doxyfile
 )
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index b255997..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 8369d99..0000000
--- a/include/osmocom/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS=dsp
diff --git a/include/osmocom/dsp/Makefile.am b/include/osmocom/dsp/Makefile.am
deleted file mode 100644
index 5a6534f..0000000
--- a/include/osmocom/dsp/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-osmodsp_HEADERS = cfile.h cxvec.h cxvec_math.h
-
-osmodspdir = $(includedir)/osmocom/dsp
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 39a7429..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is _NOT_ the library release version, it's an API version.
-# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
-LIBVERSION=0:0:0
-
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -fPIC -Wall -ffast-math
-
-lib_LTLIBRARIES = libosmodsp.la
-
-libosmodsp_la_SOURCES = cfile.c cxvec.c cxvec_math.c
-libosmodsp_la_LDFLAGS = -version-info $(LIBVERSION)
-- 
1.7.8.6





More information about the OpenBSC mailing list