fix alt rules in Makefiles

For Makefiles that have alt related rules, moved
the related rules under the alt rule section.

In some cases where there is no alt code,
removed alt rules and/or targets.
This commit is contained in:
Landon Curt Noll committed 2023-03-26 21:48:48 -07:00
1 parent 91fa6e994f
commit 1ce40b273d
28 files changed
+102 -79

No files matched your search

+3
View File
@@ -145,6 +145,9 @@ ${PROG}: ${PROG}.c
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+4
View File
@@ -143,6 +143,10 @@ ${PROG}: ${PROG}.c
@echo " when compiling and running this program with some systems."
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
# data files
#
+8 -3
View File
@@ -133,15 +133,20 @@ ALT_TARGET=
all: data ${TARGET}
@${TRUE}
.PHONY: data everything clean clobber nuke dist_clean \
install build love haste waste make easter_egg \
.PHONY: all alt data everything clean clobber install \
love haste waste maker easter_egg sandwich \
supernova deep_magic magic charon pluto
${PROG}: ${PROG}.c
-${RM} -f a.out
${CC} ${CFLAGS} $< -o $@ ${LIBS}
-${RM} -f a.out
-${LN} $@ a.out
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
# data files
#
data: ${DATA}
+2 -2
View File
@@ -134,8 +134,8 @@ ALT_TARGET=
all: data ${TARGET}
@${TRUE}
.PHONY: data everything clean clobber nuke dist_clean \
install build love haste waste make easter_egg \
.PHONY: all alt data everything clean clobber install \
love haste waste maker easter_egg sandwich \
supernova deep_magic magic charon pluto
${PROG}: ${PROG}.c
+3
View File
@@ -145,6 +145,9 @@ ${PROG}: ${PROG}.c
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3
View File
@@ -147,6 +147,9 @@ ${PROG}: ${PROG}.c
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -139,14 +139,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -141,9 +141,6 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
first: ${PROG}
${RM} -f $@
${LN} $< $@
@@ -153,6 +150,9 @@ first: ${PROG}
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -147,14 +147,14 @@ ${PROG}: ${PROG}.c
gtface: gtface.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -144,14 +144,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -146,14 +146,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${C_SMALL} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.c
${CC} ${C_LARGE} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.c
${CC} ${C_LARGE} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3
View File
@@ -145,6 +145,9 @@ ${PROG}: ${PROG}.c
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+5 -5
View File
@@ -142,6 +142,11 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}_nohalf: ${PROG}_nohalf.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
@@ -149,11 +154,6 @@ ${PROG}_nohalf.c: ${PROG}.c
${RM} -f $@
${SED} -e 's/halfdelay([^)]*);//' < $? > $@
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -139,14 +139,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3
View File
@@ -144,6 +144,9 @@ ${PROG}: ${PROG}.c
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -142,14 +142,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -147,9 +147,6 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
westley2: westley2.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
@@ -161,6 +158,9 @@ westley3: westley3.c
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -140,14 +140,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -141,14 +141,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+5 -5
View File
@@ -151,6 +151,11 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
pi.c: ${PROG}
${RM} -f $@
./$< > $@
@@ -300,11 +305,6 @@ e: e.c
271828182845: 271828182845.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -149,14 +149,14 @@ ${PROG}64: ${PROG}
${RM} -f $@
${CP} -v $< $@
${PROG}32: ${PROG}.c
${CC} ${CFLAGS} -m32 -DInt=int -DX=4 $< -o $@
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}32: ${PROG}.c
${CC} ${CFLAGS} -m32 -DInt=int -DX=4 $< -o $@
# data files
#
data: ${DATA}
+3 -3
View File
@@ -144,14 +144,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3 -3
View File
@@ -145,14 +145,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+3
View File
@@ -146,6 +146,9 @@ ${PROG}: ${PROG}.c
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+6 -6
View File
@@ -142,6 +142,12 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
test: makeholes prog-test.sh ${TARGET}
${SHELL} ./prog-test.sh
makeholes: makeholes.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@@ -150,12 +156,6 @@ alt: data ${ALT_TARGET}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
test: makeholes prog-test.sh ${TARGET}
${SHELL} ./prog-test.sh
makeholes: makeholes.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+2 -5
View File
@@ -125,8 +125,8 @@ OBJ= ${PROG}.o
DATA= fruits.bin lena512.bin vintage_cars.bin Lenna.png
TARGET= ${PROG}
#
ALT_OBJ= ${PROG}.alt.o
ALT_TARGET= ${PROG}.alt
ALT_OBJ=
ALT_TARGET=
#################
@@ -143,9 +143,6 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
+3 -3
View File
@@ -140,14 +140,14 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable
#
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}.alt: ${PROG}.alt.c
${CC} ${CFLAGS} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
+10 -11
View File
@@ -117,12 +117,12 @@ endif
ENTRY= burton
PROG= prog
#
OBJ= ${PROG}.o
OBJ= ${PROG}.o ${PROG}_le.o ${PROG}_be.o
DATA= correct
TARGET= ${PROG}
TARGET= ${PROG} ${PROG}_le ${PROG}_be
#
ALT_OBJ= ${PROG}_le.o
ALT_TARGET= ${PROG}_le
ALT_OBJ=
ALT_TARGET=
# magic define parameters for Little Endian machines
#
@@ -153,9 +153,11 @@ all: data ${TARGET}
${PROG}: ${PROG}.c
${CC} ${CFLAGS} -DB=${B} -DI=${I} -DT=${T} -DS=${S} $< -o $@ ${LIBS}
${PROG}_le: ${PROG}
${RM} -f $@
${CP} -f $< $@
${PROG}_le: ${PROG}.c
${CC} ${CFLAGS} -DB=${B} -DI=${I} -DT=${T} -DS=${S} $< -o $@ ${LIBS}
${PROG}_be: ${PROG}.c
${CC} ${CFLAGS} -DB=${_B} -DI=${_I} -DT=${_T} -DS=${_S} $< -o $@ ${LIBS}
test: check_le.sh check_be.sh prog_le prog_be correct
./check_le.sh ./prog_le | ${DIFF} -bw - correct
@@ -166,15 +168,12 @@ test: check_le.sh check_be.sh prog_le prog_be correct
alt: data ${ALT_TARGET}
@${TRUE}
${PROG}_be: ${PROG}.c
${CC} ${CFLAGS} -DB=${_B} -DI=${_I} -DT=${_T} -DS=${_S} $< -o $@ ${LIBS}
# data files
#
data: ${DATA}
@${TRUE}
# both all and alt
#
everything: all alt
@${TRUE}