84 lines
2.6 KiB
Diff
84 lines
2.6 KiB
Diff
From db70db7ddbbf34806927e279b969b6667005cd5b Mon Sep 17 00:00:00 2001
|
|
From: Boris Ranto <branto@redhat.com>
|
|
Date: Thu, 2 Jun 2016 12:50:03 +0200
|
|
Subject: [PATCH] Apply 'OpenIPMI-2.0.21-nobundle.patch'
|
|
|
|
Signed-off-by: Boris Ranto <branto@redhat.com>
|
|
---
|
|
Makefile.am | 4 ++--
|
|
cmdlang/Makefile.am | 5 +++--
|
|
configure.ac | 1 -
|
|
sample/Makefile.am | 4 ++--
|
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index b1aacdf..660c693 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1,10 +1,10 @@
|
|
RPM = rpmbuild
|
|
RPMFLAGS = -ta
|
|
|
|
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
|
|
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \
|
|
ui lanserv sample doc man $(SWIG_DIR)
|
|
|
|
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
|
|
+DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \
|
|
ui lanserv sample doc man swig
|
|
|
|
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
|
|
diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
|
|
index e80090d..ae9c65a 100644
|
|
--- a/cmdlang/Makefile.am
|
|
+++ b/cmdlang/Makefile.am
|
|
@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0
|
|
|
|
AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \
|
|
-I$(top_srcdir)/include \
|
|
- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
|
|
+ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
|
|
+ $(EDIT_CFLAGS) \
|
|
$(TCL_CFLAGS)
|
|
|
|
lib_LTLIBRARIES = libOpenIPMIcmdlang.la
|
|
@@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \
|
|
$(top_builddir)/utils/libOpenIPMIutils.la \
|
|
$(top_builddir)/lib/libOpenIPMI.la \
|
|
$(top_builddir)/unix/libOpenIPMIposix.la \
|
|
- $(top_builddir)/libedit/libedit.a \
|
|
+ $(EDIT_LIBS) \
|
|
$(TERM_LIBS) \
|
|
$(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \
|
|
$(TCL_LIB) $(TCL_LIBS) \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 5103556..ae86ac8 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -926,7 +926,6 @@ AC_OUTPUT(Makefile
|
|
swig/perl/Makefile
|
|
swig/python/Makefile
|
|
swig/python/openipmigui/Makefile
|
|
- libedit/Makefile
|
|
cmdlang/Makefile
|
|
include/Makefile
|
|
include/OpenIPMI/Makefile
|
|
diff --git a/sample/Makefile.am b/sample/Makefile.am
|
|
index 06278bd..91d1351 100644
|
|
--- a/sample/Makefile.am
|
|
+++ b/sample/Makefile.am
|
|
@@ -59,8 +59,8 @@ solterm_LDADD = $(POPTLIBS) $(top_builddir)/utils/libOpenIPMIutils.la \
|
|
rmcp_ping_SOURCES = rmcp_ping.c
|
|
|
|
ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c
|
|
-ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS)
|
|
-ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit
|
|
+ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) $(TERM_LIBS)
|
|
+ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS)
|
|
|
|
EXTRA_DIST = example_oem.c
|
|
|
|
--
|
|
2.7.4
|
|
|