better focus handling (blind fix)

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index c2e1fcbf3bd9d3334a859e8855c7baf52fe1cce6..8d8eea7b82ce922e9ee2fc574bd1c3a09f15c762 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,146 +1,206 @@
-
-
-# This file was automatically generated by tmake at 15:25, 1999/07/20
+# This file was automatically generated by tmake at 13:52, 2001/08/06

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # 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
 # 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 = ../..
 
 #
 # 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
 
 # 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)
+# DLL Name, if building wxWindows as a DLL.
+ifdef WXMAKINGDLL
+WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
+WXDEF = wx$(WXVERSION).def
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
+                 $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
+                    $(WXDIR)/lib/libtiff.a
+DLL_LDFLAGS = -L$(WXDIR)/lib
+DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+             -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
+             -lwsock32 $(DLL_EXTRA_LIBS) \
+                 -lstdc++
+endif

 
 # Subordinate library possibilities
 
 EXTRAOBJS=
 
 
 # Subordinate library possibilities
 
 EXTRAOBJS=
 

-GENDIR=../generic
-COMMDIR=../common
-XPMDIR=../xpm
-OLEDIR=ole
-MSWDIR=.
-
-DOCDIR = $(WXDIR)\docs
-
-GENERICOBJS= $(GENDIR)/busyinfo.$(OBJSUFF) \
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+ZLIBDIR = $(WXDIR)/src/zlib
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+TIFFDIR = $(WXDIR)/src/tiff
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
+
+ZLIBLIB = $(WXDIR)/lib/libzlib.a
+PNGLIB  = $(WXDIR)/lib/libpng.a
+JPEGLIB = $(WXDIR)/lib/libjpeg.a
+TIFFLIB = $(WXDIR)/lib/libtiff.a
+
+DOCDIR = $(WXDIR)/docs
+
+# Only use the WIN32 wxDirDialog if we have a recent
+# version of Mingw32
+ifeq ($(MINGW32),1)
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+               DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
+  else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+  endif
+else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+endif
+
+GENERICOBJS = \
+                $(GENDIR)/busyinfo.$(OBJSUFF) \
+               $(GENDIR)/calctrl.$(OBJSUFF) \

                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \

-               $(GENDIR)/dirdlgg.$(OBJSUFF) \
-               $(GENDIR)/extdlgg.$(OBJSUFF) \
-               $(GENDIR)/gridg.$(OBJSUFF) \
+               $(GENDIR)/dirctrlg.$(OBJSUFF) \
+               $(GENDIR)/dragimgg.$(OBJSUFF) \
+               $(GENDIR)/grid.$(OBJSUFF) \
+               $(GENDIR)/gridctrl.$(OBJSUFF) \
+               $(GENDIR)/gridsel.$(OBJSUFF) \

                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \

+               $(GENDIR)/logg.$(OBJSUFF) \
+               $(GENDIR)/numdlgg.$(OBJSUFF) \

                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \
                $(GENDIR)/proplist.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \
                $(GENDIR)/proplist.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \

-               $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/scrlwing.$(OBJSUFF) \
+               $(GENDIR)/spinctlg.$(OBJSUFF) \
+               $(GENDIR)/splash.$(OBJSUFF) \

                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \

-               $(GENDIR)/tabg.$(OBJSUFF) \
+               $(GENDIR)/tbarsmpl.$(OBJSUFF) \

                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \

-               $(GENDIR)/tipdlg.$(OBJSUFF)
+               $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/tipwin.$(OBJSUFF) \
+               $(GENDIR)/treectlg.$(OBJSUFF) \
+               $(GENDIR)/treelay.$(OBJSUFF) \
+               $(GENDIR)/wizard.$(OBJSUFF)

 
 

-COMMONOBJS = \
+COMMONOBJS  = \

                $(COMMDIR)/y_tab.$(OBJSUFF) \
                $(COMMDIR)/y_tab.$(OBJSUFF) \

