X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a23cbcede2d878401c64df3be34bef6331e1dcd..1e7fd311087384fb80f17a124d673aeb6a8fa9b8:/src/msw/makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index a133fe6a95..6b006ef58c 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,11 +1,16 @@
+
+
+# This file was automatically generated by tmake at 17:20, 1999/07/21
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
+
 #
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# File:     makefile.unx
+# Author:   Julian Smart
+# Created:  1993
+# Updated:
+# Copyright:(c) 1993, AIAI, University of Edinburgh
 #
-# "@(#)makefile.unx	1.2 5/9/94"
+# "@(#)makefile.unx 1.2 5/9/94"
 #
 # Makefile for libwx.a
 
@@ -29,8 +34,6 @@ include $(WXDIR)/src/makeg95.env
 #               USE_GAUGE should be 1
 #   xpm:      XPM pixmap support
 #               USE_XPM_IN_X should be 1
-#   image:    GIF, BMP image reading
-#               USE_IMAGE_LOADING_IN_X should be 1
 #   wxstring: string class
 #               USE_GNU_WXSTRING should be 1
 #
@@ -49,162 +52,208 @@ EXTRAOBJS=
 
 GENDIR=../generic
 COMMDIR=../common
+XPMDIR=../xpm
 OLEDIR=ole
 MSWDIR=.
 
-GENERICOBJDIR=../generic/$(OBJDIR)
-COMMOBJDIR=../common/$(OBJDIR)
-OLEOBJDIR=ole/$(OBJDIR)
-MSWDIR=$(OBJDIR)
-
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= \
-  $(GENDIR)/choicdgg.$(OBJSUFF) \
-  $(GENDIR)/colrdlgg.$(OBJSUFF) \
-  $(GENDIR)/fontdlgg.$(OBJSUFF) \
-  $(GENDIR)/gridg.$(OBJSUFF) \
-  $(GENDIR)/helpxlp.$(OBJSUFF) \
-  $(GENDIR)/msgdlgg.$(OBJSUFF) \
-  $(GENDIR)/panelg.$(OBJSUFF) \
-  $(GENDIR)/printps.$(OBJSUFF) \
-  $(GENDIR)/prntdlgg.$(OBJSUFF) \
-  $(GENDIR)/scrolwin.$(OBJSUFF) \
-  $(GENDIR)/splitter.$(OBJSUFF) \
-  $(GENDIR)/statusbr.$(OBJSUFF) \
-  $(GENDIR)/tabg.$(OBJSUFF) \
-  $(GENDIR)/textdlgg.$(OBJSUFF)
+GENERICOBJS= $(GENDIR)/busyinfo.$(OBJSUFF) \
+		$(GENDIR)/choicdgg.$(OBJSUFF) \
+		$(GENDIR)/dirdlgg.$(OBJSUFF) \
+		$(GENDIR)/extdlgg.$(OBJSUFF) \
+		$(GENDIR)/gridg.$(OBJSUFF) \
+		$(GENDIR)/laywin.$(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)
 
 COMMONOBJS = \
