--- a/Makefile	2008-11-07 03:33:33.000000000 +0000
+++ a/Makefile	2010-08-26 21:20:32.397706782 +0000
@@ -42,10 +42,10 @@ 
 	./generate-buildcodes.sh
 
 ripOLE/ole.o:
-	./build_ripOLE
+	$(MAKE) -C ripOLE
 
 tnef/tnef.o:
-	./build_tnef
+	$(MAKE) -C tnef
 
 .c.o:
 	${CC} ${CFLAGS} $(COMPONENTS) -c $*.c
@@ -56,8 +56,8 @@ 
 solib: ${OFILES} ripmime-api.o
 	gcc --shared -Wl,-soname,libripmime.so.1 ${OFILES} ripmime-api.o -o libripmime.so.1.4.0 -lc
 
-libripmime: ${OFILES} ripmime-api.o
-	ar ruvs libripmime.a ${OFILES}  ripmime-api.o
+libripmime.a: ${OFILES} ripmime-api.o
+	ar ruvs $@ $^
 
 ripl: ripmime.a
 	${CC} ${CFLAGS} ripmime.c ripmime.a -o ripmime
@@ -65,8 +65,10 @@ 
 sco: ${OFILES}
 	${CC} ${CFLAGS} ripmime.c ${OFILES} -o ripmime -lsocket
 
-ripmime: ${OFILES} ripmime.c buildcodes.h
-	${CC} ${CFLAGS} $(COMPONENTS) ripmime.c ${OFILES} -o ripmime ${LIBS}
+ripmime: ${OFILES} ripmime.o
+	${CC} ${CFLAGS} $(COMPONENTS) $(LDFLAGS) $^ -o $@ ${LIBS}
+
+ripmime.o: buildcodes.h
 
 riptest: ${OFILES}
 	${CC} ${CFLAGS} riptest.c ${OFILES} -o riptest