From 3c61e45ae4fdb3b701e60d4b5d0ec5ec6be177cd Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Fri, 27 Aug 2004 15:59:26 +0000 Subject: [PATCH] rework configure and build system: - no more dynamic interfaces - better handling of openipmi header files - make rpm commands for building in chroot --- ipmitool/Makefile.am | 37 ++- ipmitool/configure.in | 327 +++++++++----------------- ipmitool/contrib/Makefile.am | 2 +- ipmitool/control/Makefile.am | 4 +- ipmitool/doc/Makefile.am | 17 +- ipmitool/include/ipmitool/Makefile.am | 4 +- ipmitool/lib/Makefile.am | 2 +- ipmitool/src/Makefile.am | 20 +- ipmitool/src/plugins/Makefile.am | 16 +- 9 files changed, 164 insertions(+), 265 deletions(-) diff --git a/ipmitool/Makefile.am b/ipmitool/Makefile.am index 24a34ee..1295de4 100644 --- a/ipmitool/Makefile.am +++ b/ipmitool/Makefile.am @@ -32,7 +32,7 @@ # in the design, construction, operation or maintenance of any nuclear # facility. -EXTRA_DIST = ipmitool.spec.in AUTHORS COPYING ChangeLog \ +EXTRA_DIST = AUTHORS COPYING ChangeLog \ debian/changelog debian/control debian/copyright \ debian/dirs debian/docs debian/rules @@ -43,17 +43,34 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \ mkinstalldirs config.h.in stamp-h.in \ $(distdir).tar.gz $(distdir).tar.bz2 -SUBDIRS = libltdl lib src include doc contrib control +SUBDIRS = lib src include doc contrib control -dist-hook: ipmitool.spec - cp ipmitool.spec $(distdir) +dist-hook: + cp control/ipmitool.spec $(distdir) -pkg: PKG := @IPMITOOL_BIN@-@VERSION@-@OS@-@ARCH@ +.PHONY: pkg +pkg: PKG := ipmitool-@VERSION@-@OS@-@ARCH@ pkg: control/pkginfo - $(STRIP) src/@IPMITOOL_BIN@ -# this needs done twice to workaround bug in gnu binutils - $(STRIP) src/@IPMITOOL_BIN@ + $(STRIP) src/ipmitool + $(STRIP) src/ipmitool (cd control ; pkgmk -o -d /tmp) - pkgtrans -s /tmp $(PKG) @IPMITOOL_BIN@ + pkgtrans -s /tmp $(PKG) ipmitool gzip -c /tmp/$(PKG) > $(PKG).gz - -rm -rf /tmp/@IPMITOOL_BIN@ /tmp/$(PKG) + -rm -rf /tmp/ipmitool /tmp/$(PKG) + +BUILDDIR = ${shell cd $(top_builddir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'} +SRCDIR = ${shell cd $(top_srcdir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'} +RPMDIR = $(BUILDDIR)/rpmbuild + +.PHONY: rpm +rpm: control/ipmitool.spec dist + mkdir -p $(RPMDIR)/{BUILD,RPMS,SRPMS,SOURCES,SPECS,tmp} + cp control/ipmitool.spec $(RPMDIR)/SPECS + BUILDDIR=$(RPMDIR) CONFIGDIR=$(BUILDDIR)/control \ + @RPMBUILD@ -ba --rcfile $(SRCDIR)/control/rpmrc \ + $(RPMDIR)/SPECS/ipmitool.spec + +.PHONY: clean-rpm +clean-rpm: + -rm -rf $(RPMDIR) + diff --git a/ipmitool/configure.in b/ipmitool/configure.in index e75f6ea..c2c3ff3 100644 --- a/ipmitool/configure.in +++ b/ipmitool/configure.in @@ -3,70 +3,45 @@ dnl autoconf for ipmitool dnl AC_INIT([src/ipmitool.c]) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([ipmitool], [1.5.9]) +AM_INIT_AUTOMAKE([ipmitool], [1.6.0pre2]) AM_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR([src/ipmitool.c]) AC_PREREQ(2.50) AC_SUBST(ac_configure_args) -dnl check for programs +dnl check for requirements AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +AC_CHECK_PROG([RPMBUILD], [rpmbuild], [rpmbuild], [rpm]) +AC_CHECK_PROG([SED], [sed], [sed]) -AC_CHECK_PROG(SED, sed, sed) - -dnl setup libtool -AC_LIB_LTDL -AC_LIBTOOL_DLOPEN -AC_LIBLTDL_CONVENIENCE -AM_PROG_LIBTOOL -LIBTOOL="$LIBTOOL --silent" -AC_SUBST(INCLTDL) -AC_SUBST(LIBLTDL) -AC_CONFIG_SUBDIRS(libltdl) - -AC_SEARCH_LIBS(gethostbyname, nsl) -AC_SEARCH_LIBS(socket, socket, , - [AC_CHECK_LIB(nsl, socket, LIBS="$LIBS -lsocket -lnsl", , -lsocket)]) - -dnl check for headers AC_HEADER_STDC AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h]) AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h]) -dnl check for typedefs, structs, and compiler options AC_C_CONST AC_C_INLINE AC_C_BIGENDIAN -dnl check for lib functions AC_FUNC_MALLOC AC_FUNC_SELECT_ARGTYPES -AC_FUNC_STAT AC_FUNC_STRTOD AC_CHECK_FUNCS([alarm gethostbyname socket select]) AC_CHECK_FUNCS([memmove memset strchr strdup strerror]) AC_CHECK_FUNCS([getpassphrase]) -dnl check for byteswap functionality +AM_PROG_LIBTOOL +LIBTOOL="$LIBTOOL --silent" + +AC_SEARCH_LIBS([gethostbyname], [nsl]) +AC_SEARCH_LIBS([socket], [socket], [], + [AC_CHECK_LIB([nsl], [socket], + [LIBS="$LIBS -lsocket -lnsl"], [], [-lsocket])]) + AC_CHECK_HEADERS([sys/byteorder.h byteswap.h]) -dnl set kernel directory for openipmi header files -AC_ARG_WITH([kerneldir], - [[ --with-kerneldir=DIR Set kernel path to DIR]], - [kerneldir="$withval"], - [kerneldir="/usr/src/linux-2.4"]) -CFLAGS="$CFLAGS -I${kerneldir}/include" -AC_SUBST(CFLAGS) - -have_openipmi=no -AC_CHECK_HEADER([linux/ipmi.h], [have_openipmi=yes]) - -have_lipmi=no -AC_CHECK_HEADER([sys/lipmi/lipmi_intf.h], [have_lipmi=yes]) - if test "x$prefix" = "xNONE"; then prefix="$ac_default_prefix" fi @@ -89,214 +64,144 @@ AC_SUBST(OS, $host_os) AC_SUBST(PSTAMP, $host) AC_SUBST(BASEDIR, $prefix) -dnl Solaris convention is command-line tools have *adm and GUIs have *tool suffix -AC_ARG_ENABLE([ipmiadm], - [[ --enable-ipmiadm enable rename of ipmitool to ipmiadm]],, - [case "$host_os" in - solaris*) - IPMITOOL_BIN="ipmiadm" - enable_ipmiadm=yes - ;; - *) - IPMITOOL_BIN="ipmitool" - enable_ipmiadm=no - ;; - esac]) -AM_CONDITIONAL(IPMIADM, test "x$enable_ipmiadm" = "xyes") -AC_DEFINE_UNQUOTED(IPMITOOL_BIN, "$IPMITOOL_BIN", "IPMItool binary name") -AC_SUBST(IPMITOOL_BIN) - -dnl enable plugins for interfaces -AC_ARG_WITH([plugin-path], - [[ --with-plugin-path=DIR Set plugin path to DIR]], - [pluginpath="$withval"], - [pluginpath="${exec_prefix}/lib/${IPMITOOL_BIN}"]) - -AC_DEFINE_UNQUOTED(PLUGIN_PATH, "$pluginpath", "IPMI interface plugin path") -AC_SUBST(pluginpath) - -STATIC_INTF_LIST= -STATIC_INTF= -STATIC_INTF_EXT= -STATIC_INTF_LIB= - -PLUGIN_INTF_LAN= -STATIC_INTF_LAN= -LDFLAGS_INTF_LAN= +dnl enable IPMIv1.5 LAN interface AC_ARG_ENABLE([intf-lan], -[[ --enable-intf-lan enable IPMI-over-LAN interface]] -[[ plugin : build dynamic]] -[[ static : link statically [default]]] -[[ --diable-intf-lan disable IPMI-over-LAN interface]], - [if test "x$enableval" = "xplugin" || test "x$enableval" = "xdynamic"; then - AC_SUBST(INTF_LAN,lan) - PLUGIN_INTF_LAN="libintf_lan.la" - LDFLAGS_INTF_LAN="-rpath $pluginpath -avoid-version" - DYNAMIC_INTF_LIST="lan $DYNAMIC_INTF_LIST" - elif test "x$enableval" = "xstatic" || test "x$enableval" = "xyes"; then - AC_SUBST(INTF_LAN,lan) - STATIC_INTF_LAN="libintf_lan.la" - STATIC_INTF_LIST="lan $STATIC_INTF_LIST" - fi], - [AC_SUBST(INTF_LAN,lan) - STATIC_INTF_LAN="libintf_lan.la" - STATIC_INTF_LIST="lan $STATIC_INTF_LIST" - ]) -AC_SUBST(PLUGIN_INTF_LAN) -AC_SUBST(STATIC_INTF_LAN) -AC_SUBST(LDFLAGS_INTF_LAN) + [AC_HELP_STRING([--enable-intf-lan], + [enable IPMIv1.5 LAN interface [default=yes]])], + [], [enable_intf_lan=yes]) +if test "x$enable_intf_lan" = "xyes"; then + AC_DEFINE(IPMI_INTF_LAN, [1], [Enable LAN interface]) + AC_SUBST(INTF_LAN, [lan]) + AC_SUBST(INTF_LAN_LIB, [libintf_lan.la]) + IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lan/libintf_lan.la" +fi - - -PLUGIN_INTF_LANPLUS= -STATIC_INTF_LANPLUS= -LDFLAGS_INTF_LANPLUS= +dnl enable IPMIv2.0 RMCP+ LAN interface +AC_CHECK_LIB([crypto], [EVP_aes_128_cbc], + [have_crypto=yes; LIBS="$LIBS -lcrypto"], + [have_crypto=no], + [-lcrypto]) AC_ARG_ENABLE([intf-lanplus], -[[ --enable-intf-lanplus enable IPMI-over-LAN RMCP+ interface ]] -[[ plugin : build dynamic]] -[[ static : link statically ]] -[[ --diable-intf-lanplus disable IPMI-over-LAN RMCP+ interface [default]]], + [AC_HELP_STRING([--enable-intf-lanplus], + [enable IPMIv2.0 RMCP+ LAN interface [default=auto]])], + [if test "x$enable_intf_lanplus" != "xno" && test "x$have_crypto" != "xyes"; then + echo "** The lanplus interface requires an SSL library with EVP_aes_128_cbc defined." + enable_intf_lanplus=no + fi], + [enable_intf_lanplus=$have_crypto]) +if test "x$enable_intf_lanplus" = "xyes"; then + AC_DEFINE(IPMI_INTF_LANPLUS, [1], [Enable LAN+ interface]) + AC_SUBST(INTF_LANPLUS, [lanplus]) + AC_SUBST(INTF_LANPLUS_LIB, [libintf_lanplus.la]) + IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lanplus/libintf_lanplus.la" +fi - [if test "x$enableval" = "xplugin" || test "x$enableval" = "xdynamic"; then - AC_SUBST(INTF_LANPLUS,lanplus) - PLUGIN_INTF_LANPLUS="libintf_lanplus.la" - LDFLAGS_INTF_LANPLUS="-rpath $pluginpath -avoid-version" - DYNAMIC_INTF_LIST="lanplus $DYNAMIC_INTF_LIST" - elif test "x$enableval" = "xstatic" || test "x$enableval" = "xyes"; then - AC_SUBST(INTF_LANPLUS,lanplus) - STATIC_INTF_LANPLUS="libintf_lanplus.la" - STATIC_INTF_LIST="lanplus $STATIC_INTF_LIST" - fi - - if test "x$enableval" != "xno"; then - AC_CHECK_LIB(crypto, EVP_aes_128_cbc, [], [ - echo "Error! The lanplus interface requires an SSL library with EVP_aes_128_cbc defined." - exit -1 - ]) - fi], - []) +dnl look for OpenIPMI header files +AC_ARG_WITH([kerneldir], + [AC_HELP_STRING([--with-kerneldir=DIR], + [set kernel include path to DIR])], + [if test "x$with_kerneldir" = "xyes"; then + with_kerneldir="/lib/modules/`uname -r`/build" + fi + CFLAGS="$CFLAGS -I ${with_kerneldir}/include" + AC_SUBST(CFLAGS) + if test -s ${with_kerneldir}/include/linux/version.h ; then + kernelver=`grep UTS_RELEASE ${with_kerneldir}/include/linux/version.h | \ + sed 's/^\#define UTS_RELEASE \"\(2\.[0-9]\)\..*/\1/'` + if test "x$kernelver" = "x2.6"; then + CPPFLAGS="$CPPFLAGS -D__user=" + AC_SUBST(CPPFLAGS) + fi + fi]) +AC_CHECK_HEADER([linux/ipmi.h], + [AC_DEFINE(HAVE_OPENIPMI_H, [1], + [Define to 1 if you have the header file.])], + [echo "** Unable to find OpenIPMI header files. Using internal version."]) -AC_SUBST(PLUGIN_INTF_LANPLUS) -AC_SUBST(STATIC_INTF_LANPLUS) -AC_SUBST(LDFLAGS_INTF_LANPLUS) - - - -PLUGIN_INTF_OPEN= -STATIC_INTF_OPEN= -LDFLAGS_INTF_OPEN= +dnl enable Linux OpenIPMI interface AC_ARG_ENABLE([intf-open], -[[ --enable-intf-open enable Linux OpenIPMI interface]] -[[ plugin : build dynamic]] -[[ static : link statically [default]]] -[[ --diable-intf-open disable Linux OpenIPMI interface]], - [if test "x$have_openipmi" = "xyes"; then - if test "x$enableval" = "xplugin" || test "x$enableval" = "xdynamic"; then - AC_SUBST(INTF_OPEN,open) - PLUGIN_INTF_OPEN="libintf_open.la" - LDFLAGS_INTF_OPEN="-rpath $pluginpath -avoid-version" - DYNAMIC_INTF_LIST="open $DYNAMIC_INTF_LIST" - elif test "x$enableval" = "xstatic" || test "x$enableval" = "xyes"; then - AC_SUBST(INTF_OPEN,open) - STATIC_INTF_OPEN="libintf_open.la" - STATIC_INTF_LIST="open $STATIC_INTF_LIST" - fi - else - echo "** Unable to build Linux OpenIPMI interface support!" - fi], - [if test "x$have_openipmi" = "xyes"; then - AC_SUBST(INTF_OPEN,open) - STATIC_INTF_OPEN="libintf_open.la" - STATIC_INTF_LIST="open $STATIC_INTF_LIST" - fi]) -AC_SUBST(PLUGIN_INTF_OPEN) -AC_SUBST(STATIC_INTF_OPEN) -AC_SUBST(LDFLAGS_INTF_OPEN) + [AC_HELP_STRING([--enable-intf-open], + [enable Linux OpenIPMI interface [default=yes]])], + [], [enable_intf_open=yes]) +if test "x$enable_intf_open" = "xyes"; then + AC_DEFINE(IPMI_INTF_OPEN, [1], [Enable Linux OpenIPMI interface]) + AC_SUBST(INTF_OPEN, [open]) + AC_SUBST(INTF_OPEN_LIB, [libintf_open.la]) + IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB open/libintf_open.la" +fi -PLUGIN_INTF_LIPMI= -STATIC_INTF_LIPMI= -LDFLAGS_INTF_LIPMI= +dnl enable Intel IMB interface +AC_ARG_ENABLE([intf-imb], + [AC_HELP_STRING([--enable-intf-imb], + [enable Intel IMB driver interface [default=yes]])], + [], [enable_intf_imb=yes]) +if test "x$enable_intf_imb" = "xyes"; then + AC_DEFINE(IPMI_INTF_IMB, [1], [Enable IMB interface]) + AC_SUBST(INTF_IMB, [imb]) + AC_SUBST(INTF_IMB_LIB, [libintf_imb.la]) + IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB imb/libintf_imb.la" +fi + +dnl enable Solaris LIPMI interface +AC_CHECK_HEADER([sys/lipmi/lipmi_intf.h], [have_lipmi=yes], [have_lipmi=no]) AC_ARG_ENABLE([intf-lipmi], -[[ --enable-intf-lipmi enable Solaris x86 IPMI interface]] -[[ plugin : build dynamic]] -[[ static : link statically [default]]] -[[ --diable-intf-lipmi disable Solaris x86 IPMI interface]], - [if test "x$have_lipmi" = "xyes"; then - if test "x$enableval" = "xplugin" || test "x$enableval" = "xdynamic"; then - AC_SUBST(INTF_LIPMI,lipmi) - PLUGIN_INTF_LIPMI="libintf_lipmi.la" - LDFLAGS_INTF_LIPMI="-rpath $pluginpath -avoid-version" - DYNAMIC_INTF_LIST="lipmi $DYNAMIC_INTF_LIST" - elif test "x$enableval" = "xstatic" || test "x$enableval" = "xyes"; then - AC_SUBST(INTF_LIPMI,lipmi) - STATIC_INTF_LIPMI="libintf_lipmi.la" - STATIC_INTF_LIST="lipmi $STATIC_INTF_LIST" - fi - else - echo "** Unable to build Solaris x86 IPMI interface support!" + [AC_HELP_STRING([--enable-intf-lipmi], + [enable Solaris x86 IPMI interface [default=auto]])], + [if test "x$enable_intf_lipmi" != "xno" && test "x$have_lipmi" != "xyes"; then + echo "** Unable to build Solaris x86 IPMI interface support!" + enable_intf_lipmi=no fi], - [if test "x$have_lipmi" = "xyes"; then - AC_SUBST(INTF_LIPMI,lipmi) - STATIC_INTF_LIPMI="libintf_lipmi.la" - STATIC_INTF_LIST="lipmi $STATIC_INTF_LIST" - fi]) -AC_SUBST(PLUGIN_INTF_LIPMI) -AC_SUBST(STATIC_INTF_LIPMI) -AC_SUBST(LDFLAGS_INTF_LIPMI) + [enable_intf_lipmi=$have_lipmi]) +if test "x$enable_intf_lipmi" = "xyes"; then + AC_DEFINE(IPMI_INTF_LIPMI, [1], [Enable Solaris LIPMI interface]) + AC_SUBST(INTF_LIPMI, [lipmi]) + AC_SUBST(INTF_LIPMI_LIB, [libintf_lipmi.la]) + IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lipmi/libintf_lipmi.la" +fi -for name in $STATIC_INTF_LIST; do - STATIC_INTF="$STATIC_INTF { \"intf_${name}\", ${name}_intf_setup },"; - STATIC_INTF_EXT="$STATIC_INTF_EXT extern int ${name}_intf_setup(struct ipmi_intf ** intf);"; - STATIC_INTF_LIB="$STATIC_INTF_LIB \$(top_builddir)/src/plugins/${name}/libintf_${name}.la"; -done +AC_SUBST(IPMITOOL_INTF_LIB) -AC_SUBST(STATIC_INTF) -AC_SUBST(STATIC_INTF_EXT) -AC_SUBST(STATIC_INTF_LIB) - -dnl Enable ipmi event daemon binary that requires OpenIPMI +dnl Enable IPMI Event Daemon AC_ARG_ENABLE([ipmievd], - [[ --enable-ipmievd enable event daemon - requires OpenIPMI [default=no]]],,enable_ipmievd=no) + [AC_HELP_STRING([--enable-ipmievd], + [enable IPMI Event daemon [default=yes]])], + [], [enable_ipmievd=yes]) AM_CONDITIONAL(IPMIEVD, test "x$enable_ipmievd" = "xyes") if test "x$enable_ipmievd" = "xyes"; then - if test "x$have_openipmi" = "xyes"; then - IPMIEVD_SRC="ipmievd.c" - IPMIEVD_BIN="ipmievd" - else - echo "** Unable to build IPMI event daemon: OpenIPMI not found!" - fi + AC_SUBST(IPMIEVD_BIN, [ipmievd]) fi -AC_SUBST(IPMIEVD_SRC) -AC_SUBST(IPMIEVD_BIN) -AC_CONFIG_FILES([ipmitool.spec - Makefile +AC_CONFIG_FILES([Makefile doc/Makefile - doc/ipmitool.1 contrib/Makefile control/Makefile control/pkginfo control/prototype + control/ipmitool.spec lib/Makefile include/Makefile include/ipmitool/Makefile src/Makefile - src/plugins/ipmi_intf_static.c src/plugins/Makefile src/plugins/lan/Makefile src/plugins/lanplus/Makefile src/plugins/open/Makefile + src/plugins/imb/Makefile src/plugins/lipmi/Makefile]) AC_OUTPUT AC_MSG_RESULT([]) -AC_MSG_RESULT([$PACKAGE $VERSION]) +AC_MSG_RESULT([ipmitool $VERSION]) AC_MSG_RESULT([]) -AC_MSG_RESULT([ IPMItool Binary....... : $IPMITOOL_BIN]) -AC_MSG_RESULT([ Interface Path........ : $pluginpath]) -AC_MSG_RESULT([ Static Interfaces..... : $STATIC_INTF_LIST]) -AC_MSG_RESULT([ Dynamic Interfaces.... : $DYNAMIC_INTF_LIST]) -AC_MSG_RESULT([ Build ipmievd......... : $enable_ipmievd]) +AC_MSG_RESULT([Interfaces]) +AC_MSG_RESULT([ lan : $enable_intf_lan]) +AC_MSG_RESULT([ lanplus : $enable_intf_lanplus]) +AC_MSG_RESULT([ open : $enable_intf_open]) +AC_MSG_RESULT([ imb : $enable_intf_imb]) +AC_MSG_RESULT([ lipmi : $enable_intf_lipmi]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([Extra tools]) +AC_MSG_RESULT([ ipmievd : $enable_ipmievd]) AC_MSG_RESULT([]) diff --git a/ipmitool/contrib/Makefile.am b/ipmitool/contrib/Makefile.am index eeaf555..36d8931 100644 --- a/ipmitool/contrib/Makefile.am +++ b/ipmitool/contrib/Makefile.am @@ -34,6 +34,6 @@ MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = bmcautoconf.sh \ +dist_pkgdata_DATA = bmclanconf README \ collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh diff --git a/ipmitool/control/Makefile.am b/ipmitool/control/Makefile.am index de1512e..4b107d8 100644 --- a/ipmitool/control/Makefile.am +++ b/ipmitool/control/Makefile.am @@ -34,6 +34,8 @@ MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = pkginfo.in prototype.in +EXTRA_DIST = pkginfo.in prototype.in ipmitool.spec.in \ + rpmrc rpmmacros dist-hook: pkginfo prototype + diff --git a/ipmitool/doc/Makefile.am b/ipmitool/doc/Makefile.am index 4cc27a8..f0729ba 100644 --- a/ipmitool/doc/Makefile.am +++ b/ipmitool/doc/Makefile.am @@ -32,22 +32,9 @@ # in the design, construction, operation or maintenance of any nuclear # facility. -MAINTAINERCLEANFILES = Makefile.in ipmitool.1 +MAINTAINERCLEANFILES = Makefile.in man_MANS = ipmitool.1 -EXTRA_DIST = ipmitool.1.in -install-data-hook: - if test @IPMITOOL_BIN@ != ipmitool && \ - test -e $(DESTDIR)$(mandir)/man1/ipmitool.1 ; then \ - mv -f $(DESTDIR)$(mandir)/man1/ipmitool.1 \ - $(DESTDIR)$(mandir)/man1/@IPMITOOL_BIN@.1 ; \ - fi - -uninstall-hook: - if test @IPMITOOL_BIN@ != ipmitool && \ - test -e $(DESTDIR)$(mandir)/man1/@IPMITOOL_BIN@.1 ; then \ - mv -f $(DESTDIR)$(mandir)/man1/@IPMITOOL_BIN@.1 \ - $(DESTDIR)$(mandir)/man1/ipmitool.1 ; \ - fi +EXTRA_DIST = $(man_MANS) diff --git a/ipmitool/include/ipmitool/Makefile.am b/ipmitool/include/ipmitool/Makefile.am index b86ef9c..333fa4e 100644 --- a/ipmitool/include/ipmitool/Makefile.am +++ b/ipmitool/include/ipmitool/Makefile.am @@ -34,9 +34,7 @@ MAINTAINERCLEANFILES = Makefile.in -ipmitooldir = $(includedir)/ipmitool - -noinst_HEADERS = bswap.h helper.h ipmi.h ipmi_intf.h \ +noinst_HEADERS = log.h bswap.h helper.h ipmi.h ipmi_intf.h \ ipmi_chassis.h ipmi_entity.h ipmi_fru.h ipmi_lanp.h \ ipmi_sdr.h ipmi_sel.h ipmi_sol.h ipmi_bmc.h \ ipmi_channel.h ipmi_sensor.h ipmi_event.h ipmi_session.h \ diff --git a/ipmitool/lib/Makefile.am b/ipmitool/lib/Makefile.am index 62f132a..da835bb 100644 --- a/ipmitool/lib/Makefile.am +++ b/ipmitool/lib/Makefile.am @@ -38,7 +38,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libipmitool.la libipmitool_la_SOURCES = helper.c ipmi_sdr.c ipmi_sel.c ipmi_sol.c ipmi_isol.c ipmi_lanp.c \ ipmi_fru.c ipmi_chassis.c ipmi_bmc.c dimm_spd.c ipmi_sensor.c \ - ipmi_channel.c ipmi_event.c ipmi_session.c ipmi_strings.c ipmi_user.c + ipmi_channel.c ipmi_event.c ipmi_session.c ipmi_strings.c ipmi_user.c log.c libipmitool_la_LDFLAGS = -export-dynamic libipmitool_la_LIBADD = -lm libipmitool_la_DEPENDENCIES = diff --git a/ipmitool/src/Makefile.am b/ipmitool/src/Makefile.am index 5cf346a..263bc68 100644 --- a/ipmitool/src/Makefile.am +++ b/ipmitool/src/Makefile.am @@ -37,23 +37,15 @@ SUBDIRS = plugins MAINTAINERCLEANFILES = Makefile.in -LIBIPMITOOL = $(top_srcdir)/lib/libipmitool.la -LIBIPMIINTF = $(top_srcdir)/src/plugins/libintf.la - -EXTRA_DIST = @IPMIEVD_SRC@ - -if IPMIADM -ipmiadm_SOURCES = ipmitool.c -ipmiadm_LDADD = $(LIBIPMITOOL) $(LIBIPMIINTF) -else ipmitool_SOURCES = ipmitool.c -ipmitool_LDADD = $(LIBIPMITOOL) $(LIBIPMIINTF) -endif +ipmitool_LDADD = $(top_builddir)/lib/libipmitool.la plugins/libintf.la if IPMIEVD ipmievd_SOURCES = ipmievd.c -ipmievd_LDADD = $(LIBIPMITOOL) $(LIBIPMIINTF) +ipmievd_LDADD = $(top_builddir)/lib/libipmitool.la plugins/libintf.la endif -bin_PROGRAMS = @IPMITOOL_BIN@ @IPMIEVD_BIN@ -EXTRA_PROGRAMS = ipmitool ipmiadm ipmievd +EXTRA_DIST = ipmievd.c + +bin_PROGRAMS = ipmitool @IPMIEVD_BIN@ +EXTRA_PROGRAMS = ipmitool ipmievd diff --git a/ipmitool/src/plugins/Makefile.am b/ipmitool/src/plugins/Makefile.am index 72647d2..ea14b11 100644 --- a/ipmitool/src/plugins/Makefile.am +++ b/ipmitool/src/plugins/Makefile.am @@ -32,18 +32,16 @@ # in the design, construction, operation or maintenance of any nuclear # facility. -plugindir = $(pluginpath) +MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/include $(INCLTDL) -MAINTAINERCLEANFILES = Makefile.in ipmi_intf_static.c -EXTRA_DIST = ipmi_intf_static.c.in +INCLUDES = -I$(top_srcdir)/include -SUBDIRS = @INTF_LAN@ @INTF_LANPLUS@ @INTF_OPEN@ @INTF_LIPMI@ -DIST_SUBDIRS = lan lanplus open lipmi +SUBDIRS = @INTF_LAN@ @INTF_LANPLUS@ @INTF_OPEN@ @INTF_LIPMI@ @INTF_IMB@ +DIST_SUBDIRS = lan lanplus open lipmi imb noinst_LTLIBRARIES = libintf.la -libintf_la_SOURCES = ipmi_intf.c ipmi_intf_static.c +libintf_la_SOURCES = ipmi_intf.c libintf_la_LDFLAGS = -export-dynamic -libintf_la_LIBADD = $(LIBLTDL) @STATIC_INTF_LIB@ -libintf_la_DEPENDENCIES = $(LIBLTDL) @STATIC_INTF_LIB@ +libintf_la_LIBADD = @IPMITOOL_INTF_LIB@ +libintf_la_DEPENDENCIES = @IPMITOOL_INTF_LIB@