From 1ce24d0c5e77b750b34ecf0afbf4c285acc41379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com> Date: Sat, 29 Oct 2016 15:48:52 +0200 Subject: [PATCH] Makefile: Fix ordering of linker arguments --- Makefile | 2 +- lib-w/Makefile.w32 | 2 +- lib/Makefile | 2 +- stats/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8f750e6..9576d11 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ realclean: clean include stats/Makefile harris: harris.o $(OBJS) - $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) harris.o -o $@ $(SDL) + $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) $(OBJS) harris.o -o $@ $(LDFLAGS) $(LIBS) $(SDL) harris.o: harris.c $(INCLUDES) $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) -o $@ -c $< diff --git a/lib-w/Makefile.w32 b/lib-w/Makefile.w32 index 4c85a89..893301f 100644 --- a/lib-w/Makefile.w32 +++ b/lib-w/Makefile.w32 @@ -18,7 +18,7 @@ SAVES := save/qstart.sav save/civ.sav save/abd.sav save/ruhr.sav all: harris.exe $(SAVES) dat/targets dat/cities/Saarbrucken.pbm dat/cities/Lubeck.pbm dat/cities/Peenemunde.pbm harris.exe: harris.o $(OBJS) - $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(SDL) harris.o -o $@ + $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) $(OBJS) harris.o -o $@ $(LDFLAGS) $(LIBS) $(SDL) harris.o: harris.c $(INCLUDES) $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) -o $@ -c $< diff --git a/lib/Makefile b/lib/Makefile index e5a40b5..9afdac7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -21,7 +21,7 @@ SDL := `sdl-config --libs` -lSDL_ttf -lSDL_gfx -lSDL_image SDLFLAGS := `sdl-config --cflags` harris: - $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) harris.o -o $@ $(SDL) + $(CC) $(CFLAGS) $(CPPFLAGS) $(SDLFLAGS) $(OBJS) harris.o -o $@ $(LDFLAGS) $(LIBS) $(SDL) install: install -d $(BINIDIR) $(DATIDIR) diff --git a/stats/Makefile b/stats/Makefile index b6df21f..f47892d 100644 --- a/stats/Makefile +++ b/stats/Makefile @@ -6,5 +6,5 @@ STATS_INCLUDES := $(STATS_OBJS:.o=.h) stats: stats/read_history stats/como stats/cshr stats/kills stats/fighters stats/raids stats/bombers stats/%: stats/%.c $(OBJS) $(STATS_OBJS) $(INCLUDES) $(STATS_INCLUDES) - $(CC) $(CFLAGS) $(CPPFLAGS) -I . $(SDLFLAGS) $(LDFLAGS) $(LIBS) $< $(OBJS) $(STATS_OBJS) -o $@ $(SDL) + $(CC) $(CFLAGS) $(CPPFLAGS) -I . $(SDLFLAGS) $< $(OBJS) $(STATS_OBJS) -o $@ $(LDFLAGS) $(LIBS) $(SDL) -- 2.10.1