5 files changed, 50 insertions, 9 deletions
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index 84e9052179..615ed586c3 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -12,7 +12,11 @@ OBJS=	crc.$(OBJEXT)
 
 SRCS=	$(srcdir)/crc.c $(srcdir)/crctest.c
 
-all:: shared $(OBJS)
+all:: all-$(WHAT) $(OBJS)
+
+all-unix:: shared
+all-mac:: shared
+all-windows::
 
 shared:
 	mkdir shared
@@ -27,6 +31,11 @@ crctest.exe:
 check:: crctest$(EXEEXT)
 	$(C)crctest$(EXEEXT) < $(srcdir)$(S)crc-test
 
-clean::
+clean:: clean-$(WHAT)
 	$(RM) crctest$(EXEEXT) crctest.$(OBJEXT)
+
+clean-unix::
+	$(RM) shared/*
+clean-mac::
 	$(RM) shared/*
+clean-windows::
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 45f91ec52c..b50f30e011 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -45,7 +45,11 @@ SRCS=	$(srcdir)/cs_entry.c	\
 	$(srcdir)/weak_key.c	\
 	$(OTHERSRCS)
 
-all:: shared $(OBJS)
+all:: all-$(WHAT) $(OBJS)
+
+all-unix:: shared
+all-mac:: shared
+all-windows::
 
 shared:
 	mkdir shared
@@ -76,6 +80,11 @@ check-unix:: destest verify
 
 check-windows::
 
-clean::
+clean:: clean-$(what)
 	$(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) verify.$(OBJEXT)
+
+clean-unix::
+	$(RM) shared/*
+clean-mac::
 	$(RM) shared/*
+clean-windows::
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 50f2b84704..3fbe486908 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -13,7 +13,11 @@ OBJS=	md4.$(OBJEXT) md4glue.$(OBJEXT) md4crypto.$(OBJEXT)
 
 SRCS=	$(srcdir)/md4.c $(srcdir)/md4glue.c $(srcdir)/md4crypto.c
 
-all:: shared $(OBJS)
+all:: all-$(WHAT) $(OBJS)
+
+all-unix:: shared
+all-mac:: shared
+all-windows::
 
 shared:
 	mkdir shared
@@ -35,6 +39,11 @@ t_mddriver.exe:
 check:: t_mddriver$(EXEEXT)
 	$(C)t_mddriver$(EXEEXT) -x
 
-clean::
+clean:: clean-$(WHAT)
 	$(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT) t_mddriver.c
+
+clean-unix::
+	$(RM) shared/*
+clean-mac::
 	$(RM) shared/*
+clean-windows::
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 4a72f33c0b..f5829d9639 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -12,7 +12,11 @@ OBJS=	md5.$(OBJEXT) md5glue.$(OBJEXT) md5crypto.$(OBJEXT)
 
 SRCS=	$(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c
 
-all:: shared $(OBJS) 
+all:: all-$(WHAT) $(OBJS) 
+
+all-unix:: shared
+all-mac:: shared
+all-windows::
 
 shared:
 	mkdir shared
@@ -26,6 +30,11 @@ t_mddriver.exe:
 check:: t_mddriver$(EXEEXT)
 	$(C)t_mddriver$(EXEEXT) -x
 
-clean::
+clean:: clean-$(WHAT)
 	$(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT)
+
+clean-unix::
+	$(RM) shared/*
+clean-mac::
 	$(RM) shared/*
+clean-windows::
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 9c63c79768..0640b3986c 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -48,6 +48,11 @@ memmove.o: memmove.c
 @SHARED_RULE_LOCAL@
 	
 
-clean::
+clean:: clean-$(WHAT)
 	$(RM) ustime.c localaddr.c memmove.c
+
+clean-unix::
+	$(RM) shared/*
+clean-mac::
 	$(RM) shared/*
+clean-windows::