--- Makefile.old	Sun Apr 10 13:35:56 2005
+++ Makefile	Sun Apr 10 13:40:03 2005
@@ -54,6 +54,7 @@
 	@echo "make netbsd         NetBSD"
 	@echo "make openbsd        OpenBSD"
 	@echo "make mint           MiNT on Atari"
+	@echo "make macosx	   MacOSX
 	@echo "make generic        try this one if your system isn't listed above"
 	@echo ""
 	@echo "Please read the file INSTALL for additional information."
@@ -149,6 +150,16 @@
 	@echo "Please read the file INSTALL for additional information."
 	@echo ""
 
+macos-help:
+	@echo ""
+	@echo "There are several Mac OS X flavours. Choose one:"
+	@echo ""
+	@echo "make macosx"
+	@echo "make macos-esd"
+	@echo ""
+	@echo "Please read the file INSTALL for additional information."
+	@echo ""
+
 linux-devel:
 	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
          LDFLAGS= \
@@ -759,6 +770,24 @@
 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
 			-DDONT_CATCH_SIGNALS -DNAS' \
 		mpg123-make
+
+macosx:
+	$(MAKE) CC=cc LDFLAGS='$(LDFLAGS)' AUDIO_LIB='-framework CoreAudio' \
+		OBJECTS='decode.o dct64.o audio_macosx.o term.o' \
+		CFLAGS='$(CFLAGS) -DINET6 -DTERM_CONTROL -DMAC_OS_X -Wall -O2 -DPPC_ENDIAN' \
+		mpg123-make
+
+macos-generic:
+	$(MAKE) CC=cc LDFLAGS='$(LDFLAGS)' AUDIO_LIB='-framework CoreAudio' \
+		OBJECTS='decode.o dct64.o audio_macosx.o term.o' \
+		CFLAGS='$(CFLAGS) -DINET6 -DTERM_CONTROL -DMAC_OS_X -Wall -O2 -DPPC_ENDIAN' \
+		mpg123-make
+
+macos-esd:
+	$(MAKE) CC=cc LDFLAGS='$(LDFLAGS)' AUDIO_LIB='-lesd -laudiofile' \
+		OBJECTS='decode.o dct64.o audio_esd.o' \
+		CFLAGS='$(CFLAGS) -O -DDARWIN -Wall -O2 -DPPC_ENDIAN -DUSE_ESD' \
+		mpg123-make	
 
 mint:
 	$(MAKE)  LDFLAGS= \