+               $(COMMDIR)/appcmn.$(OBJSUFF) \
+               $(COMMDIR)/choiccmn.$(OBJSUFF) \
+               $(COMMDIR)/clipcmn.$(OBJSUFF) \
+               $(COMMDIR)/cmdline.$(OBJSUFF) \
+               $(COMMDIR)/cmdproc.$(OBJSUFF) \

                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \

-               $(COMMDIR)/date.$(OBJSUFF) \
+               $(COMMDIR)/containr.$(OBJSUFF) \
+               $(COMMDIR)/cshelp.$(OBJSUFF) \
+               $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
+               $(COMMDIR)/ctrlsub.$(OBJSUFF) \
+               $(COMMDIR)/datetime.$(OBJSUFF) \

                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \

+               $(COMMDIR)/dbgrid.$(OBJSUFF) \

                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \

+               $(COMMDIR)/dircmn.$(OBJSUFF) \

                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \

+               $(COMMDIR)/dndcmn.$(OBJSUFF) \
+               $(COMMDIR)/dobjcmn.$(OBJSUFF) \

                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \

+               $(COMMDIR)/effects.$(OBJSUFF) \
+               $(COMMDIR)/encconv.$(OBJSUFF) \

                $(COMMDIR)/event.$(OBJSUFF) \
                $(COMMDIR)/extended.$(OBJSUFF) \
                $(COMMDIR)/event.$(OBJSUFF) \
                $(COMMDIR)/extended.$(OBJSUFF) \

+               $(COMMDIR)/fddlgcmn.$(OBJSUFF) \

                $(COMMDIR)/ffile.$(OBJSUFF) \
                $(COMMDIR)/file.$(OBJSUFF) \
                $(COMMDIR)/fileconf.$(OBJSUFF) \
                $(COMMDIR)/filefn.$(OBJSUFF) \
                $(COMMDIR)/ffile.$(OBJSUFF) \
                $(COMMDIR)/file.$(OBJSUFF) \
                $(COMMDIR)/fileconf.$(OBJSUFF) \
                $(COMMDIR)/filefn.$(OBJSUFF) \

+               $(COMMDIR)/filename.$(OBJSUFF) \

                $(COMMDIR)/filesys.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \

+               $(COMMDIR)/fontcmn.$(OBJSUFF) \
+               $(COMMDIR)/fontmap.$(OBJSUFF) \

                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \

+               $(COMMDIR)/fs_mem.$(OBJSUFF) \

                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \

+               $(COMMDIR)/gaugecmn.$(OBJSUFF) \

                $(COMMDIR)/gdicmn.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \

+               $(COMMDIR)/geometry.$(OBJSUFF) \
+               $(COMMDIR)/gifdecod.$(OBJSUFF) \

                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
                $(COMMDIR)/http.$(OBJSUFF) \
                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
                $(COMMDIR)/http.$(OBJSUFF) \

+               $(COMMDIR)/imagall.$(OBJSUFF) \

                $(COMMDIR)/imagbmp.$(OBJSUFF) \
                $(COMMDIR)/image.$(OBJSUFF) \
                $(COMMDIR)/imaggif.$(OBJSUFF) \
                $(COMMDIR)/imagjpeg.$(OBJSUFF) \
                $(COMMDIR)/imagbmp.$(OBJSUFF) \
                $(COMMDIR)/image.$(OBJSUFF) \
                $(COMMDIR)/imaggif.$(OBJSUFF) \
                $(COMMDIR)/imagjpeg.$(OBJSUFF) \

+               $(COMMDIR)/imagpcx.$(OBJSUFF) \

                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \

+               $(COMMDIR)/imagpnm.$(OBJSUFF) \
+               $(COMMDIR)/imagtiff.$(OBJSUFF) \
+               $(COMMDIR)/imagxpm.$(OBJSUFF) \

                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \

+               $(COMMDIR)/lboxcmn.$(OBJSUFF) \

                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \

+               $(COMMDIR)/longlong.$(OBJSUFF) \
+               $(COMMDIR)/matrix.$(OBJSUFF) \

                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \

