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