-  $(COMMDIR)/config.$(OBJSUFF) \
-  $(COMMDIR)/cmndata.$(OBJSUFF) \
-  $(COMMDIR)/docview.$(OBJSUFF) \
-  $(COMMDIR)/dynarray.$(OBJSUFF) \
-  $(COMMDIR)/event.$(OBJSUFF) \
-  $(COMMDIR)/file.$(OBJSUFF) \
-  $(COMMDIR)/fileconf.$(OBJSUFF) \
-  $(COMMDIR)/filefn.$(OBJSUFF) \
-  $(COMMDIR)/gdicmn.$(OBJSUFF) \
-  $(COMMDIR)/helpbase.$(OBJSUFF) \
-  $(COMMDIR)/intl.$(OBJSUFF) \
-  $(COMMDIR)/layout.$(OBJSUFF) \
-  $(COMMDIR)/log.$(OBJSUFF) \
-  $(COMMDIR)/memory.$(OBJSUFF) \
-  $(COMMDIR)/module.$(OBJSUFF) \
-  $(COMMDIR)/object.$(OBJSUFF) \
-  $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/postscrp.$(OBJSUFF) \
-  $(COMMDIR)/process.$(OBJSUFF) \
-  $(COMMDIR)/prntbase.$(OBJSUFF) \
-  $(COMMDIR)/resource.$(OBJSUFF) \
-  $(COMMDIR)/tbarbase.$(OBJSUFF) \
-  $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
-  $(COMMDIR)/textfile.$(OBJSUFF) \
-  $(COMMDIR)/timercmn.$(OBJSUFF) \
-  $(COMMDIR)/utilscmn.$(OBJSUFF) \
-  $(COMMDIR)/validate.$(OBJSUFF) \
-  $(COMMDIR)/valtext.$(OBJSUFF) \
-  $(COMMDIR)/date.$(OBJSUFF) \
-  $(COMMDIR)/wxexpr.$(OBJSUFF) \
-  $(COMMDIR)/hash.$(OBJSUFF) \
-  $(COMMDIR)/list.$(OBJSUFF) \
-  $(COMMDIR)/string.$(OBJSUFF) \
-  $(COMMDIR)/time.$(OBJSUFF) \
-  $(COMMDIR)/y_tab.$(OBJSUFF) \
-  $(COMMDIR)/stream.$(OBJSUFF) \
-  $(COMMDIR)/fstream.$(OBJSUFF) \
-  $(COMMDIR)/mstream.$(OBJSUFF) \
-  $(COMMDIR)/zstream.$(OBJSUFF) \
-  $(COMMDIR)/datstrm.$(OBJSUFF) \
-  $(COMMDIR)/extended.$(OBJSUFF)
-
-MSWOBJS = \
-  app.$(OBJSUFF) \
-  bitmap.$(OBJSUFF) \
-  bmpbuttn.$(OBJSUFF) \
-  brush.$(OBJSUFF) \
-  button.$(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) \
-  dcmemory.$(OBJSUFF) \
-  dcclient.$(OBJSUFF) \
-  dcprint.$(OBJSUFF) \
-  dcscreen.$(OBJSUFF) \
-  dde.$(OBJSUFF) \
-  dialog.$(OBJSUFF) \
-  dib.$(OBJSUFF) \
-  dirdlg.$(OBJSUFF) \
-  filedlg.$(OBJSUFF) \
-  font.$(OBJSUFF) \
-  fontdlg.$(OBJSUFF) \
-  frame.$(OBJSUFF) \
-  gaugemsw.$(OBJSUFF) \
-  gauge95.$(OBJSUFF) \
-  gdiobj.$(OBJSUFF) \
-  helpwin.$(OBJSUFF) \
-  icon.$(OBJSUFF) \
-  imaglist.$(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) \
-  printdlg.$(OBJSUFF) \
-  printwin.$(OBJSUFF) \
-  radiobox.$(OBJSUFF) \
-  radiobut.$(OBJSUFF) \
-  region.$(OBJSUFF) \
-  registry.$(OBJSUFF) \
-  regconf.$(OBJSUFF) \
-  scrolbar.$(OBJSUFF) \
-  settings.$(OBJSUFF) \
-  slidrmsw.$(OBJSUFF) \
-  slider95.$(OBJSUFF) \
-  spinbutt.$(OBJSUFF) \
-  statbmp.$(OBJSUFF) \
-  statbox.$(OBJSUFF) \
-  statbr95.$(OBJSUFF) \
-  stattext.$(OBJSUFF) \
-  tabctrl.$(OBJSUFF) \
-  taskbar.$(OBJSUFF) \
-  tbar95.$(OBJSUFF) \
-  tbarmsw.$(OBJSUFF) \
-  textctrl.$(OBJSUFF) \
-  thread.$(OBJSUFF) \
-  timer.$(OBJSUFF) \
-  treectrl.$(OBJSUFF) \
-  utils.$(OBJSUFF) \
-  utilsexc.$(OBJSUFF) \
-  wave.$(OBJSUFF) \
-  window.$(OBJSUFF) \
-  $(OLEDIR)/droptgt.$(OBJSUFF) \
-  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-  $(OLEDIR)/dataobj.$(OBJSUFF) \
-  $(OLEDIR)/oleutils.$(OBJSUFF) \
-  $(OLEDIR)/uuid.$(OBJSUFF)
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
+		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		$(COMMDIR)/cmndata.$(OBJSUFF) \
+		$(COMMDIR)/config.$(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)/framecmn.$(OBJSUFF) \
+		$(COMMDIR)/fs_inet.$(OBJSUFF) \
+		$(COMMDIR)/fs_zip.$(OBJSUFF) \
+		$(COMMDIR)/ftp.$(OBJSUFF) \
+		$(COMMDIR)/gdicmn.$(OBJSUFF) \
+		$(COMMDIR)/hash.$(OBJSUFF) \
+		$(COMMDIR)/helpbase.$(OBJSUFF) \
+		$(COMMDIR)/http.$(OBJSUFF) \
+		$(COMMDIR)/imagbmp.$(OBJSUFF) \
+		$(COMMDIR)/image.$(OBJSUFF) \
+		$(COMMDIR)/imaggif.$(OBJSUFF) \
+		$(COMMDIR)/imagjpeg.$(OBJSUFF) \
+		$(COMMDIR)/imagpng.$(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)/paper.$(OBJSUFF) \
+		$(COMMDIR)/prntbase.$(OBJSUFF) \
+		$(COMMDIR)/process.$(OBJSUFF) \
+		$(COMMDIR)/protocol.$(OBJSUFF) \
+		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/sckaddr.$(OBJSUFF) \
+		$(COMMDIR)/sckfile.$(OBJSUFF) \
+		$(COMMDIR)/sckint.$(OBJSUFF) \
+		$(COMMDIR)/sckipc.$(OBJSUFF) \
+		$(COMMDIR)/sckstrm.$(OBJSUFF) \
+		$(COMMDIR)/socket.$(OBJSUFF) \
+		$(COMMDIR)/stream.$(OBJSUFF) \
+		$(COMMDIR)/string.$(OBJSUFF) \
+		$(COMMDIR)/tbarbase.$(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)/zipstream.$(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)
 
