]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.g95
Removing some level 3 warning
[wxWidgets.git] / src / msw / makefile.g95
index 6b006ef58c9ae955c265edd0b35d9af88cc18204..7538d1186c70161a514bbb260aced3ef605a29c3 100644 (file)
@@ -1,69 +1,48 @@
 
-
-# This file was automatically generated by tmake at 17:20, 1999/07/21
+# This file was automatically generated by tmake at 15:14, 1999/08/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
-# File:     makefile.unx
-# Author:   Julian Smart
+# File:     makefile.g95
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
-# Updated:
-# Copyright:(c) 1993, AIAI, University of Edinburgh
-#
-# "@(#)makefile.unx 1.2 5/9/94"
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
 #
 # Makefile for libwx.a
 
 # Replace this with your own path if necessary
 WXDIR = ../..
 
-# All common UNIX compiler flags and options are now in
+# All common compiler flags and options are now in
 # this central makefile.
 include $(WXDIR)/src/makeg95.env
 
-# IMPORTANT: if you want to link in subsidiary libraries,
-# required for some optional parts of wxWindows, you must
-# set EXTRATARGETS and EXTRAOBJS to match the settings in wx_setup.h.
-# Having done this, you won't have to worry about linking them
-# into each application.
-#
-# Here's the full list.
-#   prologio: Required if using the wxWindows resource facility
-#               USE_WX_RESOURCES should be 1
-#   xmgauge:  Gauge class (required for Motif only)
-#               USE_GAUGE should be 1
-#   xpm:      XPM pixmap support
-#               USE_XPM_IN_X should be 1
-#   wxstring: string class
-#               USE_GNU_WXSTRING should be 1
-#
-# Unfortunately, 'ar' doesn't like combining objects and libraries,
-# so we must identify all the objects from the subordinate libraries. Yuck!
-XPMSRC=../../contrib/wxxpm/objects$(GUISUFFIX)
-XPMOBJS=$(XPMSRC)/crbuffri.$(OBJSUFF) $(XPMSRC)/crbuffrp.$(OBJSUFF) $(XPMSRC)/crdatfri.$(OBJSUFF) $(XPMSRC)/crdatfrp.$(OBJSUFF)\
-  $(XPMSRC)/create.$(OBJSUFF) $(XPMSRC)/crifrbuf.$(OBJSUFF) $(XPMSRC)/crifrdat.$(OBJSUFF) $(XPMSRC)/crpfrbuf.$(OBJSUFF) $(XPMSRC)/crpfrdat.$(OBJSUFF)\
-  $(XPMSRC)/data.$(OBJSUFF) $(XPMSRC)/hashtab.$(OBJSUFF) $(XPMSRC)/misc.$(OBJSUFF) $(XPMSRC)/parse.$(OBJSUFF) $(XPMSRC)/rdftodat.$(OBJSUFF)\
-  $(XPMSRC)/rdftoi.$(OBJSUFF) $(XPMSRC)/rdftop.$(OBJSUFF) $(XPMSRC)/rgb.$(OBJSUFF) $(XPMSRC)/scan.$(OBJSUFF) $(XPMSRC)/simx.$(OBJSUFF)\
-  $(XPMSRC)/wrffrdat.$(OBJSUFF) $(XPMSRC)/wrffri.$(OBJSUFF) $(XPMSRC)/wrffrp.$(OBJSUFF)
-
 # Subordinate library possibilities
 
 EXTRAOBJS=
 
-GENDIR=../generic
-COMMDIR=../common
-XPMDIR=../xpm
-OLEDIR=ole
-MSWDIR=.
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+XPMDIR  = $(WXDIR)/src/xpm
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= $(GENDIR)/busyinfo.$(OBJSUFF) \
+GENERICOBJS = \
+                $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \
-               $(GENDIR)/extdlgg.$(OBJSUFF) \
                $(GENDIR)/gridg.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
+               $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
@@ -75,12 +54,15 @@ GENERICOBJS= $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tabg.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
-               $(GENDIR)/tipdlg.$(OBJSUFF)
+               $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/wizard.$(OBJSUFF)
 
