Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-09-30 14:56:23 +00:00
Code Issues Projects Releases Wiki Activity

fix ordering of LFLAGS in Makefiles

Browse Source 
recent Debian stopped allowing this
This commit is contained in:
Vince Weaver 2019-11-12 09:53:24 -05:00
parent 8e80927760
commit 50584c5541
8 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gr-sim/fade/Makefile
View File

@ -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

20
gr-sim/hgr/Makefile
View File

@ -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

6
gr-sim/kaleido_sparkle/Makefile
View File

@ -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

7
gr-sim/rasterbars/Makefile
View File

@ -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

2
gr-sim/split_screen/Makefile
View File

@ -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

4
gr-sim/starfield/Makefile
View File

@ -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

2
gr-sim/text/Makefile
View File

@ -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

9
hgr-utils/Makefile
View File

@ -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