buildroot

From 39a2a444a32896bd2dab37c9b247ccfd11ff4693 Mon Sep 17 00:00:00 2001

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Date: Mon, 30 Oct 2017 19:29:12 +0100

Subject: [PATCH] buildsystem: drop custom buildconf script, rely on autoreconf

​

The buildconf script is currently required, because we need to copy a

header around, because it is used both from the library and the examples

sources.

​

However, having a custom 'buildconf'-like script is not needed if we can

ensure that the header / exists by the time it is needed. For That, we

can just append the src/ directory to the headers search path for the

examples.

​

And then it means we no longer need to generate the same header twice,

so we remove the second one from configure.ac.

​

Now, we can just call "autoreconf -fi" to generate the autotools files,

instead of relying on the canned sequence in "buildconf", since

autoreconf has now long known what to do at the correct moment (future

versions of autotools, automake, autopoint, autoheader etc... may

require an other ordering, or other intermediate steps, etc...).

​

Eventually, get rid of buildconf now it is no longer needed. In fact, we

really keep it for legacy, but have it just call autoreconf (and print a

nice user-friendly warning).

​

Update gitignore accordingly, too.

​

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Cc: Sam Voss <sam.voss@rockwellcollins.com>

---

 .gitignore          |  2 ++

 buildconf           | 24 +++++-------------------

 configure.ac        |  2 +-

 example/.gitignore  |  2 --

 example/Makefile.am |  2 +-

 5 files changed, 9 insertions(+), 23 deletions(-)

​

diff --git a/.gitignore b/.gitignore

index 997e51e1..b6d6b5cb 100644

--- a/.gitignore

+++ b/.gitignore

@@ -13,6 +13,8 @@ Makefile

 Makefile.in

 aclocal.m4

 autom4te.cache

+compile

+test-driver

 config.guess

 config.log

 config.status

diff --git a/buildconf b/buildconf

index 558dcb66..728b3397 100755

--- a/buildconf

+++ b/buildconf

@@ -1,22 +1,8 @@

 #!/bin/sh

-LIBTOOLIZE="libtoolize"

+echo "***" >&2

+echo "*** Do not use buildconf. Instead, just use: autoreconf -fi" >&2

+echo "*** Doing it for you now, but buildconf may disapear in the future." >&2