--- p3scan-2.3.2/Makefile~	2005-12-12 16:00:00.000000000 +0100
+++ p3scan-2.3.2/Makefile	2006-01-26 01:10:14.000000000 +0100
@@ -42,7 +42,8 @@ LANG=en
 CC=gcc
 SYSINS=install
 #CFLAGS=-Wall -O3 -march=i686 ${LOGSET}
-CFLAGS=-Wall -O2 $(LOGSET)
+OPTS=-O2
+CFLAGS=-Wall $(OPTS) $(LOGSET)
 
 #ifdef DEMIME :)
 LDFLAGS=-L. -lripmime -lpcre -lssl -lcrypto #-static
--- p3scan-2.3.2/ripmime-1.4.0.6/Makefile~	2005-12-12 04:07:04.000000000 +0100
+++ p3scan-2.3.2/ripmime-1.4.0.6/Makefile	2006-01-26 01:12:13.000000000 +0100
@@ -15,7 +15,8 @@ VERSION=0.1.14
 #	use our recommended settings.
 #CFLAGS ?= -Wall -g -O2 -Werror $(CPU_OPTS)
 #CFLAGS=-Wall -g -O2 -Wundef -Wshadow -Wsign-compare -I.
-CFLAGS=-Wall -g -O2 -I.
+OPTS=-g -O2
+CFLAGS=-Wall $(OPTS) -I.
 
 # OLE decoding is still considered to be 'beta' mode - so it 
 #	disabled in the stable release of ripMIME for now
--- p3scan-2.3.2/ripmime-1.4.0.6/ripOLE/Makefile~	2005-12-12 04:06:21.000000000 +0100
+++ p3scan-2.3.2/ripmime-1.4.0.6/ripOLE/Makefile	2006-01-26 01:13:31.000000000 +0100
@@ -1,6 +1,7 @@
 
 OBJS= ole.o olestream-unwrap.o bytedecoders.o logger.o pldstr.o bt-int.o
-CFLAGS=-Wall -g -O2 -I.
+OPTS=-g -O2
+CFLAGS=-Wall $(OPTS) -I.
 
 
 .c.o:
--- p3scan-2.3.2/ripmime-1.4.0.6/tnef/Makefile~	2005-12-12 04:07:04.000000000 +0100
+++ p3scan-2.3.2/ripmime-1.4.0.6/tnef/Makefile	2006-01-26 01:15:32.000000000 +0100
@@ -4,8 +4,9 @@
 # The main definitions are for 32/16 bits and for byte order, the 
 # default is big endian.  You can do -D__TNEF_BYTE_ORDER 1234 for little
 # endian
-PLATFORM=-D___TNEF_BYTE_ORDER=4321 
-CFLAGS=-Wall -g -O2 -I.
+PLATFORM=-D___TNEF_BYTE_ORDER=4321
+OPTS=-g -O2
+CFLAGS=-Wall $(OPTS) -I.
 
 default: config.h tnef.h tnef.c
 	$(CC) $(CFLAGS) $(PLATFORM) -c tnef.c