Hi,
On debian-hurd mailing list, Edmund GRIMLEY EVANS <[EMAIL PROTECTED]>
point us that bochs is now LGPL. As I'm trying to use GNU/Hurd under
GNU/Linux, I have checkout your CVS Tree.
I build it in a separate directory but it failed :-( I attach a patch
that correct all Makefile.in to be VPATH compliant.
I also add a new configure option --with-linux-source=dir as I run
2.2.14 Linux kernel but I keep 2.0.36 includes in /usr/src/linux to be
able to compile for 2.0 and 2.2 kernels.
I have not send diff for configure script, you should rebuild it with
autoconf.
Now came the stupid question: How can I setup a freemware process that
run GNU/Hurd on my GNU/Linux ?
--
Edouard G. Parmelan
http://egp.free.fr
Index: Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- Makefile.in 1999/12/22 19:12:25 1.5
+++ Makefile.in 2000/03/23 14:50:29
@@ -21,6 +21,9 @@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
MDEFINES = CC="$(CC)" CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)"
@@ -40,3 +43,6 @@
$(MAKE) -C guest dist-clean
/bin/rm -f config.status config.cache config.log
/bin/rm -f Makefile config.h
+
+Makefile: Makefile.in config.status
+ CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) config.status
Index: configure.in
===================================================================
RCS file: /cvsroot-freemware/freemware/configure.in,v
retrieving revision 1.6
diff -u -r1.6 configure.in
--- configure.in 2000/02/13 21:02:04 1.6
+++ configure.in 2000/03/23 14:50:30
@@ -34,6 +34,13 @@
[ --with-Linux Linux host],
)
+AC_ARG_WITH(linux-source,
+ [ --with-linux-source=dir Linux kernel source dir],
+ [ LINUX_SRC="$withval" ],
+ [ LINUX_SRC="/usr/src/linux" ]
+ )
+AC_SUBST(LINUX_SRC)
+
dnl // make sure Linux is default host if no other chosen
if test "$with_Linux" != yes && \
test "$with_BeOS" != yes && \
Index: guest/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/guest/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- guest/Makefile.in 2000/02/13 21:02:04 1.3
+++ guest/Makefile.in 2000/03/23 14:50:30
@@ -21,6 +21,9 @@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
MDEFINES = CC="$(CC)" CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)"
@@ -42,3 +45,6 @@
$(MAKE) -C preemptive dist-clean
$(MAKE) -C paging dist-clean
/bin/rm -f Makefile
+
+Makefile: Makefile.in ../config.status
+ cd ..; CONFIG_FILES=guest/Makefile CONFIG_HEADERS= $(SHELL)
+config.status
Index: guest/paging/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/guest/paging/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- guest/paging/Makefile.in 2000/02/13 21:02:04 1.1
+++ guest/paging/Makefile.in 2000/03/23 14:50:30
@@ -27,10 +27,10 @@
ALL: kernel
.c.o:
- $(CC) -g -DI80X86 -I$(srcdir)/include $(CFLAGS) -c $<
+ $(CC) -g -DI80X86 -Iinclude -I$(srcdir)/include $(CFLAGS) -c $<
.S.o:
- $(CC) -g -DI80X86 -I$(srcdir)/include $(CFLAGS) -c $<
+ $(CC) -g -DI80X86 -Iinclude -I$(srcdir)/include $(CFLAGS) -c $<
kernel: $(OBJS)
$(CC) -o kernel -Wl,-Ttext,0x100000 -nostartfiles -nostdlib $(OBJS)
@@ -42,4 +42,4 @@
/bin/rm -f Makefile
Makefile: Makefile.in ../../config.status
- cd ../..; CONFIG_FILES=guest/preemptive/Makefile CONFIG_HEADERS=
$(SHELL) config.status
+ cd ../..; CONFIG_FILES=guest/paging/Makefile CONFIG_HEADERS= $(SHELL)
+config.status
Index: guest/preemptive/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/guest/preemptive/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- guest/preemptive/Makefile.in 2000/02/13 21:02:04 1.5
+++ guest/preemptive/Makefile.in 2000/03/23 14:50:30
@@ -27,10 +27,10 @@
ALL: kernel
.c.o:
- $(CC) -g -DI80X86 -I$(srcdir)/include $(CFLAGS) -c $<
+ $(CC) -g -DI80X86 -Iinclude -I$(srcdir)/include $(CFLAGS) -c $<
.S.o:
- $(CC) -g -DI80X86 -I$(srcdir)/include $(CFLAGS) -c $<
+ $(CC) -g -DI80X86 -Iinclude -I$(srcdir)/include $(CFLAGS) -c $<
kernel: $(OBJS)
$(CC) -o kernel -Wl,-Ttext,0x100000 -nostartfiles -nostdlib $(OBJS)
Index: kernel/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/kernel/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- kernel/Makefile.in 2000/01/23 19:59:35 1.12
+++ kernel/Makefile.in 2000/03/23 14:50:30
@@ -31,7 +31,7 @@
# extra kernel CFLAGS and LDFLAGS for each host OS
KCFLAGS_LINUX = -fno-strength-reduce -fomit-frame-pointer \
-malign-loops=2 -malign-jumps=2 -malign-functions=2 \
- -D__KERNEL__ -I/usr/src/linux/include -DCPU=586 -DMODULE
+ -D__KERNEL__ -I@LINUX_SRC@/include -DCPU=586 -DMODULE
KLDFLAGS_LINUX = -r
KCFLAGS_BEOS =
@@ -39,7 +39,7 @@
KLDFLAGS = $(KLDFLAGS_@HOSTOS@)
-ALL_CFLAGS = $(CFLAGS) $(KCFLAGS_@HOSTOS@) -I$(srcdir)/include -I$(srcdir)/..
+ALL_CFLAGS = $(CFLAGS) $(KCFLAGS_@HOSTOS@) -Iinclude -I$(srcdir)/include -I..
+-I$(srcdir)/..
#
# mknod /dev/freemware0 c 63 0
Index: user/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/user/Makefile.in,v
retrieving revision 1.13
diff -u -r1.13 Makefile.in
--- user/Makefile.in 2000/01/23 19:59:35 1.13
+++ user/Makefile.in 2000/03/23 14:50:30
@@ -30,7 +30,7 @@
make -C plugins $(MDEFINES)
.c.o:
- $(CC) -g -I$(srcdir)/.. -I$(srcdir) $(CFLAGS) -c $<
+ $(CC) -g -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(CFLAGS) -c $<
freemware: freemware.o user.o decode.o plugin.o emulation.o bin.o
$(CC) -o freemware freemware.o emulation.o bin.o user.o decode.o plugin.o -ldl
-rdynamic
Index: user/plugins/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/user/plugins/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- user/plugins/Makefile.in 2000/01/09 21:49:15 1.1
+++ user/plugins/Makefile.in 2000/03/23 14:50:30
@@ -15,6 +15,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+srcdir = @srcdir@
+VPATH = @srcdir@
+
all:
$(MAKE) -C bochs $(MDEFINES)
$(MAKE) -C ice $(MDEFINES)
Index: user/plugins/bochs/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/user/plugins/bochs/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- user/plugins/bochs/Makefile.in 2000/01/23 19:59:35 1.5
+++ user/plugins/bochs/Makefile.in 2000/03/23 14:50:30
@@ -33,9 +33,9 @@
ALL: plugin-bochs.so
.c.o:
- $(CC) -g -fPIC -I$(srcdir)/../../.. -I$(srcdir)/../.. -I$(srcdir) $(CFLAGS) -c
$<
+ $(CC) -g -fPIC -I../../.. -I$(srcdir)/../../.. -I../.. -I$(srcdir)/../.. -I.
+-I$(srcdir) $(CFLAGS) -c $<
.@[email protected]:
- $(CXX) -g -fPIC -I$(srcdir)/../../.. -I$(srcdir)/../.. -I$(srcdir) $(CXXFLAGS)
-c $<
+ $(CXX) -g -fPIC -I../../.. -I$(srcdir)/../../.. -I../.. -I$(srcdir)/../.. -I.
+-I$(srcdir) $(CXXFLAGS) -c $<
plugin-bochs.so: io.o pc_system.o state_file.o iodev/libiodev.a gui/libgui.a
$(CXX) -shared -o plugin-bochs.so io.o pc_system.o state_file.o \
Index: user/plugins/bochs/gui/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/user/plugins/bochs/gui/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- user/plugins/bochs/gui/Makefile.in 2000/01/23 20:16:03 1.7
+++ user/plugins/bochs/gui/Makefile.in 2000/03/23 14:50:30
@@ -34,6 +34,9 @@
BEOS_CFLAGS = -Wno-multichar
RANLIB = @RANLIB@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
GUI_OBJS_X11 = x.o
GUI_OBJS_BEOS = beos.o
GUI_OBJS_WIN32 = win32.o
@@ -41,7 +44,7 @@
GUI_OBJS_CURSES = curses.o
GUI_OBJS = gui.o @GUI_OBJS@
-BX_INCDIRS = -I../../../.. -I../../.. -I.. -I../iodev -I../@INSTRUMENT_DIR@
+BX_INCDIRS = -I../../../.. -I$(srcdir)/../../../.. -I../../.. -I$(srcdir)/../../..
+-I.. -I$(srcdir)/.. -I../iodev -I$(srcdir)../iodev -I../@INSTRUMENT_DIR@
+-I$(srcdir)/../@INSTRUMENT_DIR@
LOCAL_CXXFLAGS =
#
@@ -64,10 +67,10 @@
$(RANLIB) libgui.a
beos.o: beos.@CPP_SUFFIX@
- $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(BEOS_CFLAGS)
beos.@CPP_SUFFIX@
+ $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(BEOS_CFLAGS) $<
x.o: x.@CPP_SUFFIX@
- $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS)
x.@CPP_SUFFIX@
+ $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $<
x.cc: gui.h
@@ -80,3 +83,6 @@
dist-clean: clean
@RMCOMMAND@ Makefile
+
+Makefile: Makefile.in ../../../../config.status
+ cd ../../../../; CONFIG_FILES=user/plugins/bochs/gui/Makefile CONFIG_HEADERS=
+$(SHELL) config.status
Index: user/plugins/bochs/iodev/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/user/plugins/bochs/iodev/Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in
--- user/plugins/bochs/iodev/Makefile.in 2000/01/23 19:59:35 1.6
+++ user/plugins/bochs/iodev/Makefile.in 2000/03/23 14:50:30
@@ -32,11 +32,14 @@
LIBS = @LIBS@
RANLIB = @RANLIB@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
VIDEO_OBJS_VGA = vga.o
VIDEO_OBJS_HGA = hga.o
VIDEO_OBJS = @VIDEO_OBJS@
-BX_INCDIRS = -I../../../.. -I../../.. @[EMAIL PROTECTED] -I../@INSTRUMENT_DIR@
+BX_INCDIRS = -I../../../.. -I$(srcdir)/../../../.. -I../../.. -I$(srcdir)/../../..
+-I.. -I$(srcdir)/.. -I../@INSTRUMENT_DIR@ -I$(srcdir)/../@INSTRUMENT_DIR@
LOCAL_CXXFLAGS = $(MCH_CFLAGS)
SB16_DUMMY_OBJS = sb16.o
@@ -60,7 +63,7 @@
BX_INCLUDES = iodev.h
.@[email protected]:
- $(CXX) -I../../../.. @DASH@c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS)
@CXXFP@$< @OFP@$@
+ $(CXX) -I../../../.. -I$(srcdir)/../../../.. -c $(CXXFLAGS) $(LOCAL_CXXFLAGS)
+$(BX_INCDIRS) @CXXFP@$< @OFP@$@
Index: user/plugins/ice/Makefile.in
===================================================================
RCS file: /cvsroot-freemware/freemware/user/plugins/ice/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- user/plugins/ice/Makefile.in 2000/01/23 19:59:35 1.5
+++ user/plugins/ice/Makefile.in 2000/03/23 14:50:30
@@ -29,7 +29,7 @@
ALL: plugin-ice.so
.c.o:
- $(CC) -g -I$(srcdir)/../../.. -I$(srcdir)/../.. -I$(srcdir) $(CFLAGS) -c $<
+ $(CC) -g -I../../.. -I$(srcdir)/../../.. -I../.. -I$(srcdir)/../.. -I.
+-I$(srcdir) $(CFLAGS) -c $<
plugin-ice.so: server.o utils.o remote-utils.o low-freemware.o
$(CC) -shared -o plugin-ice.so server.o utils.o \
