Commit dc7d3c42 authored by Sam Lantinga's avatar Sam Lantinga

Fixed some dependency issues with SDL_revision.h

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403446
parent 9e30d802
......@@ -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)
......
......@@ -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,
......
......@@ -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"
......
......@@ -23,7 +23,6 @@
/* CPU feature detection for SDL */
#include "SDL.h"
#include "SDL_cpuinfo.h"
#if defined(__MACOSX__) && defined(__ppc__)
......
......@@ -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"
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment