1.1 --- a/tools/Rules.mk	Sun Apr 03 10:11:45 2005 +0000
     1.2 +++ b/tools/Rules.mk	Sun Apr 03 11:20:01 2005 +0000
     1.3 @@ -23,3 +23,6 @@ endif
     1.4  
     1.5  %.o: %.c
     1.6  	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
     1.7 +
     1.8 +%.o: %.cc
     1.9 +	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<

     2.1 --- a/tools/ioemu/iodev/Makefile	Sun Apr 03 10:11:45 2005 +0000
     2.2 +++ b/tools/ioemu/iodev/Makefile	Sun Apr 03 11:20:01 2005 +0000
     2.3 @@ -10,7 +10,7 @@ LDLIBS= $(BXLIBS) $(X11_LDPATH) -lX11 -l
     2.4  all: device-model
     2.5  
     2.6  device-model: $(OBJS) $(BXLIBS)
     2.7 -	$(LINK.o) $(OBJS) $(LOADLIBES) $(LDLIBS) -o $@
     2.8 +	$(CC) $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LDLIBS) -o $@
     2.9  
    2.10  include $(TOPDIR)/mk/helix.mk
    2.11