From 5ad3d92e6785ff8dd8b62cb8f273116bb1f3e2f5 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Wed, 11 Sep 2013 08:52:36 -0500 Subject: [PATCH] Makefile improvements Only use OS X build options when running on OS X Cleanup extra build files on OS X when running `make clean` --- Makefile.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 81bce8c2..8b3a3133 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,13 +17,15 @@ all: libsdl2.dummy UNAME=$(shell uname) -ifeq (%SDL_MODE%,framework) -RUSTFLAGS+=--cfg mac_framework -else -RUSTFLAGS+=--cfg mac_dylib +ifeq ($(UNAME),Darwin) + ifeq (%SDL_MODE%,framework) + RUSTFLAGS+=--cfg mac_framework + else + RUSTFLAGS+=--cfg mac_dylib + endif endif -libsdl2.dummy: src/sdl2.rc $(RUST_SRC) $(SDLXMAIN) +libsdl2.dummy: src/sdl2.rc $(RUST_SRC) $(RUSTC) $(RUSTFLAGS) $< -o $@ touch $@ @@ -35,4 +37,6 @@ demo: demos .PHONY: clean clean: - rm -f sdl-test *.so *.dylib *.dll *.dummy demos + rm -f *.so *.dylib *.dll *.dummy demos + rm -rf *.dSYM +