$NetBSD: patch-aa,v 1.24 2004/03/17 04:49:48 danw Exp $

--- Makefile.orig	Mon Nov 25 22:42:10 2002
+++ Makefile
@@ -54,6 +54,23 @@
 	@echo "make aix-tk3play    IBM AIX"
 	@echo "make os2            IBM OS/2"
 	@echo "make netbsd         NetBSD"
+	@echo "make netbsd-arm     NetBSD for strongarm (32bit fixedpoint)"
+	@echo "make netbsd-arm-64  NetBSD for strongarm (64bit fixedpoint)"
+	@echo "make netbsd-i386    NetBSD optimized for i386"
+	@echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format"
+	@echo "make netbsd-m68k    NetBSD optimized for m68k"
+	@echo "make netbsd-esd     NetBSD with EsounD"
+	@echo "make netbsd-arm-esd NetBSD for strongarm (32bit fixedpoint) with EsounD"
+	@echo "make netbsd-arm-64-esd NetBSD for strongarm (64bit fixedpoint) with EsounD"
+	@echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD"
+	@echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD"
+	@echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD"
+	@echo "make netbsd-nas     NetBSD with NAS"
+	@echo "make netbsd-arm-nas NetBSD for strongarm (32bit fixedpoint) with NAS"
+	@echo "make netbsd-arm-64-nas NetBSD for strongarm (64bit fixedpoint) with NAS"
+	@echo "make netbsd-i386-nas NetBSD optimized for i386 with NAS"
+	@echo "make netbsd-i386-elf-nas NetBSD optimized for i386, ELF format with NAS"
+	@echo "make netbsd-m68k-nas NetBSD optimized for m68k with NAS"
 	@echo "make bsdos          BSDI BSD/OS"
 	@echo "make bsdos4         BSDI BSD/OS 4.0"
 	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
@@ -398,7 +415,7 @@
 
 solaris-gcc-nas:
 	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
-		AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\
+		AUDIO_LIB='-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -laudio -lXt -lXau'\
 		OBJECTS='decode.o dct64.o audio_nas.o' \
 		CFLAGS='$(CFLAGS) -O2 -I/usr/openwin/include -Wall \
 			-DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
@@ -496,18 +513,184 @@
 
 netbsd:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math \
-			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
 		mpg123-make
 
 netbsd-i386:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
+		mpg123-make
+
+netbsd-i386-elf:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNETBSD -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-m68k:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-arm:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNETBSD' \
+		mpg123-make
+
+netbsd-arm-64:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+			-DTERM_CONTROL -DNETBSD' \
+		mpg123-make
+
+netbsd-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-i386-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-i386-elf-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNETBSD -DTERM_CONTROL \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-m68k-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-arm-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNETBSD `esd-config --cflags`' \
+		mpg123-make
+
+netbsd-arm-64-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+			-DTERM_CONTROL -DNETBSD `esd-config --cflags`' \
+		mpg123-make
+
+netbsd-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			-DNAS' \
+		mpg123-make
+
+netbsd-i386-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			-DNAS' \
+		mpg123-make
+
+netbsd-i386-elf-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNETBSD -DTERM_CONTROL \
+			-DNAS' \
+		mpg123-make
+
+netbsd-m68k-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
+			-DNAS' \
+		mpg123-make
+
+netbsd-arm-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNETBSD -DNAS' \
+		mpg123-make
+
+netbsd-arm-64-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+			-DTERM_CONTROL -DNETBSD -DNAS' \
 		mpg123-make
 
 bsdos:
@@ -554,6 +737,16 @@
 generic:
 	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_dummy.o' \
 		CFLAGS='$(CFLAGS) -O -DGENERIC -DNOXFERMEM' \
+		mpg123-make
+
+darwin-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL \
+			`esd-config --cflags`' \
 		mpg123-make
 
 ###########################################################################