From 4c3955693982680e4b150693af5d14dbd4fc34b3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 4 Jan 2009 05:41:52 +0000
Subject: [PATCH] Fixed some dependency issues with SDL_revision.h

---
 Makefile.in               | 7 ++-----
 src/SDL_fatal.c           | 2 +-
 src/audio/SDL_audio.c     | 1 +
 src/cpuinfo/SDL_cpuinfo.c | 1 -
 src/events/SDL_events.c   | 2 ++
 src/video/SDL_video.c     | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 07c1d1028..fd61d24be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,6 @@ WINDRES	= @WINDRES@
 TARGET  = libSDL.la
 SOURCES = @SOURCES@
 OBJECTS = @OBJECTS@
-REVISION = $(srcdir)/include/SDL_revision.h
 
 SDLMAIN_TARGET = libSDLmain.a
 SDLMAIN_SOURCES = @SDLMAIN_SOURCES@
@@ -51,7 +50,7 @@ LT_RELEASE  = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 LT_LDFLAGS  = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+all: $(srcdir)/configure Makefile $(objects) update-revision $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
 
 $(srcdir)/configure: $(srcdir)/configure.in
 	@echo "Warning, configure.in is out of date"
@@ -67,8 +66,6 @@ $(objects):
 update-revision:
 	$(SHELL) $(auxdir)/updaterev.sh
 
-$(REVISION): update-revision
-
 .PHONY: all update-revision depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist
 depend:
 	@SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" output="$(depend)" \
@@ -81,7 +78,7 @@ depend:
 
 include $(depend)
 
-$(objects)/$(TARGET): $(REVISION) $(OBJECTS)
+$(objects)/$(TARGET): $(OBJECTS)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
 
 $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
diff --git a/src/SDL_fatal.c b/src/SDL_fatal.c
index 09c836c2c..faf614491 100644
--- a/src/SDL_fatal.c
+++ b/src/SDL_fatal.c
@@ -27,7 +27,7 @@
 
 #include <signal.h>
 
-#include "SDL.h"
+#include "SDL_stdinc.h"
 #include "SDL_fatal.h"
 
 /* This installs some signal handlers for the more common fatal signals,
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 42e41549a..4bedee075 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -24,6 +24,7 @@
 /* Allow access to a raw mixing buffer */
 
 #include "SDL.h"
+#include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"
 #include "SDL_sysaudio.h"
diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
index 10515a1ff..282931bcd 100644
--- a/src/cpuinfo/SDL_cpuinfo.c
+++ b/src/cpuinfo/SDL_cpuinfo.c
@@ -23,7 +23,6 @@
 
 /* CPU feature detection for SDL */
 
-#include "SDL.h"
 #include "SDL_cpuinfo.h"
 
 #if defined(__MACOSX__) && defined(__ppc__)
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index a454970dc..94c6d7e9b 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -24,7 +24,9 @@
 /* General event handling code for SDL */
 
 #include "SDL.h"
+#include "SDL_events.h"
 #include "SDL_syswm.h"
+#include "SDL_thread.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 #include "../timer/SDL_timer_c.h"
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index c5af4076d..c8a35b0eb 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -23,7 +23,7 @@
 
 /* The high-level video driver subsystem */
 
-#include "SDL.h"
+#include "SDL_video.h"
 #include "SDL_sysvideo.h"
 #include "SDL_blit.h"
 #include "SDL_pixels_c.h"