--- Makefile.after_unpack	2006-05-13 23:51:03.000000000 -0500
+++ Makefile.fixed	2006-05-13 23:51:03.000000000 -0500
@@ -150,286 +150,91 @@
 	@echo ""
 
 linux-devel:
-	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
-         LDFLAGS= \
-        CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -g  \
-		-DOSS -funroll-all-loops \
-		-finline-functions -ffast-math' \
-        mpg123-make
+	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o'          LDFLAGS=         CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -g  		-DOSS -funroll-all-loops 		-finline-functions -ffast-math'         mpg123-make
 
 linux-profile:
-	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
-         LDFLAGS='-pg' \
-        CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -pg  \
-		-DOSS -funroll-all-loops \
-		-finline-functions -ffast-math' \
-        mpg123-make
+	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o'          LDFLAGS='-pg'         CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -pg  		-DOSS -funroll-all-loops 		-finline-functions -ffast-math'         mpg123-make
 
 linux:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-			audio_oss.o term.o' \
-		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
-			-DOSS -DTERM_CONTROL\
-			-Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o 			audio_oss.o term.o' 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX 			-DOSS -DTERM_CONTROL			-Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-generic:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall \
-			-DOSS \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall 			-DOSS 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-pentium:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-			audio_oss.o term.o' \
-		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
-			-DOSS -DTERM_CONTROL\
-			-Wall  -mpentium \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o 			audio_oss.o term.o' 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX 			-DOSS -DTERM_CONTROL			-Wall  -mpentium 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-mmx:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o \
-			audio_oss.o term.o' \
-		CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
-			-DLINUX -DOSS -DTERM_CONTROL\
-			-Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o 			audio_oss.o term.o' 		CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT 			-DLINUX -DOSS -DTERM_CONTROL			-Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-3dnow:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
-			dct64_i386.o dct36_3dnow.o getcpuflags.o \
-			equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \
-		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-			-DUSE_3DNOW -DOSS -DTERM_CONTROL\
-			-Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o 			dct64_i386.o dct36_3dnow.o getcpuflags.o 			equalizer_3dnow.o decode_i586.o audio_oss.o term.o' 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX 			-DUSE_3DNOW -DOSS -DTERM_CONTROL			-Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 
 linux-i486:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-			decode_i486.o audio_oss.o term.o \
