mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build process without libtool and plugins

Browse Source
This commit is contained in:
Volker Ruppert 2014-01-03 21:58:04 +00:00
parent 8c66e91f81
commit 23a2ded526
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/configure.in
View File

@ -122,6 +122,8 @@ if test "$NO_LT" != 1; then
dnl Configure the ltdl library. This must go after AC_PROG_LIBTOOL or
dnl else it disables shared libraries somehow.
AC_LIB_LTDL
else
RANLIB="echo"
fi
AC_PATH_PROG(PKGCONFIG, pkg-config, not_found)
@ -443,8 +445,6 @@ if test "$bx_plugins" = 1; then
PLUGIN_VAR="ltdl.o"
PLUGIN_LIB="ltdl.o"
fi
else
RANLIB="echo"
fi
PLUGIN_TARGET=bochs_plugins
INSTALL_PLUGINS_VAR=install_libtool_plugins

2
bochs/gui/Makefile.in
View File

@ -99,7 +99,7 @@ plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
libgui.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libgui.a
@MAKELIB@ $(NONPLUGIN_OBJS)
@RANLIB@ libgui.a
$(RANLIB) libgui.a
# standard compile rule for C++ files
.@CPP_SUFFIX@.o:

2
bochs/iodev/Makefile.in
View File

@ -95,7 +95,7 @@ plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
libiodev.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libiodev.a
@MAKELIB@ $(NONPLUGIN_OBJS)
@RANLIB@ libiodev.a
$(RANLIB) libiodev.a
# standard compile rule for C++ files
.@CPP_SUFFIX@.o:

2
bochs/iodev/display/Makefile.in
View File

@ -71,7 +71,7 @@ plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
libdisplay.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libdisplay.a
@MAKELIB@ $(NONPLUGIN_OBJS)
@RANLIB@ libdisplay.a
$(RANLIB) libdisplay.a
# standard compile rule for C++ files
.@CPP_SUFFIX@.o:

2
bochs/iodev/hdimage/Makefile.in
View File

@ -74,7 +74,7 @@ plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
libhdimage.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libhdimage.a
@MAKELIB@ $(NONPLUGIN_OBJS)
@RANLIB@ libhdimage.a
$(RANLIB) libhdimage.a
# standard compile rule for C++ files
.@CPP_SUFFIX@.o:

2
bochs/iodev/network/Makefile.in
View File

@ -71,7 +71,7 @@ plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
libnetwork.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libnetwork.a
@MAKELIB@ $(NONPLUGIN_OBJS)
@RANLIB@ libnetwork.a
$(RANLIB) libnetwork.a
# standard compile rule for C++ files
.@CPP_SUFFIX@.o:

2
bochs/iodev/sound/Makefile.in
View File

@ -72,7 +72,7 @@ plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
libsound.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libsound.a
@MAKELIB@ $(NONPLUGIN_OBJS)
@RANLIB@ libsound.a
$(RANLIB) libsound.a
# standard compile rule for C++ files
.@CPP_SUFFIX@.o:

2
bochs/iodev/usb/Makefile.in
View File

@ -73,7 +73,7 @@ plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
libusb.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libusb.a
@MAKELIB@ $(NONPLUGIN_OBJS)
@RANLIB@ libusb.a
$(RANLIB) libusb.a
# standard compile rule for C++ files
.@CPP_SUFFIX@.o: