(svn r2197) -fix [Makefile]: SDL_CONFIG from makefile.config is now not always overwritten

-fix [OSX]: fixed issue where OSX could not compile the java MIDI app if SHOW_WARNINGS was on (introduced in r1917)
-fix [OSX]: the midi class file is now also deleted with make clear

1 files changed, 8 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index d29dbd8be..1beb39b96 100644
--- a/Makefile
+++ b/Makefile
@@ -160,13 +160,11 @@ ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
 			SDL-CONFIG:=sdl-config
 		endif
 	endif
-else
-	# this should define SDL-CONFIG for manual configuration
-	ifeq ($(shell uname),FreeBSD)
-		SDL-CONFIG:=sdl11-config
-	else
-		SDL-CONFIG:=sdl-config
-	endif
+endif
+
+ifndef SDL-CONFIG
+	UPDATECONFIG:=upgradeconf
+	CONFIG_INCLUDED:=
 endif
 
 # this is used if there aren't any Makefile.config
@@ -776,6 +774,7 @@ quiet_cmd_cxx_compile = '===> Compiling $<'
 
 ifdef OSX
 OSX:=OSX
+OSX_MIDI_PLAYER_FILE:=os/macos/OpenTTDMidi.class
 endif
 
 
@@ -803,7 +802,7 @@ $(OSX): $(TTD)
 	$(Q)os/macos/plistgen.sh "$(OSXAPP)" "$(REV)"
 	$(Q)cp os/macos/track_starter "$(OSXAPP)"/contents/macos
 	$(Q)ls os/macos | grep -q "\.class" || \
-	$(Q)       javac os/macos/OpenTTDMidi.java
+	       javac os/macos/OpenTTDMidi.java
 	$(Q)cp os/macos/OpenTTDMidi.class "$(OSXAPP)"/contents/macos
 	$(Q)cp data/* "$(OSXAPP)"/Contents/data/
 	$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/lang/
@@ -920,7 +919,7 @@ FORCE:
 
 clean:
 	@echo '===> Cleaning up'
-	$(Q)rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) endian.h $(ENDIAN_CHECK)
+	$(Q)rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) $(OSX_MIDI_PLAYER_FILE) endian.h $(ENDIAN_CHECK)
 
 mrproper: clean
 	$(Q)rm -rf $(MAKE_CONFIG)