--- a/trau-decode/Makefile	Sat Feb 08 05:16:35 2025 +0000
+++ b/trau-decode/Makefile	Sat Feb 08 06:22:45 2025 +0000
@@ -3,25 +3,29 @@
 PROGS=	dump-1bit tfo-parse-fr16 trau-extr trau-hr-dump trau-hr-dump-hex \
 	trau-parse trau-sync8
 
+FR_OBJS=parse-fr.o parse-fr-common.o parse-efr.o
+HR_OBJS=gsmhr_unpack.o hr-guts.o
+
+TRAU16_OBJS=	parse-amr.o parse-data.o ${FR_OBJS}
+
 all:	${PROGS}
 
 dump-1bit:	dump-1bit.c
 	${CC} ${CFLAGS} -o $@ $@.c
 
-tfo-parse-fr16:	crc8gen.o parse-fr.o parse-fr-common.o parse-efr.o parse-tfo16.o
+tfo-parse-fr16:	crc8gen.o parse-tfo16.o ${FR_OBJS}
 	${CC} ${CFLAGS} -o $@ $^ -lgsmfr2 -lgsmefr
 
 trau-extr:	extr-fr.o extr-efr.o extr-main.o
 	${CC} ${CFLAGS} -o $@ $^ -lgsmfr2
 
-trau-hr-dump:	crc8gen.o gsmhr_unpack.o hr-guts.o trau-hr-dump.o
+trau-hr-dump:	crc8gen.o trau-hr-dump.o ${HR_OBJS}
 	${CC} ${CFLAGS} -o $@ $^
 
-trau-hr-dump-hex:	crc8gen.o gsmhr_unpack.o hr-guts.o trau-hr-dump-hex.o
+trau-hr-dump-hex:	crc8gen.o trau-hr-dump-hex.o ${HR_OBJS}
 	${CC} ${CFLAGS} -o $@ $^
 
-trau-parse:	crc8gen.o parse-data.o parse-fr.o parse-fr-common.o parse-efr.o\
-			parse-main.o
+trau-parse:	crc8gen.o parse-main.o ${TRAU16_OBJS}
 	${CC} ${CFLAGS} -o $@ $^ -lgsmfr2 -lgsmefr
 
 trau-sync8:	trau-sync8.c