-			dct64_i486-a.o dct64_i486-b.o ' \
-		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
-			-DOSS -DTERM_CONTROL\
-			-Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o 			decode_i486.o audio_oss.o term.o 			dct64_i486-a.o dct64_i486-b.o ' 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX 			-DOSS -DTERM_CONTROL			-Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-esd:
-	$(MAKE)  LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-			audio_esd.o' \
-		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-			-DOSS -DUSE_ESD \
-			-Wall    \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o 			audio_esd.o' 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX 			-DOSS -DUSE_ESD 			-Wall    			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-alsa:
-	$(MAKE)  LDFLAGS= \
-		AUDIO_LIB='-lasound' \
-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-			audio_alsa.o term.o' \
-		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-			-DALSA -DTERM_CONTROL\
-			-Wall    \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		AUDIO_LIB='-lasound' 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o 			audio_alsa.o term.o' 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX 			-DALSA -DTERM_CONTROL			-Wall    			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-3dnow-alsa:
-	$(MAKE)  LDFLAGS= \
-		AUDIO_LIB='-lasound' \
-		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
-			dct64_i386.o dct36_3dnow.o getcpuflags.o \
-			equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \
-		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-			-DUSE_3DNOW -DALSA -DTERM_CONTROL\
-			-Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		AUDIO_LIB='-lasound' 		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o 			dct64_i386.o dct36_3dnow.o getcpuflags.o 			equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX 			-DUSE_3DNOW -DALSA -DTERM_CONTROL			-Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-3dnow-esd:
-	$(MAKE)  LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
-			dct64_i386.o dct36_3dnow.o getcpuflags.o \
-			equalizer_3dnow.o decode_i586.o audio_esd.o' \
-		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
-			-DUSE_3DNOW -DUSE_ESD \
-			-Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o 			dct64_i386.o dct36_3dnow.o getcpuflags.o 			equalizer_3dnow.o decode_i586.o audio_esd.o' 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX 			-DUSE_3DNOW -DUSE_ESD 			-Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-mips-alsa:
-	$(MAKE)  LDFLAGS= \
-		AUDIO_LIB='-lasound' \
-		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -DALSA \
-			-DTERM_CONTROL -Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		AUDIO_LIB='-lasound' 		OBJECTS='decode.o dct64.o audio_alsa.o term.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -DALSA 			-DTERM_CONTROL -Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-alpha:
-	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -DLINUX -DOSS -Wall  \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
-			-Wall -O6 -DUSE_MMAP \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='$(CFLAGS) -DLINUX -DOSS -Wall  			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math 			-Wall -O6 -DUSE_MMAP 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-alpha-alsa:
-	$(MAKE)  LDFLAGS= \
-		AUDIO_LIB='-lasound' \
-		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
-		CFLAGS='-DLINUX \
-			-DALSA -DTERM_CONTROL\
-			-DUSE_MMAP  -O6 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		AUDIO_LIB='-lasound' 		OBJECTS='decode.o dct64.o audio_alsa.o term.o' 		CFLAGS='-DLINUX 			-DALSA -DTERM_CONTROL			-DUSE_MMAP  -O6 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-alpha-esd:
-	$(MAKE)  LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode.o dct64.o audio_esd.o' \
-		CFLAGS='$(CFLAGS) -DLINUX -DOSS -DUSE_ESD -Wall  \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
-			-Wall -O6 -DUSE_MMAP \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode.o dct64.o audio_esd.o' 		CFLAGS='$(CFLAGS) -DLINUX -DOSS -DUSE_ESD -Wall  			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math 			-Wall -O6 -DUSE_MMAP 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-x86_64:
-	$(MAKE) LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE) LDFLAGS= 		OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-x86_64-esd:
-	$(MAKE) LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode.o dct64.o audio_esd.o' \
-		CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE) LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode.o dct64.o audio_esd.o' 		CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-x86_64-alsa:
-	$(MAKE) LDFLAGS= \
-		AUDIO_LIB='-lasound' \
-		OBJECTS='decode.o dct64.o audio_alsa.o' \
-		CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \
-			$(RPM_OPT_FLAGS)' \
-		mpg123-make
+	$(MAKE) LDFLAGS= 		AUDIO_LIB='-lasound' 		OBJECTS='decode.o dct64.o audio_alsa.o' 		CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP 			$(RPM_OPT_FLAGS)' 		mpg123-make
 
 linux-ppc64:
-	$(MAKE)   LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  \
-			-DOSS \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)   LDFLAGS= 		OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  			-DOSS 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-ppc64-esd:
-	$(MAKE)   LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode.o dct64.o audio_esd.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  \
-			-DOSS \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)   LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode.o dct64.o audio_esd.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall  			-DOSS 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
  
 linux-ppc:
-	$(MAKE)   LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   \
-			-DOSS \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)   LDFLAGS= 		OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   			-DOSS 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-ppc-esd:
-	$(MAKE)   LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode.o dct64.o audio_esd.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   \
-			-DOSS -DUSE_ESD \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)   LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode.o dct64.o audio_esd.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall   			-DOSS -DUSE_ESD 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-sparc:
-	$(MAKE)   LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall  \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)   LDFLAGS= 		OBJECTS='decode.o dct64.o audio_sun.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall  			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-sparc-esd:
-	$(MAKE)   LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode.o dct64.o audio_esd.o' \
-		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall  \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)   LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode.o dct64.o audio_esd.o' 		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall  			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 
 linux-armv4l:
