From c8e05cf0ddfbc9997ac1fec172869bb9a6e7f1be Mon Sep 17 00:00:00 2001
From: mbjornstk <mbjornstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 23 Mar 2009 20:35:53 +0000
Subject: [PATCH] Updates so makefiles compile again.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/Makefile.am      | 13 +++++++++----
 src/gui/race_gui.cpp |  4 ++--
 src/player.hpp       |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index d2681760f..f660c03ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,6 @@ AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\""  \
 
 supertuxkart_SOURCES = \
  main.cpp \
- actionmap.cpp \
- actionmap.hpp \
  material.cpp \
  material.hpp \
  network/network_manager.cpp \
@@ -138,6 +136,15 @@ supertuxkart_SOURCES = \
  karts/player_kart.cpp \
  karts/player_kart.hpp \
  input.hpp \
+ input/device_manager.cpp \
+ input/device_manager.hpp \
+ input/input.hpp \
+ input/input_device.cpp \
+ input/input_device.hpp \
+ input/input_manager.cpp \
+ input/input_manager.hpp \
+ sdl_manager.cpp \
+ sdl_manager.hpp \
  isect.cpp \
  isect.hpp \
  explosion.cpp \
@@ -161,8 +168,6 @@ supertuxkart_SOURCES = \
  callback_manager.hpp \
  main_loop.cpp \
  main_loop.hpp \
- sdldrv.cpp \
- sdldrv.hpp \
  user_pointer.hpp \
  history.cpp \
  history.hpp \
diff --git a/src/gui/race_gui.cpp b/src/gui/race_gui.cpp
index dec16c4c1..e35dcf9fb 100644
--- a/src/gui/race_gui.cpp
+++ b/src/gui/race_gui.cpp
@@ -20,8 +20,8 @@
 
 #include "gui/race_gui.hpp"
 
-#include "input.hpp"
-#include "input_manager.hpp"
+#include "input/input.hpp"
+#include "input/input_manager.hpp"
 #include "user_config.hpp"
 #include "race_manager.hpp"
 #include "material_manager.hpp"
diff --git a/src/player.hpp b/src/player.hpp
index 8e0b61f7a..c5760d74a 100644
--- a/src/player.hpp
+++ b/src/player.hpp
@@ -21,7 +21,7 @@
 #define TUXKART_PLAYER_H
 
 #include <string>
-#include "input.hpp"
+#include "input/input.hpp"
 
 extern const char *sKartAction2String[PA_COUNT];