From 6e81c5c286bd2c3d4795f3289b6d5412f3c902ff Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 4 Oct 2003 01:33:20 +0000 Subject: [PATCH] simplify --- stepmania/src/Makefile.am | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 870078ef02..8d10231659 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -189,16 +189,15 @@ stepmania_SOURCES = $(Screens) $(DataStructures) $(FileTypes) $(StepMania) $(Arc # "fix" would be to statically link SDL_image, but that would mean # dealing with its build and libjpeg, png, etc--not worth it. -libSDL = - if NHAVE_SDL -libSDL += $(srcdir)/SDL-1.2.6/src/.libs/libSDL.a +USE_SDL_LIBS = $(srcdir)/SDL-1.2.6/src/.libs/libSDL.a +else +USE_SDL_LIBS = $(SDL_LIBS) endif stepmania_LDADD = \ $(GL_LIBS) \ - $(libSDL) \ - $(SDL_LIBS) -lSDL_image \ + $(USE_SDL_LIBS) -lSDL_image \ $(AUDIO_LIBS) \ $(srcdir)/libresample/libresample.a