--- Makefile_old	Wed Sep 19 19:41:52 2001
+++ Makefile	Wed Sep 19 19:44:24 2001
@@ -171,9 +171,7 @@
 			audio_oss.o term.o' \
 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
 			-DOSS -DTERM_CONTROL\
-			-Wall -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
+			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
 linux-pentium:
@@ -182,9 +180,7 @@
 			audio_oss.o term.o' \
 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
 			-DOSS -DTERM_CONTROL\
-			-Wall -O2 -mpentium \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
+			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
 linux-mmx:
@@ -193,9 +189,7 @@
 			audio_oss.o term.o' \
 		CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
 			-DLINUX -DOSS -DTERM_CONTROL\
-			-Wall -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
+			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
 linux-3dnow:
@@ -205,9 +199,7 @@
 			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 -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
+			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
 
@@ -218,9 +210,7 @@
 			dct64_i486-a.o dct64_i486-b.o ' \
 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
 			-DOSS -DTERM_CONTROL\
-			-Wall -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
+			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
 linux-esd:
@@ -230,9 +220,6 @@
 			audio_esd.o' \
 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
 			-DOSS -DUSE_ESD \
-			-Wall  -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
 			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
@@ -243,9 +230,6 @@
 			audio_alsa.o term.o' \
 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
 			-DALSA -DTERM_CONTROL\
-			-Wall  -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math \
 			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
@@ -257,9 +241,7 @@
 			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 -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
+			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
 linux-3dnow-esd:
@@ -270,9 +252,7 @@
 			equalizer_3dnow.o decode_i586.o audio_esd.o' \
 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
 			-DUSE_3DNOW -DUSE_ESD \
-			-Wall -O2 -m486 \
-			-fomit-frame-pointer -funroll-all-loops \
-			-finline-functions -ffast-math' \
+			$(RPM_OPT_FLAGS)' \
 		mpg123-make
 
 linux-mips-alsa: