From dc8497b15c1c0d793eb4d739547772bf1a5fb10a Mon Sep 17 00:00:00 2001
From: Guillermo Rodriguez Garcia <guille@iies.es>
Date: Thu, 13 Jan 2000 01:07:28 +0000
Subject: [PATCH] A few more fixes from Mumit Khan

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/g95.t | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 2619e66624..af3c7dc92e 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -292,7 +292,11 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
+ifndef WXMAKINGDLL
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+endif
 
 ifndef WXMAKINGDLL
 
@@ -346,23 +350,23 @@ endif
 
 
 $(ZLIBLIB): $(ZLIBOBJS)
-	ar $(AROPTIONS) $@ $(ZLIBOBJS)
+	$(AR) $(AROPTIONS) $@ $(ZLIBOBJS)
 	$(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)
-	ar $(AROPTIONS) $@ $(PNGOBJS)
+	$(AR) $(AROPTIONS) $@ $(PNGOBJS)
 	$(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)
-	ar $(AROPTIONS) $@ $(JPEGOBJS)
+	$(AR) $(AROPTIONS) $@ $(JPEGOBJS)
 	$(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)
-	ar $(AROPTIONS) $@ $(XPMOBJS)
+	$(AR) $(AROPTIONS) $@ $(XPMOBJS)
 	$(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
-	ar $(AROPTIONS) $@ $(TIFFOBJS)
+	$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
 	$(RANLIB) $@
 
 
@@ -430,6 +434,11 @@ clean:
 	-$(RM) ../tiff/*.o
 	-$(RM) ../tiff/*.bak
 	-$(RM) $(WXLIB)
+	-$(RM) $(ZLIBLIB)
+	-$(RM) $(PNGLIB)
+	-$(RM) $(JPEGLIB)
+	-$(RM) $(XPMLIB)
+	-$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
 	-$(RM) $(WXDLL)