diff --git a/library/random/Makefile.in b/library/random/Makefile.in
index ee571e7ae..8d583b9c2 100644
--- a/library/random/Makefile.in
+++ b/library/random/Makefile.in
@@ -45,11 +45,11 @@ dll: random@SHLIB_SUFFIX@
 random.o: $(srcdir)/random.c
 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/random.c -o random.o
 
-%.so: %.o
+%@SHLIB_SUFFIX@: %.o
 	@SHLIB_LD@ -o $@ $<
 
-random.so: random.o
-	@SHLIB_LD@ -o random.so random.o
+random@SHLIB_SUFFIX@: random.o
+	@SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o
 
 #
 # create a new DLL library on cygwin environments
@@ -84,5 +84,5 @@ install_mingw32: dll
 	$(INSTALL_PROGRAM) -m 755 random.dll $(LIBDIR)/random.dll
 
 clean:
-	rm -f *.o *.so *~ $(OBJS) *.BAK
+	rm -f *.o *@SHLIB_SUFFIX@ *~ $(OBJS) *.BAK
 
diff --git a/library/regex/Makefile.in b/library/regex/Makefile.in
index f3dc79827..c43527cfb 100644
--- a/library/regex/Makefile.in
+++ b/library/regex/Makefile.in
@@ -57,23 +57,23 @@ regfree.o: $(srcdir)/regfree.c
 regexec.o: $(srcdir)/regexec.c
 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/regexec.c -o regexec.o
 
-%.so: %.o
+%@SHLIB_SUFFIX@: %.o
 	@SHLIB_LD@ -o $@ $<
 
-regexp.so: regexp.o
-	@SHLIB_LD@ -o regexp.so regexp.o
+regexp@SHLIB_SUFFIX@: regexp.o
+	@SHLIB_LD@ -o regexp@SHLIB_SUFFIX@ regexp.o
 
-regcomp.so: regcomp.o
-	@SHLIB_LD@ -o regcomp.so regcomp.o
+regcomp@SHLIB_SUFFIX@: regcomp.o
+	@SHLIB_LD@ -o regcomp@SHLIB_SUFFIX@ regcomp.o
 
-regerror.so: regerror.o
-	@SHLIB_LD@ -o regerror.so regerror.o
+regerror@SHLIB_SUFFIX@: regerror.o
+	@SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o
 
-regfree.so: regfree.o
-	@SHLIB_LD@ -o regfree.so regfree.o
+regfree@SHLIB_SUFFIX@: regfree.o
+	@SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o
 
-regexec.so: regexec.o
-	@SHLIB_LD@ -o regexec.so regexec.o
+regexec@SHLIB_SUFFIX@: regexec.o
+	@SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o
 
 #
 # create a new DLL library on cygwin environments
@@ -108,5 +108,5 @@ install_mingw32: dll
 	$(INSTALL_PROGRAM) -m 755 regexp.dll $(LIBDIR)/regexp.dll
 
 clean:
-	rm -f *.o *.so *~ $(OBJS) *.BAK
+	rm -f *.o *@SHLIB_SUFFIX@ *~ $(OBJS) *.BAK
 
diff --git a/library/system/Makefile.in b/library/system/Makefile.in
index 813ec6ada..d5ddc4474 100644
--- a/library/system/Makefile.in
+++ b/library/system/Makefile.in
@@ -45,11 +45,11 @@ dll: sys@SHLIB_SUFFIX@
 sys.o: $(srcdir)/sys.c
 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/sys.c -o sys.o
 
-%.so: %.o
+%@SHLIB_SUFFIX@: %.o
 	@SHLIB_LD@ -o $@ $<
 
-sys.so: sys.o
-	@SHLIB_LD@ -o sys.so sys.o
+sys@SHLIB_SUFFIX@: sys.o
+	@SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o
 
 #
 # create a new DLL library on cygwin environments
@@ -84,5 +84,5 @@ install_mingw32: dll
 	$(INSTALL_PROGRAM) -m 755 sys.dll $(LIBDIR)/sys.dll
 
 clean:
-	rm -f *.o *.so *~ $(OBJS) *.BAK
+	rm -f *.o *@SHLIB_SUFFIX@ *~ $(OBJS) *.BAK