VA 4.0 fixes

[wxWidgets.git] / src / msw / makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 619081eeda6343d4a103cd30a809e7ff0819edb4..85cb4710bac4161a7a09a0b88736723a1d80e1a7 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:55, 2000/01/12
+# This file was automatically generated by tmake at 14:31, 2000/01/19
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -77,6 +77,7 @@ GENERICOBJS = \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
+               $(GENDIR)/plot.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \
@@ -148,7 +149,7 @@ COMMONOBJS  = \
                $(COMMDIR)/longlong.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
-               $(COMMDIR)/mimetype.$(OBJSUFF) \
+               $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
@@ -205,6 +206,7 @@ HTMLOBJS = \
                $(HTMLDIR)/m_layout.$(OBJSUFF) \
                $(HTMLDIR)/m_links.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
+               $(HTMLDIR)/m_meta.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/winpars.$(OBJSUFF)
@@ -240,6 +242,7 @@ MSWOBJS     = \
                $(MSWDIR)/dibutils.$(OBJSUFF) \
                $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
+               $(MSWDIR)/enhmeta.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
                $(MSWDIR)/fontdlg.$(OBJSUFF) \
@@ -261,6 +264,7 @@ MSWOBJS     = \
                $(MSWDIR)/menu.$(OBJSUFF) \
                $(MSWDIR)/menuitem.$(OBJSUFF) \
                $(MSWDIR)/metafile.$(OBJSUFF) \
+               $(MSWDIR)/mimetype.$(OBJSUFF) \
                $(MSWDIR)/minifram.$(OBJSUFF) \
                $(MSWDIR)/msgdlg.$(OBJSUFF) \
                $(MSWDIR)/nativdlg.$(OBJSUFF) \
@@ -447,7 +451,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
 
@@ -501,23 +509,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) $@
 
 
@@ -585,6 +593,11 @@ clean:
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) $(WXLIB)
+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(XPMLIB)
+       -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)