]> git.saurik.com Git - wxWidgets.git/blobdiff - distrib/msw/tmake/g95.t
Added RTLD_GLOBAL to dlopen() flags which is needed if libraries depend
[wxWidgets.git] / distrib / msw / tmake / g95.t
index 888e742eb657e4cf1b270186b9b2931fefa90a73..d830757770dcc53dba9c50066d60380973f400e2 100644 (file)
@@ -2,11 +2,10 @@
 #! File:    g95.t
 #! Purpose: tmake template file from which makefile.g95 is generated by running
 #!          tmake -t g95 wxwin.pro -o makefile.g95
-#! Author:  Vadim Zeitlin
+#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
 #! Created: 14.07.99
 #! Version: $Id$
 #!#############################################################################
-
 #${
     #! include the code which parses filelist.txt file and initializes
     #! %wxCommon, %wxGeneric and %wxMSW hashes.
     foreach $file (sort keys %wxGeneric) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         #! so take the generic version
-        if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
-            next unless $file =~ /^dirdlgg\./;
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
+            next #! unless $file =~ /^dirdlgg\./;
         }
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXGENERICOBJS"} .= '$(GENDIR)\\' . $file . " "
+        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
     }
 
     foreach $file (sort keys %wxCommon) {
-        #! socket files don't compile under Win16 currently
-        next if $wxCommon{$file} =~ /\b(32|S)\b/;
+        next if $wxCommon{$file} =~ /\b(16)\b/;
 
         #! needs extra files (sql*.h) so not compiled by default.
-        next if $file =~ /^odbc\./;
+        #! next if $file =~ /^odbc\./;
 
-        $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
+        if ( $file =~ /^odbc\./ )
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"ADVANCEDOBJS"} .= '$(COMMDIR)/' . $file . " "
+        }
+        else
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+        }
     }
 
     foreach $file (sort keys %wxMSW) {
+        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
+        next if $file =~ /^dirdlg\./;
+
+        next if $wxMSW{$file} =~ /\b(16)\b/;
+
         #! Mingw32 doesn't have the OLE headers and has some troubles with
-        #! socket code
-        next if $wxMSW{$file} =~ /\b(O|S|16)\b/;
+        #! socket code, so put in  ADVANCEDOBJS
+        if ( $wxMSW{$file} =~ /\b(O)\b/ )
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"ADVANCEDOBJS"} .= '$(MSWDIR)/ole/' . $file . " "
+        }
+        else
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"WXMSWOBJS"} .= '$(MSWDIR)/' . $file . " "
+        }
+
+    }
 
+    foreach $file (sort keys %wxHTML) {
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXMSWOBJS"} .= $file . " "
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
     }
-#$}
 
+#$}
 # This file was automatically generated by tmake at #$ Now()
 # 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)
+# 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/libxpm.a $(WXDIR)/lib/libtiff.a
+DLL_LDFLAGS = -L$(WXDIR)/lib
+DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+             -luuid -lrpcrt4 -lodbc32 -lwinmm \
+             -lwsock32 $(DLL_EXTRA_LIBS) \
+                 -lstdc++
+endif
 
 # Subordinate library possibilities
 
 EXTRAOBJS=
 
-GENDIR=../generic
-COMMDIR=../common
-XPMDIR=../xpm
-OLEDIR=ole
-MSWDIR=.
-
-DOCDIR = $(WXDIR)\docs
-
-GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
-
-COMMONOBJS = \
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+ZLIBDIR = $(WXDIR)/src/zlib
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+XPMDIR  = $(WXDIR)/src/xpm
+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
+XPMLIB  = $(WXDIR)/lib/libxpm.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 = \
+                #$ ExpandList("WXGENERICOBJS");
+
+COMMONOBJS  = \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
                #$ ExpandList("WXCOMMONOBJS");
 
-MSWOBJS = #$ ExpandList("WXMSWOBJS");
-
-XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
+HTMLOBJS = \
+                #$ ExpandList("WXHTMLOBJS");
+
+MSWOBJS     = \
+               #$ ExpandList("WXMSWOBJS");
+
+ADVANCEDOBJS     = \
+               #$ ExpandList("ADVANCEDOBJS");
+
+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)
+
+XPMOBJS =    $(XPMDIR)/attrib.o\
+               $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/crdatfri.o\
-               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.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)/image.o\
+               $(XPMDIR)/info.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
+               $(XPMDIR)/rgb.o\
+               $(XPMDIR)/scan.o\
+               $(XPMDIR)/simx.o\
+               $(XPMDIR)/wrffrdat.o\
+               $(XPMDIR)/wrffri.o
+
+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) $(XPMLIB) $(TIFFLIB)
+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+endif
+
+ifndef WXMAKINGDLL
 
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)
+$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+       $(RANLIB) $@
 
-all:    $(OBJECTS) $(WXLIB)
+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) $@
 
-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)'
+$(PNGLIB): $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)
+       $(RANLIB) $@
 
+$(JPEGLIB): $(JPEGOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
+       $(RANLIB) $@
 
-$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
-       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+$(XPMLIB): $(XPMOBJS)
+       $(AR) $(AROPTIONS) $@ $(XPMOBJS)
+       $(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
-       $(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.
-$(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
-
+#
 #      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.
-
-$(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.
-
+#
 # $(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:
-       rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a 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) ../xpm/*.o
+       -$(RM) ../xpm/*.bak
+       -$(RM) ../tiff/*.o
+       -$(RM) ../tiff/*.bak
+       -$(RM) $(WXLIB)
+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(XPMLIB)
+       -$(RM) $(TIFFLIB)
+
+ifdef WXMAKINGDLL
+       -$(RM) $(WXDLL)
+       -$(RM) $(WXDEF)
+ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
+       -$(RM) wx.base
+       -$(RM) wx.exp
+endif
+endif
+
 
 cleanall: clean
 
+