From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 7 Feb 2002 14:51:23 +0000 (+0000)
Subject: Fixes for X11 builds
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/45ce82f3204b85e445146354a1a89ac405cc8ccb

Fixes for X11 builds


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t
index 15f8c340b0..ee2b8b196e 100644
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -48,7 +48,6 @@
         $fileflags =~ s/Socket/S/;
         $fileflags =~ s/NotMSW/U/;
         $fileflags =~ s/NotGTK/R/;
-        $fileflags =~ s/NotX11/X11/;
         $fileflags =~ s/NotX/X/;
         $fileflags =~ s/NotOS2/P/;
         $fileflags =~ s/LowLevel/L/;
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index cf4c9f9942..4b6e9dd995 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -95,7 +95,7 @@ notebook.cpp	Generic	NotWin32,NotGTK,NotOS2,NotMGL,NotMac,NotMicro
 numdlgg.cpp	Generic
 paletteg.cpp	Generic	NotMSW,NotX,NotOS2,NotMGL,NotMac,NotMicro
 panelg.cpp	Generic
-printps.cpp	Generic	NotMSW
+printps.cpp	Generic	NotMSW,NotX11
 prntdlgg.cpp	Generic	NotMSW
 progdlgg.cpp	Generic
 prop.cpp	Generic
@@ -108,7 +108,7 @@ splash.cpp	Generic
 splitter.cpp	Generic
 statline.cpp	Generic	NotMSW,NotGTK,NotOS2,NotMGL,NotMac,NotMicro
 statusbr.cpp	Generic	NotMGL,NotMicro
-tabg.cpp	Generic	NotWin32,NotOS2
+tabg.cpp	Generic	NotWin32,NotOS2,NotX11
 tbarsmpl.cpp	Generic
 textdlgg.cpp	Generic
 tipdlg.cpp	Generic
diff --git a/distrib/msw/tmake/x11.t b/distrib/msw/tmake/x11.t
index 0e4bcfa2f4..35fbba7e61 100644
--- a/distrib/msw/tmake/x11.t
+++ b/distrib/msw/tmake/x11.t
@@ -16,7 +16,7 @@
     $project{"COMMONOBJS"} .= "parser.o ";
 
     foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bX\b/;
+        next if $wxGeneric{$file} =~ /\bNotX11\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -25,7 +25,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bX\b/;
+        next if $wxCommon{$file} =~ /\bNotX11\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -36,7 +36,7 @@
     foreach $file (sort keys %wxX11) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
-        $project{"X11_SOURCES"} .= "x11f/" . $file . " ";
+        $project{"X11_SOURCES"} .= "x11/" . $file . " ";
         $project{"GUIOBJS"} .= $fileobj . " ";
     }
 
@@ -55,7 +55,7 @@
     }
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
-        next if $wxWXINCLUDE{$file} =~ /\bX\b/;
+        next if $wxWXINCLUDE{$file} =~ /\bNotX11\b/;
 
         $project{"X11_HEADERS"} .= $file . " "
     }
@@ -81,7 +81,7 @@
     }
 #$}
 # This file was automatically generated by tmake 
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE X11.T!
 ALL_SOURCES = \
 		#$ ExpandList("X11_SOURCES");
 
