Blame SOURCES/0002-nobundle.patch

0c025a
--- a/Makefile.am
0c025a
+++ b/Makefile.am
0c025a
@@ -1,10 +1,10 @@
0c025a
 RPM		= rpmbuild
0c025a
 RPMFLAGS	= -ta
0c025a
 
0c025a
-SUBDIRS    = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
0c025a
+SUBDIRS    = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \
0c025a
 	     ui lanserv sample doc man $(SWIG_DIR)
0c025a
 
0c025a
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
0c025a
+DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \
0c025a
 	     ui lanserv sample doc man swig
0c025a
 
0c025a
 EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
0c025a
--- a/cmdlang/Makefile.am
0c025a
+++ b/cmdlang/Makefile.am
0c025a
@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0
0c025a
 
0c025a
 AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \
0c025a
 	-I$(top_srcdir)/include \
0c025a
-	-I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
0c025a
+	-DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
0c025a
+	$(EDIT_CFLAGS) \
0c025a
 	$(TCL_CFLAGS)
0c025a
 
0c025a
 lib_LTLIBRARIES = libOpenIPMIcmdlang.la
0c025a
@@ -25,7 +26,7 @@ openipmish_LDADD =  libOpenIPMIcmdlang.la \
0c025a
 		$(top_builddir)/utils/libOpenIPMIutils.la \
0c025a
 		$(top_builddir)/lib/libOpenIPMI.la \
0c025a
 		$(top_builddir)/unix/libOpenIPMIposix.la \
0c025a
-		$(top_builddir)/libedit/libedit.a \
0c025a
+		$(EDIT_LIBS) \
0c025a
 		$(TERM_LIBS) \
0c025a
 		$(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \
0c025a
 		$(TCL_LIB) $(TCL_LIBS) \
0c025a
--- a/configure.ac
0c025a
+++ b/configure.ac
0c025a
@@ -926,7 +926,6 @@ AC_OUTPUT(Makefile
0c025a
 	  swig/perl/Makefile
0c025a
 	  swig/python/Makefile
0c025a
 	  swig/python/openipmigui/Makefile
0c025a
-	  libedit/Makefile
0c025a
 	  cmdlang/Makefile
0c025a
 	  include/Makefile
0c025a
 	  include/OpenIPMI/Makefile
0c025a
--- OpenIPMI-2.0.24/sample/Makefile.am~	2017-07-27 23:01:19.000000000 +0100
0c025a
+++ OpenIPMI-2.0.24/sample/Makefile.am	2017-12-19 07:52:45.368954855 +0000
0c025a
@@ -73,7 +73,8 @@
0c025a
 ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c
0c025a
 ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) \
0c025a
 		$(SOCKETLIB)
0c025a
-ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit
0c025a
+ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS)
0c025a
+ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS)
0c025a
 
0c025a
 EXTRA_DIST = example_oem.c
0c025a
 
0c025a