Merged patch for "compilation outside source directory"

Added missed copyrights for APIC.CC

bochs/cpu/apic.cc

@@ -1,6 +1,29 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: apic.cc,v 1.54 2005-04-29 21:28:42 sshwarts Exp $
+// $Id: apic.cc,v 1.55 2005-06-07 05:54:51 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2001  MandrakeSoft S.A.
+//
+//    MandrakeSoft S.A.
+//    43, rue d'Aboukir
+//    75002 Paris - France
+//    http://www.linux-mandrake.com/
+//    http://www.mandrakesoft.com/
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
 
 #define NEED_CPU_REG_SHORTCUTS 1
 #include "bochs.h"

bochs/iodev/Makefile.in

@@ -62,7 +62,7 @@ NETLOW_OBJS = @NETLOW_OBJS@
 BX_INCDIRS = -I.. -I$(srcdir)/.. -I../@INSTRUMENT_DIR@ -I$(srcdir)/../@INSTRUMENT_DIR@
 LOCAL_CXXFLAGS = $(MCH_CFLAGS)
 
-PCIDEV_CXXFLAGS = -I../host/linux/pcidev
+PCIDEV_CXXFLAGS = -I$(srcdir)/../host/linux/pcidev
 
 OBJS_THAT_CANNOT_BE_PLUGINS = \
   devices.o \