@@ -217,80 +266,48 @@ $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
 	$(RANLIB) $@
 
-#$(MSWOBJDIR):
-#	mkdir $(OBJDIR)
-
-#$(COMMOBJDIR):
-#	mkdir $(COMMDIR)/$(OBJDIR)
-
-#$(GENERICOBJDIR):
-#	mkdir $(GENDIR)/$(OBJDIR)
-
 $(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) $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
-
+# $(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
-prologio:
-	cd $(WXDIR)/utils/prologio/src ; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_proio:
-	cd $(WXDIR)/utils/prologio/src; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-makedib:
-	cd $(WXDIR)/src/msw/dib ; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_dib:
-	cd $(WXDIR)/src/msw/dib; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-gauge:
-	cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_gauge:
-	cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-wxstring:
-	cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)"
-	cd $(WXDIR)/src/msw
-
-clean_wxstring:
-	cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-itsy:
-	cd $(WXDIR)/src/msw/itsybits; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_itsy:
-	cd $(WXDIR)/contrib/itsybits; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
 rcparser:
 	cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
 	cd $(WXDIR)/src/msw
@@ -299,16 +316,14 @@ clean_rcp:
 	cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
 	cd $(WXDIR)/src/msw
 
-# +++start steve161(09.04.1995): added for wxString in \contrib\wxstring
-wxstring_ol:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx xview
-wxstring_motif:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx motif
-wxstring_hp:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx hp
-
 clean:
-	rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core
+	-erase *.o
+	-erase core
+	-erase ..\common\y_tab.c
+	-erase ..\common\lex_yy.c
+	-erase ..\common\*.o
+	-erase ..\generic\*.o
+	-erase ..\..\lib\libwx$(GUISUFFIX).a
 
 cleanall: clean