diff --git a/src/x11/files.lst b/src/x11/files.lst
new file mode 100644
index 0000000000..b4ebffb149
--- /dev/null
+++ b/src/x11/files.lst
@@ -0,0 +1,804 @@
+# This file was automatically generated by tmake 
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE X11.T!
+ALL_SOURCES = \
+		generic/accel.cpp \
+		generic/busyinfo.cpp \
+		generic/calctrl.cpp \
+		generic/caret.cpp \
+		generic/choicdgg.cpp \
+		generic/colrdlgg.cpp \
+		generic/dcpsg.cpp \
+		generic/dirctrlg.cpp \
+		generic/dirdlgg.cpp \
+		generic/dragimgg.cpp \
+		generic/fdrepdlg.cpp \
+		generic/filedlgg.cpp \
+		generic/fontdlgg.cpp \
+		generic/grid.cpp \
+		generic/gridctrl.cpp \
+		generic/gridsel.cpp \
+		generic/helpext.cpp \
+		generic/helphtml.cpp \
+		generic/helpwxht.cpp \
+		generic/imaglist.cpp \
+		generic/laywin.cpp \
+		generic/listctrl.cpp \
+		generic/logg.cpp \
+		generic/msgdlgg.cpp \
+		generic/notebook.cpp \
+		generic/numdlgg.cpp \
+		generic/paletteg.cpp \
+		generic/panelg.cpp \
+		generic/printps.cpp \
+		generic/prntdlgg.cpp \
+		generic/progdlgg.cpp \
+		generic/prop.cpp \
+		generic/propform.cpp \
+		generic/proplist.cpp \
+		generic/sashwin.cpp \
+		generic/scrlwing.cpp \
+		generic/spinctlg.cpp \
+		generic/splash.cpp \
+		generic/splitter.cpp \
+		generic/statline.cpp \
+		generic/statusbr.cpp \
+		generic/tabg.cpp \
+		generic/tbarsmpl.cpp \
+		generic/textdlgg.cpp \
+		generic/tipdlg.cpp \
+		generic/tipwin.cpp \
+		generic/treectlg.cpp \
+		generic/treelay.cpp \
+		generic/wizard.cpp \
+		common/appcmn.cpp \
+		common/bmpbase.cpp \
+		common/choiccmn.cpp \
+		common/clipcmn.cpp \
+		common/clntdata.cpp \
+		common/cmdline.cpp \
+		common/cmdproc.cpp \
+		common/cmndata.cpp \
+		common/config.cpp \
+		common/containr.cpp \
+		common/cshelp.cpp \
+		common/ctrlcmn.cpp \
+		common/ctrlsub.cpp \
+		common/datetime.cpp \
+		common/datstrm.cpp \
+		common/db.cpp \
+		common/dbgrid.cpp \
+		common/dbtable.cpp \
+		common/dcbase.cpp \
+		common/dircmn.cpp \
+		common/dlgcmn.cpp \
+		common/dndcmn.cpp \
+		common/dobjcmn.cpp \
+		common/docmdi.cpp \
+		common/docview.cpp \
+		common/dseldlg.cpp \
+		common/dynarray.cpp \
+		common/dynlib.cpp \
+		common/dynload.cpp \
+		common/effects.cpp \
+		common/encconv.cpp \
+		common/event.cpp \
+		common/extended.c \
+		common/fddlgcmn.cpp \
+		common/ffile.cpp \
+		common/file.cpp \
+		common/fileconf.cpp \
+		common/filefn.cpp \
+		common/filename.cpp \
+		common/filesys.cpp \
+		common/fontcmn.cpp \
+		common/fontmap.cpp \
+		common/framecmn.cpp \
+		common/fs_inet.cpp \
+		common/fs_mem.cpp \
+		common/fs_zip.cpp \
+		common/ftp.cpp \
+		common/gaugecmn.cpp \
+		common/gdicmn.cpp \
+		common/geometry.cpp \
+		common/gifdecod.cpp \
+		common/hash.cpp \
+		common/hashmap.cpp \
+		common/helpbase.cpp \
+		common/http.cpp \
+		common/imagall.cpp \
+		common/imagbmp.cpp \
+		common/image.cpp \
+		common/imaggif.cpp \
+		common/imagiff.cpp \
+		common/imagjpeg.cpp \
+		common/imagpcx.cpp \
+		common/imagpng.cpp \
+		common/imagpnm.cpp \
+		common/imagtiff.cpp \
+		common/imagxpm.cpp \
+		common/intl.cpp \
+		common/ipcbase.cpp \
+		common/layout.cpp \
+		common/lboxcmn.cpp \
+		common/list.cpp \
+		common/log.cpp \
+		common/longlong.cpp \
+		common/matrix.cpp \
+		common/memory.cpp \
+		common/menucmn.cpp \
+		common/mimecmn.cpp \
+		common/module.cpp \
+		common/mstream.cpp \
+		common/nbkbase.cpp \
+		common/object.cpp \
+		common/odbc.cpp \
+		common/paper.cpp \
+		common/popupcmn.cpp \
+		common/prntbase.cpp \
+		common/process.cpp \
+		common/protocol.cpp \
+		common/quantize.cpp \
+		common/radiocmn.cpp \
+		common/regex.cpp \
+		common/resource.cpp \
+		common/sckaddr.cpp \
+		common/sckfile.cpp \
+		common/sckipc.cpp \
+		common/sckstrm.cpp \
+		common/sizer.cpp \
+		common/socket.cpp \
+		common/statbar.cpp \
+		common/strconv.cpp \
+		common/stream.cpp \
+		common/string.cpp \
+		common/sysopt.cpp \
+		common/tbarbase.cpp \
+		common/textbuf.cpp \
+		common/textcmn.cpp \
+		common/textfile.cpp \
+		common/timercmn.cpp \
+		common/tokenzr.cpp \
+		common/toplvcmn.cpp \
+		common/treebase.cpp \
+		common/txtstrm.cpp \
+		common/unzip.c \
+		common/url.cpp \
+		common/utilscmn.cpp \
+		common/valgen.cpp \
+		common/validate.cpp \
+		common/valtext.cpp \
+		common/variant.cpp \
+		common/wfstream.cpp \
+		common/wincmn.cpp \
+		common/wxchar.cpp \
+		common/wxexpr.cpp \
+		common/xpmdecod.cpp \
+		common/zipstrm.cpp \
+		common/zstream.cpp \
+		x11/accel.cpp \
+		x11/app.cpp \
+		x11/bitmap.cpp \
+		x11/brush.cpp \
+		x11/clipbrd.cpp \
+		x11/colour.cpp \
+		x11/cursor.cpp \
+		x11/data.cpp \
+		x11/dataobj.cpp \
+		x11/dc.cpp \
+		x11/dcclient.cpp \
+		x11/dcmemory.cpp \
+		x11/dcscreen.cpp \
+		x11/font.cpp \
+		x11/gdiobj.cpp \
+		x11/glcanvas.cpp \
+		x11/gsockx11.c \
+		x11/icon.cpp \
+		x11/joystick.cpp \
+		x11/main.cpp \
+		x11/minifram.cpp \
+		x11/palette.cpp \
+		x11/pen.cpp \
+		x11/region.cpp \
+		x11/settings.cpp \
+		x11/timer.cpp \
+		x11/toolbar.cpp \
+		x11/toplevel.cpp \
+		x11/utils.cpp \
+		x11/window.cpp \
+		unix/dialup.cpp \
+		unix/dir.cpp \
+		unix/fontenum.cpp \
+		unix/fontutil.cpp \
+		unix/gsocket.c \
+		unix/mimetype.cpp \
+		unix/snglinst.cpp \
+		unix/threadpsx.cpp \
+		unix/utilsunx.cpp \
+		html/helpctrl.cpp \
+		html/helpdata.cpp \
+		html/helpfrm.cpp \
+		html/htmlcell.cpp \
+		html/htmlfilt.cpp \
+		html/htmlpars.cpp \
+		html/htmltag.cpp \
+		html/htmlwin.cpp \
+		html/htmprint.cpp \
+		html/m_dflist.cpp \
+		html/m_fonts.cpp \
+		html/m_hline.cpp \
+		html/m_image.cpp \
+		html/m_layout.cpp \
+		html/m_links.cpp \
+		html/m_list.cpp \
+		html/m_meta.cpp \
+		html/m_pre.cpp \
+		html/m_style.cpp \
+		html/m_tables.cpp \
+		html/winpars.cpp
+
+ALL_HEADERS = \
+		accel.h \
+		app.h \
+		arrimpl.cpp \
+		bitmap.h \
+		bmpbuttn.h \
+		brush.h \
+		buffer.h \
+		busyinfo.h \
+		button.h \
+		calctrl.h \
+		caret.h \
+		checkbox.h \
+		checklst.h \
+		chkconf.h \
+		choicdlg.h \
+		choice.h \
+		clipbrd.h \
+		clntdata.h \
+		cmdline.h \
+		cmdproc.h \
+		cmndata.h \
+		colordlg.h \
+		colour.h \
+		combobox.h \
+		confbase.h \
+		config.h \
+		containr.h \
+		control.h \
+		cshelp.h \
+		ctrlsub.h \
+		cursor.h \
+		dataobj.h \
+		date.h \
+		datetime.h \
+		datetime.inl \
+		datstrm.h \
+		db.h \
+		dbgrid.h \
+		dbkeyg.h \
+		dbtable.h \
+		dc.h \
+		dcclient.h \
+		dcmemory.h \
+		dcprint.h \
+		dcps.h \
+		dcscreen.h \
+		dde.h \
+		debug.h \
+		defs.h \
+		dialog.h \
+		dialup.h \
+		dir.h \
+		dirctrl.h \
+		dirdlg.h \
+		dnd.h \
+		docmdi.h \
+		docview.h \
+		dragimag.h \
+		dynarray.h \
+		dynlib.h \
+		dynload.h \
+		encconv.h \
+		event.h \
+		expr.h \
+		fdrepdlg.h \
+		ffile.h \
+		file.h \
+		fileconf.h \
+		filedlg.h \
+		filefn.h \
+		filename.h \
+		filesys.h \
+		font.h \
+		fontdlg.h \
+		fontenc.h \
+		fontenum.h \
+		fontmap.h \
+		fontutil.h \
+		frame.h \
+		fs_inet.h \
+		fs_mem.h \
+		fs_zip.h \
+		gauge.h \
+		gdicmn.h \
+		gdiobj.h \
+		geometry.h \
+		gifdecod.h \
+		glcanvas.h \
+		grid.h \
+		gsocket.h \
+		hash.h \
+		hashmap.h \
+		help.h \
+		helpbase.h \
+		helphtml.h \
+		helpwin.h \
+		icon.h \
+		imagbmp.h \
+		image.h \
+		imaggif.h \
+		imagiff.h \
+		imagjpeg.h \
+		imaglist.h \
+		imagpcx.h \
+		imagpng.h \
+		imagpnm.h \
+		imagtiff.h \
+		imagxpm.h \
+		intl.h \
+		ioswrap.h \
+		ipcbase.h \
+		isql.h \
+		isqlext.h \
+		joystick.h \
+		layout.h \
+		laywin.h \
+		list.h \
+		listbox.h \
+		listctrl.h \
+		listimpl.cpp \
+		log.h \
+		longlong.h \
+		matrix.h \
+		mdi.h \
+		memconf.h \
+		memory.h \
+		memtext.h \
+		menu.h \
+		menuitem.h \
+		metafile.h \
+		mimetype.h \
+		minifram.h \
+		module.h \
+		msgdlg.h \
+		mstream.h \
+		notebook.h \
+		object.h \
+		odbc.h \
+		ownerdrw.h \
+		palette.h \
+		panel.h \
+		paper.h \
+		pen.h \
+		platform.h \
+		popupwin.h \
+		print.h \
+		printdlg.h \
+		prntbase.h \
+		process.h \
+		progdlg.h \
+		prop.h \
+		propform.h \
+		proplist.h \
+		radiobox.h \
+		radiobut.h \
+		regex.h \
+		region.h \
+		resource.h \
+		sashwin.h \
+		sckaddr.h \
+		sckipc.h \
+		sckstrm.h \
+		scrolbar.h \
+		scrolwin.h \
+		settings.h \
+		sizer.h \
+		slider.h \
+		snglinst.h \
+		socket.h \
+		spinbutt.h \
+		spinctrl.h \
+		splash.h \
+		splitter.h \
+		stack.h \
+		statbmp.h \
+		statbox.h \
+		statline.h \
+		stattext.h \
+		statusbr.h \
+		strconv.h \
+		stream.h \
+		string.h \
+		sysopt.h \
+		tab.h \
+		tabctrl.h \
+		taskbar.h \
+		tbarbase.h \
+		tbarsmpl.h \
+		textbuf.h \
+		textctrl.h \
+		textdlg.h \
+		textfile.h \
+		tglbtn.h \
+		thread.h \
+		time.h \
+		timer.h \
+		tipdlg.h \
+		tipwin.h \
+		tokenzr.h \
+		toolbar.h \
+		tooltip.h \
+		toplevel.h \
+		treebase.h \
+		treectrl.h \
+		txtstrm.h \
+		types.h \
+		url.h \
+		utils.h \
+		valgen.h \
+		validate.h \
+		valtext.h \
+		variant.h \
+		vector.h \
+		version.h \
+		wave.h \
+		wfstream.h \
+		window.h \
+		wizard.h \
+		wx.h \
+		wx_cw.h \
+		wx_cw_cm.h \
+		wx_cw_d.h \
+		wxchar.h \
+		wxexpr.h \
+		wxhtml.h \
+		wxprec.h \
+		xpmdecod.h \
+		zipstrm.h \
+		zstream.h \
+		x11/accel.h \
+		x11/app.h \
+		x11/bitmap.h \
+		x11/brush.h \
+		x11/clipbrd.h \
+		x11/colour.h \
+		x11/cursor.h \
+		x11/dataform.h \
+		x11/dataobj.h \
+		x11/dc.h \
+		x11/dcclient.h \
+		x11/dcmemory.h \
+		x11/dcprint.h \
+		x11/dcscreen.h \
+		x11/dnd.h \
+		x11/font.h \
+		x11/gdiobj.h \
+		x11/glcanvas.h \
+		x11/icon.h \
+		x11/joystick.h \
+		x11/minifram.h \
+		x11/palette.h \
+		x11/pen.h \
+		x11/print.h \
+		x11/private.h \
+		x11/region.h \
+		x11/settings.h \
+		x11/timer.h \
+		x11/toolbar.h \
+		x11/toplevel.h \
+		x11/window.h \
+		generic/accel.h \
+		generic/calctrl.h \
+		generic/caret.h \
+		generic/choicdgg.h \
+		generic/colrdlgg.h \
+		generic/dcpsg.h \
+		generic/dirctrlg.h \
+		generic/dirdlgg.h \
+		generic/dragimgg.h \
+		generic/fdrepdlg.h \
+		generic/filedlgg.h \
+		generic/fontdlgg.h \
+		generic/grid.h \
+		generic/gridctrl.h \
+		generic/gridg.h \
+		generic/helpext.h \
+		generic/helphtml.h \
+		generic/helpwxht.h \
+		generic/imaglist.h \
+		generic/laywin.h \
+		generic/listctrl.h \
+		generic/msgdlgg.h \
+		generic/notebook.h \
+		generic/paletteg.h \
+		generic/panelg.h \
+		generic/printps.h \
+		generic/prntdlgg.h \
+		generic/progdlgg.h \
+		generic/sashwin.h \
+		generic/scrolwin.h \
+		generic/spinctlg.h \
+		generic/splash.h \
+		generic/splitter.h \
+		generic/statusbr.h \
+		generic/tabg.h \
+		generic/textdlgg.h \
+		generic/treectlg.h \
+		generic/wizard.h \
+		unix/execute.h \
+		unix/fontutil.h \
+		unix/gsockunx.h \
+		unix/mimetype.h \
+		html/forcelnk.h \
+		html/helpctrl.h \
+		html/helpdata.h \
+		html/helpfrm.h \
+		html/htmlcell.h \
+		html/htmldefs.h \
+		html/htmlfilt.h \
+		html/htmlpars.h \
+		html/htmltag.h \
+		html/htmlwin.h \
+		html/htmprint.h \
+		html/m_templ.h \
+		html/winpars.h \
+		protocol/file.h \
+		protocol/ftp.h \
+		protocol/http.h \
+		protocol/protocol.h
+
+COMMONOBJS = \
+		parser.o \
+		appcmn.o \
+		bmpbase.o \
+		choiccmn.o \
+		clipcmn.o \
+		clntdata.o \
+		cmdline.o \
+		cmdproc.o \
+		cmndata.o \
+		config.o \
+		containr.o \
+		cshelp.o \
+		ctrlcmn.o \
+		ctrlsub.o \
+		datetime.o \
+		datstrm.o \
+		db.o \
+		dbgrid.o \
+		dbtable.o \
+		dcbase.o \
+		dircmn.o \
+		dlgcmn.o \
+		dndcmn.o \
+		dobjcmn.o \
+		docmdi.o \
+		docview.o \
+		dseldlg.o \
+		dynarray.o \
+		dynlib.o \
+		dynload.o \
+		effects.o \
+		encconv.o \
+		event.o \
+		extended.o \
+		fddlgcmn.o \
+		ffile.o \
+		file.o \
+		fileconf.o \
+		filefn.o \
+		filename.o \
+		filesys.o \
+		fontcmn.o \
+		fontmap.o \
+		framecmn.o \
+		fs_inet.o \
+		fs_mem.o \
+		fs_zip.o \
+		ftp.o \
+		gaugecmn.o \
+		gdicmn.o \
+		geometry.o \
+		gifdecod.o \
+		hash.o \
+		hashmap.o \
+		helpbase.o \
+		http.o \
+		imagall.o \
+		imagbmp.o \
+		image.o \
+		imaggif.o \
+		imagiff.o \
+		imagjpeg.o \
+		imagpcx.o \
+		imagpng.o \
+		imagpnm.o \
+		imagtiff.o \
+		imagxpm.o \
+		intl.o \
+		ipcbase.o \
+		layout.o \
+		lboxcmn.o \
+		list.o \
+		log.o \
+		longlong.o \
+		matrix.o \
+		memory.o \
+		menucmn.o \
+		mimecmn.o \
+		module.o \
+		mstream.o \
+		nbkbase.o \
+		object.o \
+		odbc.o \
+		paper.o \
+		popupcmn.o \
+		prntbase.o \
+		process.o \
+		protocol.o \
+		quantize.o \
+		radiocmn.o \
+		regex.o \
+		resource.o \
+		sckaddr.o \
+		sckfile.o \
+		sckipc.o \
+		sckstrm.o \
+		sizer.o \
+		socket.o \
+		statbar.o \
+		strconv.o \
+		stream.o \
+		string.o \
+		sysopt.o \
+		tbarbase.o \
+		textbuf.o \
+		textcmn.o \
+		textfile.o \
+		timercmn.o \
+		tokenzr.o \
+		toplvcmn.o \
+		treebase.o \
+		txtstrm.o \
+		unzip.o \
+		url.o \
+		utilscmn.o \
+		valgen.o \
+		validate.o \
+		valtext.o \
+		variant.o \
+		wfstream.o \
+		wincmn.o \
+		wxchar.o \
+		wxexpr.o \
+		xpmdecod.o \
+		zipstrm.o \
+		zstream.o
+
+GENERICOBJS = \
+		accel.o \
+		busyinfo.o \
+		calctrl.o \
+		caret.o \
+		choicdgg.o \
+		colrdlgg.o \
+		dcpsg.o \
+		dirctrlg.o \
+		dirdlgg.o \
+		dragimgg.o \
+		fdrepdlg.o \
+		filedlgg.o \
+		fontdlgg.o \
+		grid.o \
+		gridctrl.o \
+		gridsel.o \
+		helpext.o \
+		helphtml.o \
+		helpwxht.o \
+		imaglist.o \
+		laywin.o \
+		listctrl.o \
+		logg.o \
+		msgdlgg.o \
+		notebook.o \
+		numdlgg.o \
+		paletteg.o \
+		panelg.o \
+		printps.o \
+		prntdlgg.o \
+		progdlgg.o \
+		prop.o \
+		propform.o \
+		proplist.o \
+		sashwin.o \
+		scrlwing.o \
+		spinctlg.o \
+		splash.o \
+		splitter.o \
+		statline.o \
+		statusbr.o \
+		tabg.o \
+		tbarsmpl.o \
+		textdlgg.o \
+		tipdlg.o \
+		tipwin.o \
+		treectlg.o \
+		treelay.o \
+		wizard.o
+
+GUIOBJS = \
+		accel.o \
+		app.o \
+		bitmap.o \
+		brush.o \
+		clipbrd.o \
+		colour.o \
+		cursor.o \
+		data.o \
+		dataobj.o \
+		dc.o \
+		dcclient.o \
+		dcmemory.o \
+		dcscreen.o \
+		font.o \
+		gdiobj.o \
+		glcanvas.o \
+		gsockx11.o \
+		icon.o \
+		joystick.o \
+		main.o \
+		minifram.o \
+		palette.o \
+		pen.o \
+		region.o \
+		settings.o \
+		timer.o \
+		toolbar.o \
+		toplevel.o \
+		utils.o \
+		window.o
+
+UNIXOBJS = \
+		dialup.o \
+		dir.o \
+		fontenum.o \
+		fontutil.o \
+		gsocket.o \
+		mimetype.o \
+		snglinst.o \
+		threadpsx.o \
+		utilsunx.o
+
+HTMLOBJS = \
+		helpctrl.o \
+		helpdata.o \
+		helpfrm.o \
+		htmlcell.o \
+		htmlfilt.o \
+		htmlpars.o \
+		htmltag.o \
+		htmlwin.o \
+		htmprint.o \
+		m_dflist.o \
+		m_fonts.o \
+		m_hline.o \
+		m_image.o \
+		m_layout.o \
+		m_links.o \
+		m_list.o \
+		m_meta.o \
+		m_pre.o \
+		m_style.o \
+		m_tables.o \
+		winpars.o
+