diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
| commit | 8b6b40b7271acd81a9548f502c18f46f3b640640 (patch) | |
| tree | 1462cb63501a8bdd8845d7c62e038b6a86b78fd5 /hw/kdrive/fake | |
| parent | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (diff) | |
| parent | 3305d17195e3a0a5555300555bd7703312fa489f (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-reworkpci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
Diffstat (limited to 'hw/kdrive/fake')
| -rw-r--r-- | hw/kdrive/fake/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/fake/fake.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/fake/fake.h | 2 | ||||
| -rw-r--r-- | hw/kdrive/fake/fakeinit.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/fake/kbd.c | 3 | ||||
| -rw-r--r-- | hw/kdrive/fake/mouse.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/fake/os.c | 2 |
7 files changed, 4 insertions, 13 deletions
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index 69fdf59d5..09d179eb0 100644 --- a/hw/kdrive/fake/Makefile.am +++ b/hw/kdrive/fake/Makefile.am @@ -21,5 +21,9 @@ Xfake_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xfake_DEPENDENCIES = \ + libfake.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c index ca515f9b6..6211ab871 100644 --- a/hw/kdrive/fake/fake.c +++ b/hw/kdrive/fake/fake.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/fake.h b/hw/kdrive/fake/fake.h index f7c8c3431..88d209674 100644 --- a/hw/kdrive/fake/fake.h +++ b/hw/kdrive/fake/fake.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c index dd88bc5a7..2cfcbedd5 100644 --- a/hw/kdrive/fake/fakeinit.c +++ b/hw/kdrive/fake/fakeinit.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/kbd.c b/hw/kdrive/fake/kbd.c index db224c995..83c1b3b20 100644 --- a/hw/kdrive/fake/kbd.c +++ b/hw/kdrive/fake/kbd.c @@ -1,6 +1,4 @@ /* - * Id: kbd.c,v 1.1 1999/11/02 18:39:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/fake/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/fake/mouse.c b/hw/kdrive/fake/mouse.c index beb6ff524..4b8d2b06d 100644 --- a/hw/kdrive/fake/mouse.c +++ b/hw/kdrive/fake/mouse.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/os.c b/hw/kdrive/fake/os.c index 32cb139c0..76cd9e728 100644 --- a/hw/kdrive/fake/os.c +++ b/hw/kdrive/fake/os.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its |