]> git.saurik.com Git - wxWidgets.git/commitdiff
Removed old Ming95 makefiles
authorJulian Smart <julian@anthemion.co.uk>
Tue, 15 Feb 2000 11:25:18 +0000 (11:25 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Tue, 15 Feb 2000 11:25:18 +0000 (11:25 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/zipdist.bat
src/makeg295.env [deleted file]
src/makeg95.env
src/msw/makefile.g295 [deleted file]

index 48878c01767ce252169160d553f5ddd0ac9454d7..27c2c22cf631e3a7af1d912fd870900ccd742f67 100755 (executable)
@@ -115,7 +115,9 @@ unzip32 -o ..\tiff.zip
 unzip32 -o ..\tex2rtf2.zip
 
 rem Now delete a few files that are unnecessary
-erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh
+attrib -R *
+erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms
+erase /Y setup.h.in setup.h_vms
 erase /SY Makefile.in
 rem erase /Y docs\pdf\ogl.pdf
 rem deltree /Y docs\html\ogl
@@ -131,7 +133,7 @@ rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
 echo Calling 'makewise' to generate wxwin2.wse...
 call %WXWIN\distrib\msw\makewise.bat
 
-erase /Y *setup.*
+erase /Y %dest\setup.*
 
 rem Now invoke WISE install on the new wxwin2.wse
 set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
@@ -160,6 +162,9 @@ ren s setup.w05
 ren setup.w06 s
 ren s setup.w06
 
+ren setup.w07 s
+ren s setup.w07
+
 rem Put all the setup files into a single zip archive.
 zip32 wx%version%_setup.zip readme.txt setup.*
 
diff --git a/src/makeg295.env b/src/makeg295.env
deleted file mode 100644 (file)
index f230f28..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-# makeg95.env
-# Common makefile settings for wxWindows programs
-# This file is included by all the other makefiles, thus changes 
-# made here take effect everywhere (except where overriden).
-#
-# An alternative to editing this file is to create a shell script
-# to export specific variables, and call make with the -e switch
-# to override makefile variables. See wx/install/install.txt.
-# And you can override specific variables on the make command line, e.g.
-#
-# make -f makefile.unix WXDEBUG=''
-#
-# You may prefer to use the GNU configure script than raw makefiles -
-# see contrib/wxshlib.
-#
-
-########################## Compiler ##################################
-
-# C++ compiler
-# For AIX/CSet++: use CC = xlC
-# For IRIX: use CC = CC
-# CC = gcc-2.6.2
-CC = gcc --pipe -fvtable-thunks
-
-# C compiler for pure C programs
-# Typical: CC=g++ , CCC=gcc
-#          CC=cl386 /Tp, CCC=cl386
-#
-# (Used only for XView, file sb_scrol.c)
-#
-CCC = $(CC)
-
-# Compiler used for LEX generated C
-CCLEX=gcc
-
-MAKE=make
-
-# LEX
-LEX=flex # -t -L
-
-# YACC. yacc or bison
-YACC=byacc
-#YACC=bison
-
-# Settings for Cyginw/Mingw32
-RESCOMP=windres.exe
-RCINPUTSWITCH=-i
-RCOUTPUTSWITCH=-o
-RCINCSWITCH=--include-dir
-RCDEFSWITCH=--define
-
-RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
-
-########################## Compiler flags #############################
-
-# Miscellaneous compiler options
-# GRG: The __EGCS__ symbol is not needed anymore!
-OPTIONS= -DSTRICT # -D__EGCS__
-
-
-# Debugging information
-# AIX: comment out.
-# IRIX: -g3
-DEBUGFLAGS = -D__WXDEBUG__
-
-WIN95=1
-
-ifeq ($(WIN95),0)
-# With 3.50, Win95 will use your existing icons to show smaller ones.
-# With 4.0, you'll have to follow Win95 procedures for icons or you'll get the
-# default Windows icon.
-APPVER=3.50
-WINVERSION=-DWINVER=0x0350 -D__GNUWIN32__ -D__WIN32__ # Generic WIN32
-else
-APPVER=3.50 # 4.0
-# This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
-WINVERSION=-DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__
-endif
-
-CPU=i386
-
-# Suffixes
-OBJSUFF=o
-SRCSUFF=cpp
-LIBPREFIX=lib
-LIBSUFF=a
-EXESUFF=.exe
-RESSUFF=res
-RSCSUFF=rsc
-
-# Warnings
-WARN = -Wall
-
-# Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
-GUI = -D__WXMSW__ -D__WINDOWS__
-
-# according to Guillermo Rodriguez Garcia <guille@iies.es> this flag is
-# needed to make the standard div() function work - otherwise it returns
-# absolutely incorrect results and completely breaks the wxImage class
-# (where it's used extensively)
-# GRG: at least it is needed in mingw32-gcc2.8.1
-OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
-
-# Options for ar archiver
-# AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
-AROPTIONS = ruv
-RANLIB = ranlib
-
-# Compiler libraries: defaults to GCC libraries
-#COMPLIBS=-lg++
-#for win95
-#COMPLIBS=-lgcc
-
-# Compiler or system-specific include paths
-COMPPATHS=
-
-########################## Directories ###############################
-
-
-WINLIBS=-lstdc++ -lgcc \
-       -lwinspool -lwinmm -lshell32 \
-       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
-       -lole32 -loleaut32 -luuid \
-       -lodbc32 -lwsock32#  -loldnames
-
-# Shouldn't need to change these...
-WXSRC=$(WXDIR)/src/msw
-WXINC=$(WXDIR)/include
-WXBASESRC=$(WXDIR)/src/common
-WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
-RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
-
-#LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
-LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
-
-WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
-
-#for windows 95
-XINCLUDE=$(WINFLAGS)
-XLIB=$(LIBS)
-LDLIBS = $(LIBS)
-
-# Directory for object files (don't change)
-# OBJDIR = objects$(GUISUFFIX)
-OBJDIR = .
-
-# You shouldn't need to change these...
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS)
-WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
-LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
-
-.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
-
-# Set these in a batch file instead e.g. install/cygnus.bat
-#      RCINCLUDE="$(WXDIR)/include/msw;$(WXDIR)/contrib/fafa;$(WXDIR)/contrib/itsybits"; \
-#      CPLUS_INCLUDE_PATH=/usr/H-i386-cygwin32/i386-cygwin32/include:/usr/H-i386-cygwin32/lib/gcc-lib/i386-cygwin32/cygnus-2.7.2-961023/include:$(WXDIR)/include/common:$(WXDIR)/include/msw:$(WXDIR)/contrib/fafa:$(WXDIR)/contrib/itsybits; \
-#      export CPLUS_INCLUDE_PATH RCINCLUDE;  \
-
-#.rc.$(RESSUFF):  $< $(WXDIR)/include/msw/wx.rc
-#      $(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS)
-
-#.$(RESSUFF).$(RSCSUFF): $<
-#      $(CVTRES) $< $*.$(RSCSUFF)
-
-.$(SRCSUFF).$(OBJSUFF):
-       $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
-
-.c.o:
-       $(CC) -c $(CPPFLAGS) -o $@ $*.c
-
-
index b39b7c1c9da0b1318fa675b5a2ae20a242212912..26fff919289cc0118108bf1e380c0461871bbc66 100644 (file)
@@ -10,7 +10,7 @@
 
 # If using Cygwin, set this to 0.
 # If using Mingw32, set this to 1.
-MINGW32=0
+MINGW32=1
 
 # Set to the version you have
 MINGW32VERSION=2.95
diff --git a/src/msw/makefile.g295 b/src/msw/makefile.g295
deleted file mode 100644 (file)
index b397b5e..0000000
+++ /dev/null
@@ -1,426 +0,0 @@
-
-# This file was automatically generated by tmake at 15:31, 1999/10/14
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G295.T!
-
-#
-# File:     makefile.g295
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
-# Created:  1993
-# 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 compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/makeg95.env
-
-# Subordinate library possibilities
-
-EXTRAOBJS=
-
-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) \
-               $(GENDIR)/choicdgg.$(OBJSUFF) \
-               $(GENDIR)/grid.$(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)/scrolwin.$(OBJSUFF) \
-               $(GENDIR)/splitter.$(OBJSUFF) \
-               $(GENDIR)/statusbr.$(OBJSUFF) \
-               $(GENDIR)/tabg.$(OBJSUFF) \
-               $(GENDIR)/textdlgg.$(OBJSUFF) \
-               $(GENDIR)/tipdlg.$(OBJSUFF) \
-               $(GENDIR)/wizard.$(OBJSUFF)
-
-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) \
-               $(COMMDIR)/dbtable.$(OBJSUFF) \
-               $(COMMDIR)/dcbase.$(OBJSUFF) \
-               $(COMMDIR)/dlgcmn.$(OBJSUFF) \
-               $(COMMDIR)/docmdi.$(OBJSUFF) \
-               $(COMMDIR)/docview.$(OBJSUFF) \
-               $(COMMDIR)/dynarray.$(OBJSUFF) \
-               $(COMMDIR)/dynlib.$(OBJSUFF) \
-               $(COMMDIR)/event.$(OBJSUFF) \
-               $(COMMDIR)/extended.$(OBJSUFF) \
-               $(COMMDIR)/ffile.$(OBJSUFF) \
-               $(COMMDIR)/file.$(OBJSUFF) \
-               $(COMMDIR)/fileconf.$(OBJSUFF) \
-               $(COMMDIR)/filefn.$(OBJSUFF) \
-               $(COMMDIR)/filesys.$(OBJSUFF) \
-               $(COMMDIR)/fontcmn.$(OBJSUFF) \
-               $(COMMDIR)/framecmn.$(OBJSUFF) \
-               $(COMMDIR)/fs_inet.$(OBJSUFF) \
-               $(COMMDIR)/fs_zip.$(OBJSUFF) \
-               $(COMMDIR)/ftp.$(OBJSUFF) \
-               $(COMMDIR)/gdicmn.$(OBJSUFF) \
-               $(COMMDIR)/gifdecod.$(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)/imagpcx.$(OBJSUFF) \
-               $(COMMDIR)/imagpng.$(OBJSUFF) \
-               $(COMMDIR)/imagpnm.$(OBJSUFF) \
-               $(COMMDIR)/init.$(OBJSUFF) \
-               $(COMMDIR)/intl.$(OBJSUFF) \
-               $(COMMDIR)/ipcbase.$(OBJSUFF) \
-               $(COMMDIR)/layout.$(OBJSUFF) \
-               $(COMMDIR)/list.$(OBJSUFF) \
-               $(COMMDIR)/log.$(OBJSUFF) \
-               $(COMMDIR)/memory.$(OBJSUFF) \
-               $(COMMDIR)/mimetype.$(OBJSUFF) \
-               $(COMMDIR)/module.$(OBJSUFF) \
-               $(COMMDIR)/mstream.$(OBJSUFF) \
-               $(COMMDIR)/object.$(OBJSUFF) \
-               $(COMMDIR)/objstrm.$(OBJSUFF) \
-               $(COMMDIR)/odbc.$(OBJSUFF) \
-               $(COMMDIR)/paper.$(OBJSUFF) \
-               $(COMMDIR)/prntbase.$(OBJSUFF) \
-               $(COMMDIR)/process.$(OBJSUFF) \
-               $(COMMDIR)/protocol.$(OBJSUFF) \
-               $(COMMDIR)/resource.$(OBJSUFF) \
-               $(COMMDIR)/sckaddr.$(OBJSUFF) \
-               $(COMMDIR)/sckfile.$(OBJSUFF) \
-               $(COMMDIR)/sckipc.$(OBJSUFF) \
-               $(COMMDIR)/sckstrm.$(OBJSUFF) \
-               $(COMMDIR)/serbase.$(OBJSUFF) \
-               $(COMMDIR)/sizer.$(OBJSUFF) \
-               $(COMMDIR)/socket.$(OBJSUFF) \
-               $(COMMDIR)/strconv.$(OBJSUFF) \
-               $(COMMDIR)/stream.$(OBJSUFF) \
-               $(COMMDIR)/string.$(OBJSUFF) \
-               $(COMMDIR)/tbarbase.$(OBJSUFF) \
-               $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
-               $(COMMDIR)/textcmn.$(OBJSUFF) \
-               $(COMMDIR)/textfile.$(OBJSUFF) \
-               $(COMMDIR)/time.$(OBJSUFF) \
-               $(COMMDIR)/timercmn.$(OBJSUFF) \
-               $(COMMDIR)/tokenzr.$(OBJSUFF) \
-               $(COMMDIR)/txtstrm.$(OBJSUFF) \
-               $(COMMDIR)/unzip.$(OBJSUFF) \
-               $(COMMDIR)/url.$(OBJSUFF) \
-               $(COMMDIR)/utilscmn.$(OBJSUFF) \
-               $(COMMDIR)/valgen.$(OBJSUFF) \
-               $(COMMDIR)/validate.$(OBJSUFF) \
-               $(COMMDIR)/valtext.$(OBJSUFF) \
-               $(COMMDIR)/variant.$(OBJSUFF) \
-               $(COMMDIR)/wfstream.$(OBJSUFF) \
-               $(COMMDIR)/wincmn.$(OBJSUFF) \
-               $(COMMDIR)/wxchar.$(OBJSUFF) \
-               $(COMMDIR)/wxexpr.$(OBJSUFF) \
-               $(COMMDIR)/zipstrm.$(OBJSUFF) \
-               $(COMMDIR)/zstream.$(OBJSUFF)
-
-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)/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_pre.$(OBJSUFF) \
-               $(HTMLDIR)/m_tables.$(OBJSUFF) \
-               $(HTMLDIR)/search.$(OBJSUFF) \
-               $(HTMLDIR)/winpars.$(OBJSUFF)
-
-MSWOBJS     = \
-               $(MSWDIR)/accel.$(OBJSUFF) \
-               $(MSWDIR)/app.$(OBJSUFF) \
-               $(MSWDIR)/ole/automtn.$(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)/ole/dataobj.$(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)/dirdlg.$(OBJSUFF) \
-               $(MSWDIR)/dragimag.$(OBJSUFF) \
-               $(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
-               $(MSWDIR)/ole/droptgt.$(OBJSUFF) \
-               $(MSWDIR)/filedlg.$(OBJSUFF) \
-               $(MSWDIR)/font.$(OBJSUFF) \
-               $(MSWDIR)/fontdlg.$(OBJSUFF) \
-               $(MSWDIR)/frame.$(OBJSUFF) \
-               $(MSWDIR)/gauge95.$(OBJSUFF) \
-               $(MSWDIR)/gdiobj.$(OBJSUFF) \
-               $(MSWDIR)/gsocket.$(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)/ole/oleutils.$(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)/ole/uuid.$(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\
-               $(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) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
-
-all:    $(OBJECTS) $(WXLIB)
-
-$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
-       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
-       $(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) -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
-#
-# 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
-#
-# 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
-
-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 ..\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