-               $(COMMDIR)/mimetype.$(OBJSUFF) \
+               $(COMMDIR)/menucmn.$(OBJSUFF) \
+               $(COMMDIR)/mimecmn.$(OBJSUFF) \

                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \

+               $(COMMDIR)/nbkbase.$(OBJSUFF) \

                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/objstrm.$(OBJSUFF) \
                $(COMMDIR)/paper.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/objstrm.$(OBJSUFF) \
                $(COMMDIR)/paper.$(OBJSUFF) \

+               $(COMMDIR)/popupcmn.$(OBJSUFF) \

                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/protocol.$(OBJSUFF) \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/protocol.$(OBJSUFF) \

+               $(COMMDIR)/quantize.$(OBJSUFF) \
+               $(COMMDIR)/radiocmn.$(OBJSUFF) \
+               $(COMMDIR)/regex.$(OBJSUFF) \

                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \

-               $(COMMDIR)/sckint.$(OBJSUFF) \

                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \

+               $(COMMDIR)/serbase.$(OBJSUFF) \
+               $(COMMDIR)/sizer.$(OBJSUFF) \

                $(COMMDIR)/socket.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \

+               $(COMMDIR)/strconv.$(OBJSUFF) \

                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \

+               $(COMMDIR)/sysopt.$(OBJSUFF) \

                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \

-               $(COMMDIR)/time.$(OBJSUFF) \

                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \

+               $(COMMDIR)/treebase.$(OBJSUFF) \

                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/unzip.$(OBJSUFF) \
                $(COMMDIR)/url.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/unzip.$(OBJSUFF) \
                $(COMMDIR)/url.$(OBJSUFF) \


@@ -153,169 +213,415 @@ COMMONOBJS = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \

-               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/xpmdecod.$(OBJSUFF) \
+               $(COMMDIR)/zipstrm.$(OBJSUFF) \

                $(COMMDIR)/zstream.$(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)
