summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2017-01-13 22:37:26 +1030
committerCyril Bur <cyril.bur@au1.ibm.com>2017-01-17 10:45:09 +1100
commit22778044a43bdcc4ce824dc8f1d5fbe34bb27332 (patch)
treedd0cc159aa03e1a37689a44c33d33a78a4299a06
parent899ebaca5eb14ed37d8e53cb4ab1ca95a778fdf5 (diff)
downloadphosphor-mboxd-22778044a43bdcc4ce824dc8f1d5fbe34bb27332.tar.gz
phosphor-mboxd-22778044a43bdcc4ce824dc8f1d5fbe34bb27332.zip
Convert to autotools
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
-rw-r--r--.gitignore48
-rw-r--r--Makefile16
-rw-r--r--Makefile.am6
-rwxr-xr-xbootstrap.sh19
-rw-r--r--configure.ac55
-rw-r--r--m4/.keep0
6 files changed, 127 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index f9cf668..ae85881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,48 @@
-*.o
+# Template from:
+# https://github.com/github/gitignore/blob/master/Autotools.gitignore
+
+# http://www.gnu.org/software/automake
+
+Makefile.in
+/ar-lib
+/mdate-sh
+/py-compile
+/test-driver
+/ylwrap
+
+# http://www.gnu.org/software/autoconf
+
+/autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h1
+
+# https://www.gnu.org/software/libtool/
+
+/ltmain.sh
+
+# http://www.gnu.org/software/texinfo
+
+/texinfo.tex
+
+# Repo Specific Items
+/*.o
+/config.h
+/config.h.in~
+/config.log
+/config.status
+Makefile
+.deps
+arm-openbmc-linux-gnueabi-libtool
mboxd
+
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8e6447d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-CFLAGS = -Wall -O2 -g
-
-ifdef KERNEL_HEADERS
- CFLAGS += -I$(KERNEL_HEADERS)
-endif
-
-EXE = mboxd
-
-all: $(EXE)
-
-$(EXE): common.o
-
-mboxd: CFLAGS += -DPREFIX="\"MBOXD\""
-
-clean:
- rm -rf *.o $(EXE)
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..2b86e66
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,6 @@
+ACLOCAL_AMFLAGS = -I m4
+sbin_PROGRAMS = mboxd
+
+mboxd_SOURCES = mboxd.c common.c
+mboxd_LDFLAGS = $(SYSTEMD_LIBS)
+mboxd_CFLAGS = $(SYSTEMD_CFLAGS)
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000..f1be536
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+AUTOCONF_FILES="Makefile.in aclocal.m4 ar-lib autom4te.cache compile \
+ config.guess config.h.in config.sub configure depcomp install-sh \
+ ltmain.sh missing *libtool test-driver"
+
+case $1 in
+ clean)
+ test -f Makefile && make maintainer-clean
+ test -d linux && find linux -type d -empty | xargs -r rm -rf
+ for file in ${AUTOCONF_FILES}; do
+ find -name "$file" | xargs -r rm -rf
+ done
+ exit 0
+ ;;
+esac
+
+autoreconf -i
+echo 'Run "./configure ${CONFIGURE_FLAGS} && make"'
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..6371994
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,55 @@
+# Initialization
+AC_PREREQ([2.69])
+AC_INIT([mboxd], [1.0], [https://github.com/cyrilbur-ibm/mboxbridge/issues])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([subdir-objects -Wall foreign dist-xz])
+AM_SILENT_RULES([yes])
+AC_CONFIG_MACRO_DIRS([m4])
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+# Checks for libraries.
+PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 221])
+
+# Checks for header files.
+AC_CHECK_HEADER(systemd/sd-bus.h, ,[AC_MSG_ERROR([Could not find systemd/sd-bus.h...systemd developement package required])])
+AC_CHECK_HEADER(linux/aspeed-lpc-ctrl.h,[HAVE_UAPI_LINUX_LPC_CTRL_H=""],[HAVE_UAPI_LINUX_LPC_CTRL_H="-I linux/aspeed-lpc-ctrl.h"])
+AS_IF([test "$HAVE_UAPI_LINUX_LPC_CTRL_H" = ""],
+ AC_MSG_WARN([Could not find linux/aspeed-lpc-ctrl.h])
+)
+
+# Checks for typedefs, structures, and compiler characteristics.
+AX_APPEND_COMPILE_FLAGS([-fpic -Wall], [CFLAGS])
+
+# Checks for library functions.
+LT_INIT # Removes 'unrecognized options: --with-libtool-sysroot'
+
+# Check/set gtest specific functions.
+AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
+AC_SUBST(GTEST_CPPFLAGS)
+
+AC_ARG_ENABLE([oe-sdk],
+ AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.])
+)
+AC_ARG_VAR(OECORE_TARGET_SYSROOT,
+ [Path to the OE SDK SYSROOT])
+AS_IF([test "x$enable_oe_sdk" == "xyes"],
+ AS_IF([test "x$OECORE_TARGET_SYSROOT" == "x"],
+ AC_MSG_ERROR([OECORE_TARGET_SYSROOT must be set with --enable-oe-sdk])
+ )
+ AC_MSG_NOTICE([Enabling OE-SDK at $OECORE_TARGET_SYSROOT])
+ [
+ testcase_flags="-Wl,-rpath,\${OECORE_TARGET_SYSROOT}/lib"
+ testcase_flags="${testcase_flags} -Wl,-rpath,\${OECORE_TARGET_SYSROOT}/usr/lib"
+ testcase_flags="${testcase_flags} -Wl,-dynamic-linker,`find \${OECORE_TARGET_SYSROOT}/lib/ld-*.so | sort -r -n | head -n1`"
+ ]
+ AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags])
+)
+
+# Create configured output
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/m4/.keep b/m4/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/m4/.keep
OpenPOWER on IntegriCloud