-COMMONOBJS = \
+COMMONOBJS  = \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
+               $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/date.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
@@ -103,6 +85,7 @@ COMMONOBJS = \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
+               $(COMMDIR)/gifdecod.$(OBJSUFF) \
                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
                $(COMMDIR)/http.$(OBJSUFF) \
@@ -111,6 +94,7 @@ COMMONOBJS = \
                $(COMMDIR)/imaggif.$(OBJSUFF) \
                $(COMMDIR)/imagjpeg.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
+               $(COMMDIR)/imagpnm.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
@@ -129,10 +113,11 @@ COMMONOBJS = \
                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
-               $(COMMDIR)/sckint.$(OBJSUFF) \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
+               $(COMMDIR)/sizer.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -153,93 +138,194 @@ COMMONOBJS = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
-               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/zipstrm.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
-MSWOBJS = accel.$(OBJSUFF) \
-               app.$(OBJSUFF) \
-               bitmap.$(OBJSUFF) \
-               bmpbuttn.$(OBJSUFF) \
-               brush.$(OBJSUFF) \
-               button.$(OBJSUFF) \
-               caret.$(OBJSUFF) \
-               checkbox.$(OBJSUFF) \
-               checklst.$(OBJSUFF) \
-               choice.$(OBJSUFF) \
-               clipbrd.$(OBJSUFF) \
-               colordlg.$(OBJSUFF) \
-               colour.$(OBJSUFF) \
-               combobox.$(OBJSUFF) \
-               control.$(OBJSUFF) \
-               curico.$(OBJSUFF) \
-               cursor.$(OBJSUFF) \
-               data.$(OBJSUFF) \
-               dc.$(OBJSUFF) \
-               dcclient.$(OBJSUFF) \
-               dcmemory.$(OBJSUFF) \
-               dcprint.$(OBJSUFF) \
-               dcscreen.$(OBJSUFF) \
-               dde.$(OBJSUFF) \
-               dialog.$(OBJSUFF) \
-               dib.$(OBJSUFF) \
-               dibutils.$(OBJSUFF) \
-               dragimag.$(OBJSUFF) \
-               filedlg.$(OBJSUFF) \
-               font.$(OBJSUFF) \
-               fontdlg.$(OBJSUFF) \
-               frame.$(OBJSUFF) \
-               gauge95.$(OBJSUFF) \
-               gdiobj.$(OBJSUFF) \
-               helpwin.$(OBJSUFF) \
-               icon.$(OBJSUFF) \
-               imaglist.$(OBJSUFF) \
-               iniconf.$(OBJSUFF) \
-               joystick.$(OBJSUFF) \
-               listbox.$(OBJSUFF) \
-               listctrl.$(OBJSUFF) \
-               main.$(OBJSUFF) \
-               mdi.$(OBJSUFF) \
-               menu.$(OBJSUFF) \
-               menuitem.$(OBJSUFF) \
-               metafile.$(OBJSUFF) \
-               minifram.$(OBJSUFF) \
-               msgdlg.$(OBJSUFF) \
-               nativdlg.$(OBJSUFF) \
-               notebook.$(OBJSUFF) \
-               ownerdrw.$(OBJSUFF) \
-               palette.$(OBJSUFF) \
-               pen.$(OBJSUFF) \
-               penwin.$(OBJSUFF) \
-               pnghand.$(OBJSUFF) \
-               printdlg.$(OBJSUFF) \
-               printwin.$(OBJSUFF) \
-               radiobox.$(OBJSUFF) \
-               radiobut.$(OBJSUFF) \
-               regconf.$(OBJSUFF) \
-               region.$(OBJSUFF) \
-               registry.$(OBJSUFF) \
-               scrolbar.$(OBJSUFF) \
-               settings.$(OBJSUFF) \
-               slider95.$(OBJSUFF) \
-               spinbutt.$(OBJSUFF) \
-               statbmp.$(OBJSUFF) \
-               statbox.$(OBJSUFF) \
-               statbr95.$(OBJSUFF) \
-               statline.$(OBJSUFF) \
-               stattext.$(OBJSUFF) \
-               tabctrl.$(OBJSUFF) \
-               taskbar.$(OBJSUFF) \
-               tbar95.$(OBJSUFF) \
-               textctrl.$(OBJSUFF) \
-               thread.$(OBJSUFF) \
-               timer.$(OBJSUFF) \
-               tooltip.$(OBJSUFF) \
-               treectrl.$(OBJSUFF) \
-               utils.$(OBJSUFF) \
-               utilsexc.$(OBJSUFF) \
-               wave.$(OBJSUFF) \
-               window.$(OBJSUFF) \
-               xpmhand.$(OBJSUFF)
+HTMLOBJS = \
+                $(HTMLDIR)/htmlcell.$(OBJSUFF) \
+               $(HTMLDIR)/htmlfilter.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp_io.$(OBJSUFF) \
+               $(HTMLDIR)/htmlparser.$(OBJSUFF) \
+               $(HTMLDIR)/htmltag.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwin.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwinparser.$(OBJSUFF) \
+               $(HTMLDIR)/mod_fonts.$(OBJSUFF) \
+               $(HTMLDIR)/mod_hline.$(OBJSUFF) \
+               $(HTMLDIR)/mod_image.$(OBJSUFF) \
+               $(HTMLDIR)/mod_layout.$(OBJSUFF) \
+               $(HTMLDIR)/mod_links.$(OBJSUFF) \
+               $(HTMLDIR)/mod_list.$(OBJSUFF) \
+               $(HTMLDIR)/mod_pre.$(OBJSUFF) \
+               $(HTMLDIR)/mod_tables.$(OBJSUFF) \
+               $(HTMLDIR)/search.$(OBJSUFF)
+
+MSWOBJS     = \
+               $(MSWDIR)/accel.$(OBJSUFF) \
+               $(MSWDIR)/app.$(OBJSUFF) \
+               $(MSWDIR)/bitmap.$(OBJSUFF) \
+               $(MSWDIR)/bmpbuttn.$(OBJSUFF) \
+               $(MSWDIR)/brush.$(OBJSUFF) \
+               $(MSWDIR)/button.$(OBJSUFF) \
+               $(MSWDIR)/caret.$(OBJSUFF) \
+               $(MSWDIR)/checkbox.$(OBJSUFF) \
+               $(MSWDIR)/checklst.$(OBJSUFF) \
+               $(MSWDIR)/choice.$(OBJSUFF) \
+               $(MSWDIR)/clipbrd.$(OBJSUFF) \
+               $(MSWDIR)/colordlg.$(OBJSUFF) \
+               $(MSWDIR)/colour.$(OBJSUFF) \
+               $(MSWDIR)/combobox.$(OBJSUFF) \
+               $(MSWDIR)/control.$(OBJSUFF) \
+               $(MSWDIR)/curico.$(OBJSUFF) \
+               $(MSWDIR)/cursor.$(OBJSUFF) \
+               $(MSWDIR)/data.$(OBJSUFF) \
+               $(MSWDIR)/dc.$(OBJSUFF) \
+               $(MSWDIR)/dcclient.$(OBJSUFF) \
+               $(MSWDIR)/dcmemory.$(OBJSUFF) \
+               $(MSWDIR)/dcprint.$(OBJSUFF) \
+               $(MSWDIR)/dcscreen.$(OBJSUFF) \
+               $(MSWDIR)/dde.$(OBJSUFF) \
+               $(MSWDIR)/dialog.$(OBJSUFF) \
+               $(MSWDIR)/dib.$(OBJSUFF) \
+               $(MSWDIR)/dibutils.$(OBJSUFF) \
+               $(MSWDIR)/dragimag.$(OBJSUFF) \
+               $(MSWDIR)/filedlg.$(OBJSUFF) \
+               $(MSWDIR)/font.$(OBJSUFF) \
+               $(MSWDIR)/fontdlg.$(OBJSUFF) \
+               $(MSWDIR)/frame.$(OBJSUFF) \
+               $(MSWDIR)/gauge95.$(OBJSUFF) \
+               $(MSWDIR)/gdiobj.$(OBJSUFF) \
+               $(MSWDIR)/helpwin.$(OBJSUFF) \
+               $(MSWDIR)/icon.$(OBJSUFF) \
+               $(MSWDIR)/imaglist.$(OBJSUFF) \
+               $(MSWDIR)/joystick.$(OBJSUFF) \
+               $(MSWDIR)/listbox.$(OBJSUFF) \
+               $(MSWDIR)/listctrl.$(OBJSUFF) \
+               $(MSWDIR)/main.$(OBJSUFF) \
+               $(MSWDIR)/mdi.$(OBJSUFF) \
+               $(MSWDIR)/menu.$(OBJSUFF) \
+               $(MSWDIR)/menuitem.$(OBJSUFF) \
+               $(MSWDIR)/metafile.$(OBJSUFF) \
+               $(MSWDIR)/minifram.$(OBJSUFF) \
+               $(MSWDIR)/msgdlg.$(OBJSUFF) \
+               $(MSWDIR)/nativdlg.$(OBJSUFF) \
+               $(MSWDIR)/notebook.$(OBJSUFF) \
+               $(MSWDIR)/ownerdrw.$(OBJSUFF) \
+               $(MSWDIR)/palette.$(OBJSUFF) \
+               $(MSWDIR)/pen.$(OBJSUFF) \
+               $(MSWDIR)/penwin.$(OBJSUFF) \
+               $(MSWDIR)/pnghand.$(OBJSUFF) \
+               $(MSWDIR)/printdlg.$(OBJSUFF) \
+               $(MSWDIR)/printwin.$(OBJSUFF) \
+               $(MSWDIR)/radiobox.$(OBJSUFF) \
+               $(MSWDIR)/radiobut.$(OBJSUFF) \
+               $(MSWDIR)/regconf.$(OBJSUFF) \
+               $(MSWDIR)/region.$(OBJSUFF) \
+               $(MSWDIR)/registry.$(OBJSUFF) \
+               $(MSWDIR)/scrolbar.$(OBJSUFF) \
+               $(MSWDIR)/settings.$(OBJSUFF) \
+               $(MSWDIR)/slider95.$(OBJSUFF) \
+               $(MSWDIR)/spinbutt.$(OBJSUFF) \
+               $(MSWDIR)/statbmp.$(OBJSUFF) \
+               $(MSWDIR)/statbox.$(OBJSUFF) \
+               $(MSWDIR)/statbr95.$(OBJSUFF) \
+               $(MSWDIR)/statline.$(OBJSUFF) \
+               $(MSWDIR)/stattext.$(OBJSUFF) \
+               $(MSWDIR)/tabctrl.$(OBJSUFF) \
+               $(MSWDIR)/taskbar.$(OBJSUFF) \
+               $(MSWDIR)/tbar95.$(OBJSUFF) \
+               $(MSWDIR)/textctrl.$(OBJSUFF) \
+               $(MSWDIR)/thread.$(OBJSUFF) \
+               $(MSWDIR)/timer.$(OBJSUFF) \
+               $(MSWDIR)/tooltip.$(OBJSUFF) \
+               $(MSWDIR)/treectrl.$(OBJSUFF) \
+               $(MSWDIR)/utils.$(OBJSUFF) \
+               $(MSWDIR)/utilsexc.$(OBJSUFF) \
+               $(MSWDIR)/wave.$(OBJSUFF) \
+               $(MSWDIR)/window.$(OBJSUFF) \
+               $(MSWDIR)/xpmhand.$(OBJSUFF)
+
+ZLIBOBJS    = \
+               $(ZLIBDIR)/adler32.$(OBJSUFF) \
+               $(ZLIBDIR)/compress.$(OBJSUFF) \
+               $(ZLIBDIR)/crc32.$(OBJSUFF) \
+               $(ZLIBDIR)/gzio.$(OBJSUFF) \
+               $(ZLIBDIR)/uncompr.$(OBJSUFF) \
+               $(ZLIBDIR)/deflate.$(OBJSUFF) \
+               $(ZLIBDIR)/trees.$(OBJSUFF) \
+               $(ZLIBDIR)/zutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inflate.$(OBJSUFF) \
+               $(ZLIBDIR)/infblock.$(OBJSUFF) \
+               $(ZLIBDIR)/inftrees.$(OBJSUFF) \
+               $(ZLIBDIR)/infcodes.$(OBJSUFF) \
+               $(ZLIBDIR)/infutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+               $(PNGDIR)/png.$(OBJSUFF) \
+               $(PNGDIR)/pngread.$(OBJSUFF) \
+               $(PNGDIR)/pngrtran.$(OBJSUFF) \
+               $(PNGDIR)/pngrutil.$(OBJSUFF) \
+               $(PNGDIR)/pngpread.$(OBJSUFF) \
+               $(PNGDIR)/pngtrans.$(OBJSUFF) \
+               $(PNGDIR)/pngwrite.$(OBJSUFF) \
+               $(PNGDIR)/pngwtran.$(OBJSUFF) \
+               $(PNGDIR)/pngwutil.$(OBJSUFF) \
+               $(PNGDIR)/pngerror.$(OBJSUFF) \
+               $(PNGDIR)/pngmem.$(OBJSUFF) \
+               $(PNGDIR)/pngwio.$(OBJSUFF) \
+               $(PNGDIR)/pngrio.$(OBJSUFF) \
+               $(PNGDIR)/pngget.$(OBJSUFF) \
+               $(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+               $(JPEGDIR)/jcomapi.$(OBJSUFF) \
+               $(JPEGDIR)/jutils.$(OBJSUFF) \
+               $(JPEGDIR)/jerror.$(OBJSUFF) \
+               $(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+               $(JPEGDIR)/jcapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jcapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jctrans.$(OBJSUFF) \
+               $(JPEGDIR)/jcparam.$(OBJSUFF) \
+               $(JPEGDIR)/jdatadst.$(OBJSUFF) \
+               $(JPEGDIR)/jcinit.$(OBJSUFF) \
+               $(JPEGDIR)/jcmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jcmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jcmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jcprepct.$(OBJSUFF) \
+               $(JPEGDIR)/jccoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jccolor.$(OBJSUFF) \
+               $(JPEGDIR)/jcsample.$(OBJSUFF) \
+               $(JPEGDIR)/jchuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctint.$(OBJSUFF) \
+               $(JPEGDIR)/jdapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jdapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jdtrans.$(OBJSUFF) \
+               $(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+               $(JPEGDIR)/jdmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jdinput.$(OBJSUFF) \
+               $(JPEGDIR)/jdmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jdhuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jdpostct.$(OBJSUFF) \
+               $(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jidctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jidctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jidctint.$(OBJSUFF) \
+               $(JPEGDIR)/jidctred.$(OBJSUFF) \
+               $(JPEGDIR)/jdsample.$(OBJSUFF) \
+               $(JPEGDIR)/jdcolor.$(OBJSUFF) \
+               $(JPEGDIR)/jquant1.$(OBJSUFF) \
+               $(JPEGDIR)/jquant2.$(OBJSUFF) \
+               $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
 XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/crdatfri.o\
@@ -253,15 +339,11 @@ XPMOBJECTS =      $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)
 
-base:
-       cd $(WXDIR)/src/common; $(MAKE) -f makefile.g95 GUI=$(GUI) GUISUFFIX=$(GUISUFFIX) CC=$(CC)\
- OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
@@ -307,23 +389,22 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #      $(YACC) $(COMMDIR)/parser.y
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
-# Extra targets
-rcparser:
-       cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
-       cd $(WXDIR)/src/msw
-
-clean_rcp:
-       cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-
 clean:
        -erase *.o
+       -erase *.bak
        -erase core
        -erase ..\common\y_tab.c
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o
+       -erase ..\common\*.bak
        -erase ..\generic\*.o
-       -erase ..\..\lib\libwx$(GUISUFFIX).a
+       -erase ..\generic\*.bak
+       -erase ..\html\*.o
+       -erase ..\png\*.o
+       -erase ..\png\*.bak
+       -erase ..\zlib\*.o
+       -erase ..\zlib\*.bak
+       -erase ..\jpeg\*.o
+       -erase ..\..\lib\libwx.a
 
 cleanall: clean
-