-
-XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
-               $(XPMDIR)/crdatfri.o\
-               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
-               $(XPMDIR)/crifrdat.o\
-               $(XPMDIR)/data.o\
-               $(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
-               $(XPMDIR)/rdftoi.o\
-               $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
-               $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(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)'
-
+HTMLOBJS = \
+                $(HTMLDIR)/helpctrl.$(OBJSUFF) \
+               $(HTMLDIR)/helpdata.$(OBJSUFF) \
+               $(HTMLDIR)/helpfrm.$(OBJSUFF) \
+               $(HTMLDIR)/htmlcell.$(OBJSUFF) \
+               $(HTMLDIR)/htmlfilt.$(OBJSUFF) \
+               $(HTMLDIR)/htmlpars.$(OBJSUFF) \
+               $(HTMLDIR)/htmltag.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwin.$(OBJSUFF) \
+               $(HTMLDIR)/htmprint.$(OBJSUFF) \
+               $(HTMLDIR)/m_dflist.$(OBJSUFF) \
+               $(HTMLDIR)/m_fonts.$(OBJSUFF) \
+               $(HTMLDIR)/m_hline.$(OBJSUFF) \
+               $(HTMLDIR)/m_image.$(OBJSUFF) \
+               $(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)
+
+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)/dialup.$(OBJSUFF) \
+               $(MSWDIR)/dib.$(OBJSUFF) \
+               $(MSWDIR)/dibutils.$(OBJSUFF) \
+               $(MSWDIR)/dir.$(OBJSUFF) \
+               $(MSWDIR)/dragimag.$(OBJSUFF) \
+               $(MSWDIR)/enhmeta.$(OBJSUFF) \
+               $(MSWDIR)/evtloop.$(OBJSUFF) \
+               $(MSWDIR)/fdrepdlg.$(OBJSUFF) \
+               $(MSWDIR)/filedlg.$(OBJSUFF) \
+               $(MSWDIR)/font.$(OBJSUFF) \
+               $(MSWDIR)/fontdlg.$(OBJSUFF) \
+               $(MSWDIR)/fontenum.$(OBJSUFF) \
+               $(MSWDIR)/fontutil.$(OBJSUFF) \
+               $(MSWDIR)/frame.$(OBJSUFF) \
+               $(MSWDIR)/gauge95.$(OBJSUFF) \
+               $(MSWDIR)/gdiimage.$(OBJSUFF) \
+               $(MSWDIR)/gdiobj.$(OBJSUFF) \
+               $(MSWDIR)/glcanvas.$(OBJSUFF) \
+               $(MSWDIR)/gsocket.$(OBJSUFF) \
+               $(MSWDIR)/gsockmsw.$(OBJSUFF) \
+               $(MSWDIR)/helpchm.$(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)/mimetype.$(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)/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)/snglinst.$(OBJSUFF) \
+               $(MSWDIR)/spinbutt.$(OBJSUFF) \
+               $(MSWDIR)/spinctrl.$(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)/tglbtn.$(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)
+
+ADVANCEDOBJS     = \
+               $(COMMDIR)/odbc.$(OBJSUFF) \
+               $(MSWDIR)/ole/automtn.$(OBJSUFF) \
+               $(MSWDIR)/ole/dataobj.$(OBJSUFF) \
+               $(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
+               $(MSWDIR)/ole/droptgt.$(OBJSUFF) \
+               $(MSWDIR)/ole/oleutils.$(OBJSUFF) \
+               $(MSWDIR)/ole/uuid.$(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)
+
+TIFFOBJS = $(TIFFDIR)/tif_aux.o \
+               $(TIFFDIR)/tif_close.o \
+               $(TIFFDIR)/tif_codec.o \
+               $(TIFFDIR)/tif_compress.o \
+               $(TIFFDIR)/tif_dir.o \
+               $(TIFFDIR)/tif_dirinfo.o \
+               $(TIFFDIR)/tif_dirread.o \
+               $(TIFFDIR)/tif_dirwrite.o \
+               $(TIFFDIR)/tif_dumpmode.o \
+               $(TIFFDIR)/tif_error.o \
+               $(TIFFDIR)/tif_fax3.o \
+               $(TIFFDIR)/tif_fax3sm.o \
+               $(TIFFDIR)/tif_flush.o \
+               $(TIFFDIR)/tif_getimage.o \
+               $(TIFFDIR)/tif_jpeg.o \
+               $(TIFFDIR)/tif_luv.o \
+               $(TIFFDIR)/tif_lzw.o \
+               $(TIFFDIR)/tif_next.o \
+               $(TIFFDIR)/tif_open.o \
+               $(TIFFDIR)/tif_packbits.o \
+               $(TIFFDIR)/tif_pixarlog.o \
+               $(TIFFDIR)/tif_predict.o \
+               $(TIFFDIR)/tif_print.o \
+               $(TIFFDIR)/tif_read.o \
+               $(TIFFDIR)/tif_strip.o \
+               $(TIFFDIR)/tif_swab.o \
+               $(TIFFDIR)/tif_thunder.o \
+               $(TIFFDIR)/tif_tile.o \
+               $(TIFFDIR)/tif_version.o \
+               $(TIFFDIR)/tif_warning.o \
+               $(TIFFDIR)/tif_win32.o \
+               $(TIFFDIR)/tif_write.o \
+               $(TIFFDIR)/tif_zip.o
+
+ifeq ($(MINGW32),1)
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
+  else
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
+  endif
+else
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
+endif
+
+ifndef WXMAKINGDLL
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
+endif
+
+ifndef WXMAKINGDLL

 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
 
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
 

+else
+
+# The new linker is a few orders of magnitude faster than the old way
+# of creating DLLs.
+ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
+
+$(WXDLL): $(OBJECTS) $(EXTRAOBJS)
+       $(CC) -shared -o $@ \
+         -Wl,--output-def,$(WXDEF) \
+         -Wl,--out-implib,$(WXLIB) \
+         $(OBJECTS) $(EXTRAOBJS) \
+         $(DLL_LDFLAGS) $(DLL_LDLIBS)
+else
+
+ifeq ($(MINGW32),1)
+  DLL_ENTRY = _DllMainCRTStartup@12
+else
+  DLL_ENTRY = __cygwin_dll_entry@12
+endif
+LD_STUFF = $(OBJECTS) $(EXTRAOBJS) -Wl,-e,$(DLL_ENTRY) \
+           $(DLL_LDFLAGS) $(DLL_LDLIBS) #-Wl,--image-base=0x66000000
+
+DLL_STUFF = --as=$(AS) --dllname $(notdir $(WXDLL)) \
+            --def $(WXDEF) \
+            --base-file wx.base --output-exp wx.exp
+
+$(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+       $(DLLTOOL) --output-def $@ --output-lib $(WXLIB) \
+         --dllname $(notdir $(WXDLL)) \
+         $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
+
+$(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)
+       $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF)
+       $(DLLTOOL) $(DLL_STUFF)
+       $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF)
+       $(DLLTOOL) $(DLL_STUFF)
+       $(CC) -mdll wx.exp -o $@ $(LD_STUFF)
+       -$(RM) wx.base
+       -$(RM) wx.exp
+
+endif
+
+endif
+
+
+$(ZLIBLIB): $(ZLIBOBJS)
+       $(AR) $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(RANLIB) $@
+
+$(PNGLIB): $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)
+       $(RANLIB) $@
+
+$(JPEGLIB): $(JPEGOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
+       $(RANLIB) $@
+
+$(TIFFLIB): $(TIFFOBJS)
+       $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
+       $(RANLIB) $@
+
+

 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c

-       $(CCLEX) -c $(CPPFLAGS) -o $@ $(COMMDIR)/y_tab.c
+       $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+       $(COPY) ../common/dosyacc.c ../common/y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+       $(COPY) ../common/doslex.c ../common/lex_yy.c

 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.

-$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
-       $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-
+# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l
+#      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#

 # Try one of these if the above line doesn't work.
 # Alternative syntax (1)
 #      $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
 # Alternative syntax (2)
 #      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
 # Try one of these if the above line doesn't work.
 # Alternative syntax (1)
 #      $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
 # Alternative syntax (2)
 #      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l

-
+#

 #      sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
 #       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
 #      rm -f lex.yy.c
 #      sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
 #       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
 #      rm -f lex.yy.c

-
+#

 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.

-
-$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
-       $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-
+#
+# $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
+#      $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
+#

 # If you use e.g. gcc on Unix, uncomment these lines
 # and comment out the above.
 # If you use e.g. gcc on Unix, uncomment these lines
 # and comment out the above.

-
+#

 # $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
 #      $(YACC) $(COMMDIR)/parser.y
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
 # $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
 #      $(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:
 clean:

-       erase *.o
-       erase ../common/y_tab.c
-       erase ../common/lex_yy.c
-       erase $(WXDIR)/lib/libwx$(GUISUFFIX).a
-       erase core
+       -$(RM) *.o
+       -$(RM) ole/*.o
+       -$(RM) *.bak
+       -$(RM) core
+       -$(RM) ../common/y_tab.c
+       -$(RM) ../common/lex_yy.c
+       -$(RM) ../common/*.o
+       -$(RM) ../common/*.bak
+       -$(RM) ../generic/*.o
+       -$(RM) ../generic/*.bak
+       -$(RM) ../html/*.o
+       -$(RM) ../zlib/*.o
+       -$(RM) ../zlib/*.bak
+       -$(RM) ../png/*.o
+       -$(RM) ../png/*.bak
+       -$(RM) ../jpeg/*.o
+       -$(RM) ../jpeg/*.bak
+       -$(RM) ../tiff/*.o
+       -$(RM) ../tiff/*.bak

 
 cleanall: clean
 
 cleanall: clean

+       -$(RM) $(WXLIB)
+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(TIFFLIB)
+
+ifdef WXMAKINGDLL
+       -$(RM) $(WXDLL)
+       -$(RM) $(WXDEF)
+ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
+       -$(RM) wx.base
+       -$(RM) wx.exp
+endif
+endif