From 50584c5541c64f8209b184062d3deb553db1f8b7 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 12 Nov 2019 09:53:24 -0500 Subject: [PATCH] fix ordering of LFLAGS in Makefiles recent Debian stopped allowing this --- gr-sim/fade/Makefile | 2 +- gr-sim/hgr/Makefile | 20 ++++++++++---------- gr-sim/kaleido_sparkle/Makefile | 6 +++--- gr-sim/rasterbars/Makefile | 7 +++---- gr-sim/split_screen/Makefile | 2 +- gr-sim/starfield/Makefile | 4 ++-- gr-sim/text/Makefile | 2 +- hgr-utils/Makefile | 9 ++++----- 8 files changed, 25 insertions(+), 27 deletions(-) diff --git a/gr-sim/fade/Makefile b/gr-sim/fade/Makefile index 536272f2..bdb6e843 100644 --- a/gr-sim/fade/Makefile +++ b/gr-sim/fade/Makefile @@ -17,7 +17,7 @@ all: fade #### fade: fade.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o fade fade.o $(GR_SIM) + $(CC) -o fade fade.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) fade.o: fade.c demo_title.c $(CC) $(CFLAGS) -c fade.c diff --git a/gr-sim/hgr/Makefile b/gr-sim/hgr/Makefile index f41a058d..ac6c01af 100644 --- a/gr-sim/hgr/Makefile +++ b/gr-sim/hgr/Makefile @@ -11,15 +11,15 @@ all: fireworks fw_purple lines image_load hgr_view seven random16 scroll scroll- ### hgr_view: hgr_view.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o hgr_view hgr_view.o $(GR_SIM) - + $(CC) -o hgr_view hgr_view.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) hgr_view.o: hgr_view.c + $(CC) $(CFLAGS) -c hgr_view.c ### image_load: image_load.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o image_load image_load.o $(GR_SIM) + $(CC) -o image_load image_load.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) image_load.o: image_load.c $(CC) $(CFLAGS) -c image_load.c @@ -27,7 +27,7 @@ image_load.o: image_load.c ### lines: lines.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o lines lines.o $(GR_SIM) + $(CC) -o lines lines.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) lines.o: lines.c $(CC) $(CFLAGS) -c lines.c @@ -35,7 +35,7 @@ lines.o: lines.c ### fireworks: fireworks.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o fireworks fireworks.o $(GR_SIM) + $(CC) -o fireworks fireworks.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) fireworks.o: fireworks.c $(CC) $(CFLAGS) -c fireworks.c @@ -43,14 +43,14 @@ fireworks.o: fireworks.c ### fw_purple: fw_purple.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o fw_purple fw_purple.o $(GR_SIM) + $(CC) -o fw_purple fw_purple.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) fw_purple.o: fw_purple.c $(CC) $(CFLAGS) -c fw_purple.c ### seven: seven.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o seven seven.o $(GR_SIM) + $(CC) -o seven seven.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) seven.o: seven.c $(CC) $(CFLAGS) -c seven.c @@ -58,7 +58,7 @@ seven.o: seven.c ### random16: random16.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o random16 random16.o $(GR_SIM) + $(CC) -o random16 random16.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) random16.o: random16.c $(CC) $(CFLAGS) -c random16.c @@ -66,7 +66,7 @@ random16.o: random16.c #### scroll: scroll.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o scroll scroll.o $(GR_SIM) + $(CC) -o scroll scroll.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) scroll.o: scroll.c $(CC) $(CFLAGS) -c scroll.c @@ -74,7 +74,7 @@ scroll.o: scroll.c #### scroll-asm: scroll-asm.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o scroll-asm scroll-asm.o $(GR_SIM) + $(CC) -o scroll-asm scroll-asm.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) scroll-asm.o: scroll-asm.c $(CC) $(CFLAGS) -c scroll-asm.c diff --git a/gr-sim/kaleido_sparkle/Makefile b/gr-sim/kaleido_sparkle/Makefile index 31b26253..39632fb5 100644 --- a/gr-sim/kaleido_sparkle/Makefile +++ b/gr-sim/kaleido_sparkle/Makefile @@ -12,7 +12,7 @@ all: sparkle kaleido rainbow ### kaleido: kaleido.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o kaleido kaleido.o $(GR_SIM) + $(CC) -o kaleido kaleido.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) kaleido.o: kaleido.c $(CC) $(CFLAGS) -c kaleido.c @@ -20,7 +20,7 @@ kaleido.o: kaleido.c ### sparkle: sparkle.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o sparkle sparkle.o $(GR_SIM) + $(CC) -o sparkle sparkle.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) sparkle.o: sparkle.c $(CC) $(CFLAGS) -c sparkle.c @@ -28,7 +28,7 @@ sparkle.o: sparkle.c ### rainbow: rainbow.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o rainbow rainbow.o $(GR_SIM) + $(CC) -o rainbow rainbow.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) rainbow.o: rainbow.c $(CC) $(CFLAGS) -c rainbow.c diff --git a/gr-sim/rasterbars/Makefile b/gr-sim/rasterbars/Makefile index a58f405c..84cc184b 100644 --- a/gr-sim/rasterbars/Makefile +++ b/gr-sim/rasterbars/Makefile @@ -10,15 +10,14 @@ all: rasterbars rasterbars_fixed rasterbars: rasterbars.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o rasterbars rasterbars.o \ - $(GR_SIM) + $(CC) -o rasterbars rasterbars.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) rasterbars.o: rasterbars.c $(CC) $(CFLAGS) -c rasterbars.c rasterbars_fixed: rasterbars_fixed.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o rasterbars_fixed rasterbars_fixed.o \ - $(GR_SIM) + $(CC) -o rasterbars_fixed rasterbars_fixed.o $(GR_SIM) \ + $(LFLAGS) $(SDL_LIBS) rasterbars_fixed.o: rasterbars_fixed.c $(CC) $(CFLAGS) -c rasterbars_fixed.c diff --git a/gr-sim/split_screen/Makefile b/gr-sim/split_screen/Makefile index 9e614b2d..cbf24df6 100644 --- a/gr-sim/split_screen/Makefile +++ b/gr-sim/split_screen/Makefile @@ -11,7 +11,7 @@ all: split_screen KATC.BIN ### split_screen: split_screen.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o split_screen split_screen.o $(GR_SIM) + $(CC) -o split_screen split_screen.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) split_screen.o: split_screen.c $(CC) $(CFLAGS) -c split_screen.c diff --git a/gr-sim/starfield/Makefile b/gr-sim/starfield/Makefile index da5191c5..aeba6733 100644 --- a/gr-sim/starfield/Makefile +++ b/gr-sim/starfield/Makefile @@ -13,13 +13,13 @@ all: starfield starfield_fixed starfield: starfield.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o starfield starfield.o $(GR_SIM) + $(CC) -o starfield starfield.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) starfield.o: starfield.c $(CC) $(CFLAGS) -c starfield.c starfield_fixed: starfield_fixed.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o starfield_fixed starfield_fixed.o $(GR_SIM) + $(CC) -o starfield_fixed starfield_fixed.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) starfield_fixed.o: starfield_fixed.c $(CC) $(CFLAGS) -c starfield_fixed.c diff --git a/gr-sim/text/Makefile b/gr-sim/text/Makefile index c814734d..91f1a107 100644 --- a/gr-sim/text/Makefile +++ b/gr-sim/text/Makefile @@ -12,7 +12,7 @@ all: text #### text: text.o $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o text text.o $(GR_SIM) + $(CC) -o text text.o $(GR_SIM) $(LFLAGS) $(SDL_LIBS) text.o: text.c $(CC) $(CFLAGS) -c text.c diff --git a/hgr-utils/Makefile b/hgr-utils/Makefile index 41ed9b8a..20e3a340 100644 --- a/hgr-utils/Makefile +++ b/hgr-utils/Makefile @@ -5,26 +5,26 @@ CFLAGS = -O2 -Wall -g all: pcx2hgr png2hgr shape_table dump_table dump_table: dump_table.o - $(CC) $(LFLAGS) -o dump_table dump_table.o + $(CC) -o dump_table dump_table.o $(LFLAGS) dump_table.o: dump_table.c $(CC) $(CFLAGS) -c dump_table.c shape_table: shape_table.o - $(CC) $(LFLAGS) -o shape_table shape_table.o + $(CC) -o shape_table shape_table.o $(LFLAGS) shape_table.o: shape_table.c $(CC) $(CFLAGS) -c shape_table.c pcx2hgr: pcx2hgr.o - $(CC) $(LFLAGS) -o pcx2hgr pcx2hgr.o + $(CC) -o pcx2hgr pcx2hgr.o $(LFLAGS) pcx2hgr.o: pcx2hgr.c $(CC) $(CFLAGS) -c pcx2hgr.c png2hgr: png2hgr.o - $(CC) $(LFLAGS) -lpng -o png2hgr png2hgr.o + $(CC) -o png2hgr png2hgr.o $(LFLAGS) -lpng png2hgr.o: png2hgr.c $(CC) $(CFLAGS) -c png2hgr.c @@ -37,4 +37,3 @@ install: clean: rm -f *~ *.o pcx2hgr shape_table dump_table png2hgr -