Removed ::UpdateWindow from scrolwin.cpp; corrected default extension appending;

[wxWidgets.git] / distrib / msw / tmake / g95.t

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 2619e6662457225d4ce382210b861172685e120f..af3c7dc92e95503a5e462111ebef9583810a5d3a 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -292,7 +292,11 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 

+ifndef WXMAKINGDLL

 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)

+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+endif

 
 ifndef WXMAKINGDLL
 
 
 ifndef WXMAKINGDLL
 


@@ -346,23 +350,23 @@ endif
 
 
 $(ZLIBLIB): $(ZLIBOBJS)
 
 
 $(ZLIBLIB): $(ZLIBOBJS)

-       ar $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(AR) $(AROPTIONS) $@ $(ZLIBOBJS)

        $(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)
        $(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)

-       ar $(AROPTIONS) $@ $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)

        $(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)
        $(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)

-       ar $(AROPTIONS) $@ $(JPEGOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)

        $(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)
        $(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)

-       ar $(AROPTIONS) $@ $(XPMOBJS)
+       $(AR) $(AROPTIONS) $@ $(XPMOBJS)

        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)

-       ar $(AROPTIONS) $@ $(TIFFOBJS)
+       $(AR) $(AROPTIONS) $@ $(TIFFOBJS)

        $(RANLIB) $@
 
 
        $(RANLIB) $@
 
 


@@ -430,6 +434,11 @@ clean:
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) $(WXLIB)
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) $(WXLIB)

+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(XPMLIB)
+       -$(RM) $(TIFFLIB)

 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)