-	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='-DLINUX -DOSS -Wall  \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
-			-Wall -O6 -DUSE_MMAP' \
-                mpg123-make
+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='-DLINUX -DOSS -Wall  			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math 			-Wall -O6 -DUSE_MMAP'                 mpg123-make
 
 linux-arm:
-	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='-DREAL_IS_FIXED -DLINUX \
-			-DOSS -Wall -O6 -march=armv4 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='-DREAL_IS_FIXED -DLINUX 			-DOSS -Wall -O6 -march=armv4 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
  
 
 linux-m68k:
-	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX \
-			-DOSS -DOSS_BIG_ENDIAN -Wall  -m68040 \
-			-fomit-frame-pointer -funroll-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX 			-DOSS -DOSS_BIG_ENDIAN -Wall  -m68040 			-fomit-frame-pointer -funroll-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 linux-sajber:
 	@ $(MAKE) FRONTEND=sajberplay-make linux-frontend
@@ -444,25 +249,10 @@
 	@ $(MAKE) FRONTEND=mpg123m-make freebsd-frontend
 
 linux-frontend:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-			control_sajber.o control_tk3play.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
-			-DPENTIUM_OPT -DLINUX -Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		$(FRONTEND)
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o 			control_sajber.o control_tk3play.o audio_oss.o' 		CFLAGS='$(CFLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT 			-DPENTIUM_OPT -DLINUX -Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		$(FRONTEND)
 
 linux-nas:
-	$(MAKE)  LDFLAGS='-L/usr/X11R6/lib' \
-		AUDIO_LIB='-laudio -lXau' \
-		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
-		CFLAGS='$(CFLAGS) -I/usr/X11R6/include \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -DNAS \
-			-Wall   \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS='-L/usr/X11R6/lib' 		AUDIO_LIB='-laudio -lXau' 		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' 		CFLAGS='$(CFLAGS) -I/usr/X11R6/include 			-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -DNAS 			-Wall   			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 #### the following defines are for experimental use ... 
 #
@@ -471,310 +261,125 @@
 #CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall   -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
 
 freebsd:
-	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' 		mpg123-make
 
 freebsd-i486:
-	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o \
-			decode_i486.o dct64_i486.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DOPT_ARCH=i486 \
-			-march=i486 -finline-functions \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o 			decode_i486.o dct64_i486.o audio_oss.o' 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DOPT_ARCH=i486 			-march=i486 -finline-functions 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' 		mpg123-make
 
 freebsd-esd:
-	$(MAKE) CC=cc LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
-		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD \
-			-I/usr/local/include -L/usr/local/lib' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		AUDIO_LIB='-lesd -laudiofile' 		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD 			-I/usr/local/include -L/usr/local/lib' 		mpg123-make
 
 freebsd-nas:
-	$(MAKE) CC=cc LDFLAGS= \
-		AUDIO_LIB='-L/usr/X11R6/lib -laudio -lXau' \
-		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
-		CFLAGS='-Wall -ansi -pedantic -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DREAD_MMAP \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNAS \
-			-I/usr/X11R6/include -L/usr/X11R6/lib' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		AUDIO_LIB='-L/usr/X11R6/lib -laudio -lXau' 		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' 		CFLAGS='-Wall -ansi -pedantic -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DREAD_MMAP 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNAS 			-I/usr/X11R6/include -L/usr/X11R6/lib' 		mpg123-make
 
 freebsd-frontend:
-	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
-			control_sajber.o control_tk3play.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DFRONTEND \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-		$(FRONTEND)
+	$(MAKE) CC=cc LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o 			control_sajber.o control_tk3play.o' 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DFRONTEND 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' 		$(FRONTEND)
 
 openbsd:
-	$(MAKE) CC=cc LDFLAGS='-L/usr/lib' \
-		AUDIO_LIB='-lossaudio' \
-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
-		CFLAGS='-Wall -ansi -pedantic -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DREAD_MMAP \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS='-L/usr/lib' 		AUDIO_LIB='-lossaudio' 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' 		CFLAGS='-Wall -ansi -pedantic -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DREAD_MMAP 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' 		mpg123-make
 
 # -mno-epilogue
 # -mflat -mv8 -mcpu=ultrasparc
 
 # these are MY EXPERIMENTAL compile entries
 solaris-pure:
-	$(MAKE) CC='purify -cache-dir=/tmp cc' \
-		LDFLAGS='-lsocket -lnsl' \
-		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
-		CFLAGS='$(CFLAGS) -fast -native -xO4 -DSOLARIS -DTERM_CONTROL \
-			-DUSE_MMAP ' \
-		mpg123-make
+	$(MAKE) CC='purify -cache-dir=/tmp cc' 		LDFLAGS='-lsocket -lnsl' 		OBJECTS='decode.o dct64.o audio_sun.o term.o' 		CFLAGS='$(CFLAGS) -fast -native -xO4 -DSOLARIS -DTERM_CONTROL 			-DUSE_MMAP ' 		mpg123-make
 
 solaris-ccscc:
-	$(MAKE) CC=/usr/ccs/bin/ucbcc LDFLAGS='-lsocket -lnsl' \
-		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
-		CFLAGS='$(CFLAGS) -fast -native -xO4 -DSOLARIS \
-			-DUSE_MMAP ' \
-		mpg123-make
+	$(MAKE) CC=/usr/ccs/bin/ucbcc LDFLAGS='-lsocket -lnsl' 		OBJECTS='decode.o dct64.o audio_sun.o term.o' 		CFLAGS='$(CFLAGS) -fast -native -xO4 -DSOLARIS 			-DUSE_MMAP ' 		mpg123-make
 
 # common solaris compile entries
 solaris:
-	$(MAKE) CC=cc LDFLAGS='-lsocket -lnsl' \
-		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
-		CFLAGS='$(CFLAGS) -fast -native -xO4 -DSOLARIS \
-			-DUSE_MMAP -DTERM_CONTROL' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS='-lsocket -lnsl' 		OBJECTS='decode.o dct64.o audio_sun.o term.o' 		CFLAGS='$(CFLAGS) -fast -native -xO4 -DSOLARIS 			-DUSE_MMAP -DTERM_CONTROL' 		mpg123-make
 
 solaris-gcc-profile:
-	$(MAKE) CC='gcc' \
-		LDFLAGS='-lsocket -lnsl -pg' \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
-		CFLAGS='$(CFLAGS) -g -pg  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
-			-funroll-all-loops -finline-functions' \
-		mpg123-make
+	$(MAKE) CC='gcc' 		LDFLAGS='-lsocket -lnsl -pg' 		OBJECTS='decode.o dct64.o audio_sun.o' 		CFLAGS='$(CFLAGS) -g -pg  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP 			-funroll-all-loops -finline-functions' 		mpg123-make
 
 #	-DREAL_IS_FLOAT 
 
 solaris-gcc:
-	$(MAKE)  \
-		LDFLAGS='-lsocket -lnsl' \
-		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
-		CFLAGS='$(CFLAGS)  -Wall -pedantic -DSOLARIS \
-			-DUSE_MMAP -g \
-			-DTERM_CONTROL \
-			-funroll-all-loops  -finline-functions' \
-		mpg123-make
+	$(MAKE)  		LDFLAGS='-lsocket -lnsl' 		OBJECTS='decode.o dct64.o audio_sun.o term.o' 		CFLAGS='$(CFLAGS)  -Wall -pedantic -DSOLARIS 			-DUSE_MMAP -g 			-DTERM_CONTROL 			-funroll-all-loops  -finline-functions' 		mpg123-make
 
 solaris-gcc-esd:
-	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
-		AUDIO_LIB='-lesd -lresolv' \
-		OBJECTS='decode.o dct64.o audio_esd.o' \
-		CFLAGS='$(CFLAGS)  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
-			-DUSE_ESD -funroll-all-loops -finline-functions' \
-		mpg123-make
+	$(MAKE)  LDFLAGS='-lsocket -lnsl' 		AUDIO_LIB='-lesd -lresolv' 		OBJECTS='decode.o dct64.o audio_esd.o' 		CFLAGS='$(CFLAGS)  -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP 			-DUSE_ESD -funroll-all-loops -finline-functions' 		mpg123-make
 
 solaris-x86-gcc-oss:
-	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-			audio_oss.o' \
-		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \
-			-DOSS \
-			-Wall   \
-			-funroll-all-loops -finline-functions' \
-		mpg123-make
+	$(MAKE)  LDFLAGS='-lsocket -lnsl' 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o 			audio_oss.o' 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP 			-DOSS 			-Wall   			-funroll-all-loops -finline-functions' 		mpg123-make
 
 solaris-gcc-nas:
-	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
-		AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\
-		OBJECTS='decode.o dct64.o audio_nas.o' \
-		CFLAGS='$(CFLAGS)  -I/usr/openwin/include -Wall \
-			-DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
-			-DNAS \
-			-funroll-all-loops -finline-functions' \
-		mpg123-make
+	$(MAKE)  LDFLAGS='-lsocket -lnsl' 		AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'		OBJECTS='decode.o dct64.o audio_nas.o' 		CFLAGS='$(CFLAGS)  -I/usr/openwin/include -Wall 			-DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP 			-DNAS 			-funroll-all-loops -finline-functions' 		mpg123-make
 
 sunos:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
-		CFLAGS='$(CFLAGS)  -DSUNOS -DREAL_IS_FLOAT -DUSE_MMAP \
-			-funroll-loops' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode.o dct64.o audio_sun.o' 		CFLAGS='$(CFLAGS)  -DSUNOS -DREAL_IS_FLOAT -DUSE_MMAP 			-funroll-loops' 		mpg123-make
 
 #		CFLAGS='-DREAL_IS_FLOAT -Aa +O3 -D_HPUX_SOURCE -DHPUX'
 hpux:
-	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_hp.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -Ae +O3 -D_HPUX_SOURCE -DHPUX' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		OBJECTS='decode.o dct64.o audio_hp.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -Ae +O3 -D_HPUX_SOURCE -DHPUX' 		mpg123-make
 
 hpux-alib:
-	$(MAKE) CC=cc LDFLAGS='-L/opt/audio/lib' \
-		OBJECTS='decode.o dct64.o audio_alib.o' \
-		AUDIO_LIB=-lAlib \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -Ae +O3 -D_HPUX_SOURCE -DHPUX \
-			-I/opt/audio/include' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS='-L/opt/audio/lib' 		OBJECTS='decode.o dct64.o audio_alib.o' 		AUDIO_LIB=-lAlib 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -Ae +O3 -D_HPUX_SOURCE -DHPUX 			-I/opt/audio/include' 		mpg123-make
 
 hpux-gcc:
-	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -O3 -D_HPUX_SOURCE -DHPUX' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -O3 -D_HPUX_SOURCE -DHPUX' 		mpg123-make
 sgi:
-	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sgi.o' AUDIO_LIB=-laudio \
-		CFLAGS='$(CFLAGS)  -DSGI -DTERM_CONTROL \
-		-DREAL_IS_FLOAT -DUSE_MMAP' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		OBJECTS='decode.o dct64.o audio_sgi.o' AUDIO_LIB=-laudio 		CFLAGS='$(CFLAGS)  -DSGI -DTERM_CONTROL 		-DREAL_IS_FLOAT -DUSE_MMAP' 		mpg123-make
 
 sgi-gcc:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sgi.o' AUDIO_LIB=-laudio \
-		CFLAGS='$(CFLAGS)  -DSGI -DTERM_CONTROL \
-		-DREAL_IS_FLOAT -DUSE_MMAP' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode.o dct64.o audio_sgi.o' AUDIO_LIB=-laudio 		CFLAGS='$(CFLAGS)  -DSGI -DTERM_CONTROL 		-DREAL_IS_FLOAT -DUSE_MMAP' 		mpg123-make
 
 dec:
-	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_dec.o' \
-		AUDIO_LIB=-lmme \
-		CFLAGS='$(CFLAGS) -std1 -warnprotos -O4 -DUSE_MMAP \
-			-I/usr/include/mme' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_dec.o' 		AUDIO_LIB=-lmme 		CFLAGS='$(CFLAGS) -std1 -warnprotos -O4 -DUSE_MMAP 			-I/usr/include/mme' 		mpg123-make
 
 dec-esd:
-	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_esd.o' \
-		AUDIO_LIB='-lesd -laudiofile' \
-		CFLAGS='$(CFLAGS) -std1 -warnprotos -O4 -DUSE_MMAP \
-			-I/usr/include/mme `esd-config --cflags`' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_esd.o' 		AUDIO_LIB='-lesd -laudiofile' 		CFLAGS='$(CFLAGS) -std1 -warnprotos -O4 -DUSE_MMAP 			-I/usr/include/mme `esd-config --cflags`' 		mpg123-make
 
 dec-nas:
-	$(MAKE) CC=cc LDFLAGS='-L/usr/X11R6/lib' \
-		AUDIO_LIB='-laudio -lXau -ldnet_stub'\
-		OBJECTS='decode.o dct64.o  audio_nas.o' \
-		CFLAGS='$(CFLAGS) -I/usr/X11R6/include -std1 -warnprotos -O4 -DUSE_MMAP' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS='-L/usr/X11R6/lib' 		AUDIO_LIB='-laudio -lXau -ldnet_stub'		OBJECTS='decode.o dct64.o  audio_nas.o' 		CFLAGS='$(CFLAGS) -I/usr/X11R6/include -std1 -warnprotos -O4 -DUSE_MMAP' 		mpg123-make
 
 ultrix:
-	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_dummy.o' \
-		CFLAGS='$(CFLAGS) -std1  -DULTRIX' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= OBJECTS='decode.o dct64.o audio_dummy.o' 		CFLAGS='$(CFLAGS) -std1  -DULTRIX' 		mpg123-make
 
 aix-gcc:
-	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
-		CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DREAL_IS_FLOAT \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' 		CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DREAL_IS_FLOAT 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		mpg123-make
 
 aix-xlc:
-	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
-		CFLAGS="$(CFLAGS) -O3 -qstrict -qcpluscmt -DAIX -DUSE_MMAP \
-		mpg123-make
+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' 		CFLAGS="$(CFLAGS) -O3 -qstrict -qcpluscmt -DAIX -DUSE_MMAP 		mpg123-make
 
 
 aix-ums:
-	$(MAKE) LDFLAGS='-L/usr/lpp/som/lib -lUMSobj' \
-		OBJECTS='decode.o dct64.o audio_aixums.o term.o' \
-		CFLAGS="$(CFLAGS) -O3 -qstrict -qcpluscmt -DAIX -DAIX_UMS \
-			-DUSE_MMAP -DTERM_CONTROL \
-			-DREAD_MMAP -I/usr/lpp/UMS/include \
-			-I/usr/lpp/som/include" \
-		mpg123-make
+	$(MAKE) LDFLAGS='-L/usr/lpp/som/lib -lUMSobj' 		OBJECTS='decode.o dct64.o audio_aixums.o term.o' 		CFLAGS="$(CFLAGS) -O3 -qstrict -qcpluscmt -DAIX -DAIX_UMS 			-DUSE_MMAP -DTERM_CONTROL 			-DREAD_MMAP -I/usr/lpp/UMS/include 			-I/usr/lpp/som/include" 		mpg123-make
 
 
 aix-tk3play:
 	@ $(MAKE) FRONTEND=mpg123m-make aix-frontend
 
 aix-frontend:
-	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o \
-			control_sajber.o control_tk3play.o' \
-		CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DFRONTEND \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
-		$(FRONTEND)
+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o 			control_sajber.o control_tk3play.o' 		CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DFRONTEND 			-fomit-frame-pointer -funroll-all-loops 			-finline-functions -ffast-math' 		$(FRONTEND)
 
 os2:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_os2.o' \
-		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall   \
-		-fomit-frame-pointer -funroll-all-loops \
-		-finline-functions -ffast-math' \
-		LIBS='-los2me -lsocket' \
-		mpg123.exe
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o audio_os2.o' 		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall   		-fomit-frame-pointer -funroll-all-loops 		-finline-functions -ffast-math' 		LIBS='-los2me -lsocket' 		mpg123.exe
 
 netbsd:
-	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math \
-			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		OBJECTS='decode.o dct64.o audio_sun.o' 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer 			-funroll-all-loops -ffast-math 			-DREAL_IS_FLOAT -DUSE_MMAP -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  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
-		mpg123-make
+	$(MAKE) CC=cc LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o audio_sun.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' 		mpg123-make
 
 bsdos:
-	$(MAKE) CC=shlicc2 LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o \
-			 audio_oss.o' \
-		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
-			-DDONT_CATCH_SIGNALS' \
-		mpg123-make
+	$(MAKE) CC=shlicc2 LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o 			 audio_oss.o' 		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS 			-DDONT_CATCH_SIGNALS' 		mpg123-make
 
 bsdos4:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
-		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
-			-DDONT_CATCH_SIGNALS' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' 		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS 			-DDONT_CATCH_SIGNALS' 		mpg123-make
 
 bsdos-nas:
-	$(MAKE) CC=shlicc2 LDFLAGS= \
-		AUDIO_LIB='-laudio -lXau -L/usr/X11R6/lib' \
-		OBJECTS='decode_i386.o dct64_i386.o \
-			audio_nas.o' \
-		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
-			-DDONT_CATCH_SIGNALS -DNAS' \
-		mpg123-make
+	$(MAKE) CC=shlicc2 LDFLAGS= 		AUDIO_LIB='-laudio -lXau -L/usr/X11R6/lib' 		OBJECTS='decode_i386.o dct64_i386.o 			audio_nas.o' 		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer 			-funroll-all-loops -ffast-math -DROT_I386 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS 			-DDONT_CATCH_SIGNALS -DNAS' 		mpg123-make
 
 mint:
-	$(MAKE)  LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_mint.o' \
-		CFLAGS='$(CFLAGS) -Wall  -m68020-40 -m68881 \
-		-fomit-frame-pointer -funroll-all-loops \
-		-finline-functions -ffast-math \
-		-DREAL_IS_FLOAT -DMINT -DNOXFERMEM' \
-		AUDIO_LIB='-lsocket' \
-		mpg123-make
+	$(MAKE)  LDFLAGS= 		OBJECTS='decode.o dct64.o audio_mint.o' 		CFLAGS='$(CFLAGS) -Wall  -m68020-40 -m68881 		-fomit-frame-pointer -funroll-all-loops 		-finline-functions -ffast-math 		-DREAL_IS_FLOAT -DMINT -DNOXFERMEM' 		AUDIO_LIB='-lsocket' 		mpg123-make
 
 # maybe you need the additonal options LDFLAGS='-lnsl -lsocket' when linking (see solaris:)
 generic:
-	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_dummy.o' \
-		CFLAGS='$(CFLAGS) -O -DGENERIC -DNOXFERMEM' \
-		mpg123-make
+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_dummy.o' 		CFLAGS='$(CFLAGS) -O -DGENERIC -DNOXFERMEM' 		mpg123-make
 
 ###########################################################################
 ###########################################################################
@@ -789,20 +394,10 @@
 mpg123-make:
 	@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123
 
-mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \
-		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \
-		getlopt.o httpget.o xfermem.o equalizer.o \
-		decode_ntom.o Makefile wav.o readers.o \
-		control_generic.o vbrhead.o playlist.o getbits.o
-	$(CC) $(CFLAGS) $(LDFLAGS)  mpg123.o tabinit.o common.o layer1.o \
-		layer2.o layer3.o audio.o buffer.o decode_2to1.o equalizer.o \
-		decode_4to1.o getlopt.o httpget.o xfermem.o decode_ntom.o \
-		wav.o readers.o control_generic.o vbrhead.o playlist.o getbits.o \
-		$(OBJECTS) -o $(BINNAME) -lm $(AUDIO_LIB) $(IPV6LIBDIR) $(IPV6LIB)
-
-mpg123.exe: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \
-		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \
-		getlopt.o httpget.o Makefile wav.o readers.o 
+mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o 		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o 		getlopt.o httpget.o xfermem.o equalizer.o 		decode_ntom.o Makefile wav.o readers.o 		control_generic.o vbrhead.o playlist.o getbits.o
+	$(CC) $(CFLAGS) $(LDFLAGS)  mpg123.o tabinit.o common.o layer1.o 		layer2.o layer3.o audio.o buffer.o decode_2to1.o equalizer.o 		decode_4to1.o getlopt.o httpget.o xfermem.o decode_ntom.o 		wav.o readers.o control_generic.o vbrhead.o playlist.o getbits.o 		$(OBJECTS) -o $(BINNAME) -lm $(AUDIO_LIB) $(IPV6LIBDIR) $(IPV6LIB)
+
+mpg123.exe: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o 		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o 		getlopt.o httpget.o Makefile wav.o readers.o 
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o mpg123.exe -lm $(LIBS)
 
 ###########################################################################
@@ -852,13 +447,7 @@
 	rm -f *.o *core *~ mpg123 gmon.out sajberplay system mpg123m
 
 prepared-for-install:
-	@if [ ! -x mpg123 ]; then \
-		echo '###' ; \
-		echo '###  Before doing "make install", you have to compile the software.' ; \
-		echo '### Type "make" for more information.' ; \
-		echo '###' ; \
-		exit 1 ; \
-	fi
+	@if [ ! -x mpg123 ]; then 		echo '###' ; 		echo '###  Before doing "make install", you have to compile the software.' ; 		echo '### Type "make" for more information.' ; 		echo '###' ; 		exit 1 ; 	fi
 
 system: mpg123.h system.c
 	$(CC) -o $@ -Wall  system.c
@@ -874,10 +463,4 @@
 	chmod 644 $(MANDIR)/man$(SECTION)/mpg123.1
 
 dist:	clean
-	DISTNAME="`basename \`pwd\``" ; \
-	sed '/prgDate/s_".*"_"'`date +%Y/%m/%d`'"_' version.h > version.new; \
-	mv -f version.new version.h; \
-	cd .. ; \
-	rm -f "$$DISTNAME".tar.gz "$$DISTNAME".tar ; \
-	tar cvf "$$DISTNAME".tar "$$DISTNAME" ; \
-	gzip -9 "$$DISTNAME".tar
+	DISTNAME="`basename \`pwd\``" ; 	sed '/prgDate/s_".*"_"'`date +%Y/%m/%d`'"_' version.h > version.new; 	mv -f version.new version.h; 	cd .. ; 	rm -f "$$DISTNAME".tar.gz "$$DISTNAME".tar ; 	tar cvf "$$DISTNAME".tar "$$DISTNAME" ; 	gzip -9 "$$DISTNAME".tar