From: Robert Roebling Date: Thu, 12 Aug 1999 19:24:39 +0000 (+0000) Subject: Augmented beta to 9, X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ad9edf45f116c0281b5efcfa0dd7b2fc2073908f Augmented beta to 9, Removed a few old Makefiles, Added one missing one (blush), Added first sample makefiles, git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000000..93fe99d4e7 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,1056 @@ + +# +# This file was automatically generated by tmake at 19:46, 1999/08/12 +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! + +# +# File: makefile.unx +# 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_gtk.a, libwx_motif.a and libwx_msw.a + +################################################################### + +include ./src/make.env + +############## override make.env for PIC ########################## + +# Clears all default suffixes +.SUFFIXES: .o .cpp .c .cxx + +.c.o : + $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< + +.cpp.o : + $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + +.cxx.o : + $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + +########################### Paths ################################# + +srcdir = @srcdir@ + +VPATH = :@top_srcdir@ + +top_srcdir = @top_srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = . + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_alias = @build_alias@ +build_triplet = @build@ +host_alias = @host_alias@ +host_triplet = @host@ +target_alias = @target_alias@ +target_triplet = @target@ + +############################# Dirs ################################# + +WXDIR = $(top_srcdir) + +# Subordinate library possibilities + +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +UNIXDIR = $(WXDIR)/src/unix +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +GTKDIR = $(WXDIR)/src/gtk +MOTIFDIR = $(WXDIR)/src/motif +INCDIR = $(WXDIR)/include + +DOCDIR = $(WXDIR)/docs + +############################## Files ################################## + +WX_HEADERS = \ + accel.h \ + app.h \ + arrimpl.cpp \ + bitmap.h \ + bmpbuttn.h \ + brush.h \ + buffer.h \ + busyinfo.h \ + button.h \ + caret.h \ + checkbox.h \ + checklst.h \ + choicdlg.h \ + choice.h \ + clipbrd.h \ + cmndata.h \ + colordlg.h \ + colour.h \ + combobox.h \ + confbase.h \ + config.h \ + control.h \ + cursor.h \ + dataobj.h \ + date.h \ + datstrm.h \ + db.h \ + dbtable.h \ + dc.h \ + dcclient.h \ + dcmemory.h \ + dcprint.h \ + dcps.h \ + dcscreen.h \ + dde.h \ + debug.h \ + defs.h \ + dialog.h \ + dirdlg.h \ + dnd.h \ + docmdi.h \ + docview.h \ + dragimag.h \ + dynarray.h \ + dynlib.h \ + event.h \ + expr.h \ + ffile.h \ + file.h \ + fileconf.h \ + filedlg.h \ + filefn.h \ + filesys.h \ + font.h \ + fontdlg.h \ + frame.h \ + fs_inet.h \ + fs_zip.h \ + gauge.h \ + gdicmn.h \ + gdiobj.h \ + grid.h \ + hash.h \ + help.h \ + helpbase.h \ + helphtml.h \ + helpwin.h \ + helpxlp.h \ + icon.h \ + image.h \ + imaglist.h \ + intl.h \ + ioswrap.h \ + ipcbase.h \ + joystick.h \ + layout.h \ + laywin.h \ + list.h \ + listbox.h \ + listctrl.h \ + listimpl.cpp \ + log.h \ + longlong.h \ + matrix.h \ + mdi.h \ + memory.h \ + menu.h \ + menuitem.h \ + metafile.h \ + mimetype.h \ + minifram.h \ + module.h \ + msgdlg.h \ + mstream.h \ + notebook.h \ + object.h \ + objstrm.h \ + odbc.h \ + ownerdrw.h \ + palette.h \ + panel.h \ + paper.h \ + pen.h \ + pnghand.h \ + print.h \ + printdlg.h \ + prntbase.h \ + process.h \ + progdlg.h \ + prop.h \ + propform.h \ + proplist.h \ + radiobox.h \ + radiobut.h \ + region.h \ + resource.h \ + sashwin.h \ + sckaddr.h \ + sckipc.h \ + sckstrm.h \ + scrolbar.h \ + scrolwin.h \ + serbase.h \ + settings.h \ + setup.h \ + sizer.h \ + slider.h \ + socket.h \ + spinbutt.h \ + splitter.h \ + statbmp.h \ + statbox.h \ + statline.h \ + stattext.h \ + statusbr.h \ + strconv.h \ + stream.h \ + string.h \ + tab.h \ + tabctrl.h \ + taskbar.h \ + tbar95.h \ + tbarbase.h \ + tbarmsw.h \ + tbarsmpl.h \ + textctrl.h \ + textdlg.h \ + textfile.h \ + thread.h \ + time.h \ + timer.h \ + tipdlg.h \ + tokenzr.h \ + toolbar.h \ + tooltip.h \ + treectrl.h \ + txtstrm.h \ + types.h \ + url.h \ + utils.h \ + valgen.h \ + validate.h \ + valtext.h \ + variant.h \ + version.h \ + wave.h \ + wfstream.h \ + window.h \ + wx.h \ + wx_cw.h \ + wx_cw_cm.h \ + wx_cw_d.h \ + wxchar.h \ + wxexpr.h \ + wxhtml.h \ + wxprec.h \ + xpmhand.h \ + zipstrm.h \ + zstream.h + +GTK_HEADERS = \ + gtk/accel.h \ + gtk/app.h \ + gtk/bitmap.h \ + gtk/bmpbuttn.h \ + gtk/brush.h \ + gtk/button.h \ + gtk/checkbox.h \ + gtk/checklst.h \ + gtk/choice.h \ + gtk/clipbrd.h \ + gtk/colour.h \ + gtk/combobox.h \ + gtk/control.h \ + gtk/cursor.h \ + gtk/dataobj.h \ + gtk/dc.h \ + gtk/dcclient.h \ + gtk/dcmemory.h \ + gtk/dcscreen.h \ + gtk/dialog.h \ + gtk/dnd.h \ + gtk/filedlg.h \ + gtk/font.h \ + gtk/frame.h \ + gtk/gauge.h \ + gtk/gdiobj.h \ + gtk/icon.h \ + gtk/joystick.h \ + gtk/listbox.h \ + gtk/mdi.h \ + gtk/menu.h \ + gtk/menuitem.h \ + gtk/minifram.h \ + gtk/notebook.h \ + gtk/palette.h \ + gtk/pen.h \ + gtk/radiobox.h \ + gtk/radiobut.h \ + gtk/region.h \ + gtk/scrolbar.h \ + gtk/settings.h \ + gtk/slider.h \ + gtk/spinbutt.h \ + gtk/statbmp.h \ + gtk/statbox.h \ + gtk/statline.h \ + gtk/stattext.h \ + gtk/tbargtk.h \ + gtk/textctrl.h \ + gtk/timer.h \ + gtk/tooltip.h \ + gtk/treectrl.h \ + gtk/wave.h \ + gtk/win_gtk.h \ + gtk/window.h + +MOTIF_HEADERS = \ + motif/accel.h \ + motif/app.h \ + motif/bitmap.h \ + motif/bmpbuttn.h \ + motif/brush.h \ + motif/button.h \ + motif/checkbox.h \ + motif/checklst.h \ + motif/choice.h \ + motif/clipbrd.h \ + motif/colordlg.h \ + motif/colour.h \ + motif/combobox.h \ + motif/control.h \ + motif/cursor.h \ + motif/dataobj.h \ + motif/dc.h \ + motif/dcclient.h \ + motif/dcmemory.h \ + motif/dcprint.h \ + motif/dcscreen.h \ + motif/dialog.h \ + motif/dnd.h \ + motif/filedlg.h \ + motif/font.h \ + motif/fontdlg.h \ + motif/frame.h \ + motif/gauge.h \ + motif/gdiobj.h \ + motif/icon.h \ + motif/joystick.h \ + motif/listbox.h \ + motif/mdi.h \ + motif/menu.h \ + motif/menuitem.h \ + motif/metafile.h \ + motif/minifram.h \ + motif/msgdlg.h \ + motif/palette.h \ + motif/pen.h \ + motif/print.h \ + motif/printdlg.h \ + motif/private.h \ + motif/radiobox.h \ + motif/radiobut.h \ + motif/region.h \ + motif/scrolbar.h \ + motif/settings.h \ + motif/slider.h \ + motif/spinbutt.h \ + motif/statbmp.h \ + motif/statbox.h \ + motif/stattext.h \ + motif/textctrl.h \ + motif/timer.h \ + motif/toolbar.h \ + motif/window.h + +UNIX_HEADERS = \ + unix/execute.h + +GENERIC_HEADERS = \ + generic/caret.h \ + generic/choicdgg.h \ + generic/colrdlgg.h \ + generic/dcpsg.h \ + generic/dirdlgg.h \ + generic/fontdlgg.h \ + generic/gridg.h \ + generic/helpext.h \ + generic/helphtml.h \ + generic/helpwxht.h \ + generic/helpxlp.h \ + generic/imaglist.h \ + generic/laywin.h \ + generic/listctrl.h \ + generic/msgdlgg.h \ + generic/notebook.h \ + generic/panelg.h \ + generic/printps.h \ + generic/prntdlgg.h \ + generic/progdlgg.h \ + generic/sashwin.h \ + generic/scrolwin.h \ + generic/splitter.h \ + generic/statusbr.h \ + generic/tabg.h \ + generic/textdlgg.h \ + generic/treectrl.h + +PROTOCOL_HEADERS = \ + protocol/file.h \ + protocol/ftp.h \ + protocol/http.h \ + protocol/protocol.h + +HTML_HEADERS = \ + html/forcelink.h \ + html/htmlcell.h \ + html/htmldefs.h \ + html/htmlfilter.h \ + html/htmlhelp.h \ + html/htmlparser.h \ + html/htmltag.h \ + html/htmlwin.h \ + html/htmlwinparser.h \ + html/mod_templ.h \ + html/version.h + +GTK_GENERICOBJS = \ + src/generic/busyinfo.o \ + src/generic/caret.o \ + src/generic/choicdgg.o \ + src/generic/colrdlgg.o \ + src/generic/dcpsg.o \ + src/generic/dirdlgg.o \ + src/generic/fontdlgg.o \ + src/generic/gridg.o \ + src/generic/imaglist.o \ + src/generic/laywin.o \ + src/generic/listctrl.o \ + src/generic/msgdlgg.o \ + src/generic/numdlgg.o \ + src/generic/panelg.o \ + src/generic/printps.o \ + src/generic/prntdlgg.o \ + src/generic/progdlgg.o \ + src/generic/prop.o \ + src/generic/propform.o \ + src/generic/proplist.o \ + src/generic/sashwin.o \ + src/generic/scrolwin.o \ + src/generic/splitter.o \ + src/generic/statusbr.o \ + src/generic/textdlgg.o \ + src/generic/tipdlg.o \ + src/generic/treectrl.o + +GTK_COMMONOBJS = \ + parser.o \ + src/common/cmndata.o \ + src/common/config.o \ + src/common/date.o \ + src/common/datstrm.o \ + src/common/db.o \ + src/common/dbtable.o \ + src/common/dcbase.o \ + src/common/dlgcmn.o \ + src/common/docmdi.o \ + src/common/docview.o \ + src/common/dynarray.o \ + src/common/dynlib.o \ + src/common/event.o \ + src/common/extended.o \ + src/common/ffile.o \ + src/common/file.o \ + src/common/fileconf.o \ + src/common/filefn.o \ + src/common/filesys.o \ + src/common/framecmn.o \ + src/common/fs_inet.o \ + src/common/fs_zip.o \ + src/common/ftp.o \ + src/common/gdicmn.o \ + src/common/hash.o \ + src/common/helpbase.o \ + src/common/http.o \ + src/common/imagbmp.o \ + src/common/image.o \ + src/common/imaggif.o \ + src/common/imagjpeg.o \ + src/common/imagpng.o \ + src/common/intl.o \ + src/common/ipcbase.o \ + src/common/layout.o \ + src/common/list.o \ + src/common/log.o \ + src/common/memory.o \ + src/common/mimetype.o \ + src/common/module.o \ + src/common/mstream.o \ + src/common/object.o \ + src/common/objstrm.o \ + src/common/paper.o \ + src/common/prntbase.o \ + src/common/process.o \ + src/common/protocol.o \ + src/common/resource.o \ + src/common/sckaddr.o \ + src/common/sckfile.o \ + src/common/sckipc.o \ + src/common/sckstrm.o \ + src/common/sizer.o \ + src/common/socket.o \ + src/common/strconv.o \ + src/common/stream.o \ + src/common/string.o \ + src/common/tbarbase.o \ + src/common/tbarsmpl.o \ + src/common/textcmn.o \ + src/common/textfile.o \ + src/common/time.o \ + src/common/timercmn.o \ + src/common/tokenzr.o \ + src/common/txtstrm.o \ + src/common/unzip.o \ + src/common/url.o \ + src/common/utilscmn.o \ + src/common/valgen.o \ + src/common/validate.o \ + src/common/valtext.o \ + src/common/variant.o \ + src/common/wfstream.o \ + src/common/wincmn.o \ + src/common/wxchar.o \ + src/common/wxexpr.o \ + src/common/zipstrm.o \ + src/common/zstream.o + +GTK_GUIOBJS = \ + src/gtk/accel.o \ + src/gtk/app.o \ + src/gtk/bitmap.o \ + src/gtk/bmpbuttn.o \ + src/gtk/brush.o \ + src/gtk/button.o \ + src/gtk/checkbox.o \ + src/gtk/checklst.o \ + src/gtk/choice.o \ + src/gtk/clipbrd.o \ + src/gtk/colour.o \ + src/gtk/combobox.o \ + src/gtk/control.o \ + src/gtk/cursor.o \ + src/gtk/data.o \ + src/gtk/dataobj.o \ + src/gtk/dc.o \ + src/gtk/dcclient.o \ + src/gtk/dcmemory.o \ + src/gtk/dcscreen.o \ + src/gtk/dialog.o \ + src/gtk/dnd.o \ + src/gtk/filedlg.o \ + src/gtk/font.o \ + src/gtk/frame.o \ + src/gtk/gauge.o \ + src/gtk/gdiobj.o \ + src/gtk/gsockgtk.o \ + src/gtk/icon.o \ + src/gtk/listbox.o \ + src/gtk/main.o \ + src/gtk/mdi.o \ + src/gtk/menu.o \ + src/gtk/minifram.o \ + src/gtk/notebook.o \ + src/gtk/palette.o \ + src/gtk/pen.o \ + src/gtk/radiobox.o \ + src/gtk/radiobut.o \ + src/gtk/region.o \ + src/gtk/scrolbar.o \ + src/gtk/settings.o \ + src/gtk/slider.o \ + src/gtk/spinbutt.o \ + src/gtk/statbmp.o \ + src/gtk/statbox.o \ + src/gtk/statline.o \ + src/gtk/stattext.o \ + src/gtk/tbargtk.o \ + src/gtk/textctrl.o \ + src/gtk/timer.o \ + src/gtk/tooltip.o \ + src/gtk/utilsgtk.o \ + src/gtk/utilsres.o \ + src/gtk/wave.o \ + src/gtk/win_gtk.o \ + src/gtk/window.o + +MOTIF_GENERICOBJS = \ + src/generic/busyinfo.o \ + src/generic/caret.o \ + src/generic/choicdgg.o \ + src/generic/colrdlgg.o \ + src/generic/dcpsg.o \ + src/generic/dirdlgg.o \ + src/generic/fontdlgg.o \ + src/generic/gridg.o \ + src/generic/helpxlp.o \ + src/generic/imaglist.o \ + src/generic/laywin.o \ + src/generic/listctrl.o \ + src/generic/msgdlgg.o \ + src/generic/notebook.o \ + src/generic/numdlgg.o \ + src/generic/panelg.o \ + src/generic/printps.o \ + src/generic/prntdlgg.o \ + src/generic/progdlgg.o \ + src/generic/prop.o \ + src/generic/propform.o \ + src/generic/proplist.o \ + src/generic/sashwin.o \ + src/generic/scrolwin.o \ + src/generic/splitter.o \ + src/generic/statusbr.o \ + src/generic/tabg.o \ + src/generic/textdlgg.o \ + src/generic/tipdlg.o \ + src/generic/treectrl.o + +MOTIF_COMMONOBJS = \ + parser.o \ + src/common/choiccmn.o \ + src/common/cmndata.o \ + src/common/config.o \ + src/common/ctrlcmn.o \ + src/common/date.o \ + src/common/datstrm.o \ + src/common/db.o \ + src/common/dbtable.o \ + src/common/dcbase.o \ + src/common/dlgcmn.o \ + src/common/docmdi.o \ + src/common/docview.o \ + src/common/dynarray.o \ + src/common/dynlib.o \ + src/common/event.o \ + src/common/extended.o \ + src/common/ffile.o \ + src/common/file.o \ + src/common/fileconf.o \ + src/common/filefn.o \ + src/common/filesys.o \ + src/common/framecmn.o \ + src/common/fs_inet.o \ + src/common/fs_zip.o \ + src/common/ftp.o \ + src/common/gdicmn.o \ + src/common/hash.o \ + src/common/helpbase.o \ + src/common/http.o \ + src/common/imagbmp.o \ + src/common/image.o \ + src/common/imaggif.o \ + src/common/imagjpeg.o \ + src/common/imagpng.o \ + src/common/intl.o \ + src/common/ipcbase.o \ + src/common/layout.o \ + src/common/list.o \ + src/common/log.o \ + src/common/memory.o \ + src/common/mimetype.o \ + src/common/module.o \ + src/common/mstream.o \ + src/common/object.o \ + src/common/objstrm.o \ + src/common/odbc.o \ + src/common/paper.o \ + src/common/prntbase.o \ + src/common/process.o \ + src/common/protocol.o \ + src/common/resource.o \ + src/common/sckaddr.o \ + src/common/sckfile.o \ + src/common/sckipc.o \ + src/common/sckstrm.o \ + src/common/sizer.o \ + src/common/socket.o \ + src/common/strconv.o \ + src/common/stream.o \ + src/common/string.o \ + src/common/tbarbase.o \ + src/common/tbarsmpl.o \ + src/common/textcmn.o \ + src/common/textfile.o \ + src/common/time.o \ + src/common/timercmn.o \ + src/common/tokenzr.o \ + src/common/txtstrm.o \ + src/common/unzip.o \ + src/common/url.o \ + src/common/utilscmn.o \ + src/common/valgen.o \ + src/common/validate.o \ + src/common/valtext.o \ + src/common/variant.o \ + src/common/wfstream.o \ + src/common/wincmn.o \ + src/common/wxchar.o \ + src/common/wxexpr.o \ + src/common/zipstrm.o \ + src/common/zstream.o + +MOTIF_GUIOBJS = \ + src/motif/xmcombo/xmcombo.o \ + src/motif/accel.o \ + src/motif/app.o \ + src/motif/bitmap.o \ + src/motif/bmpbuttn.o \ + src/motif/brush.o \ + src/motif/button.o \ + src/motif/checkbox.o \ + src/motif/choice.o \ + src/motif/clipbrd.o \ + src/motif/colour.o \ + src/motif/combobox.o \ + src/motif/control.o \ + src/motif/cursor.o \ + src/motif/data.o \ + src/motif/dataobj.o \ + src/motif/dc.o \ + src/motif/dcclient.o \ + src/motif/dcmemory.o \ + src/motif/dcscreen.o \ + src/motif/dialog.o \ + src/motif/filedlg.o \ + src/motif/font.o \ + src/motif/frame.o \ + src/motif/gauge.o \ + src/motif/gdiobj.o \ + src/motif/gsockmot.o \ + src/motif/icon.o \ + src/motif/listbox.o \ + src/motif/main.o \ + src/motif/mdi.o \ + src/motif/menu.o \ + src/motif/menuitem.o \ + src/motif/minifram.o \ + src/motif/msgdlg.o \ + src/motif/palette.o \ + src/motif/pen.o \ + src/motif/radiobox.o \ + src/motif/radiobut.o \ + src/motif/region.o \ + src/motif/scrolbar.o \ + src/motif/settings.o \ + src/motif/slider.o \ + src/motif/statbmp.o \ + src/motif/statbox.o \ + src/motif/stattext.o \ + src/motif/textctrl.o \ + src/motif/timer.o \ + src/motif/toolbar.o \ + src/motif/utils.o \ + src/motif/window.o + +HTMLOBJS = \ + src/html/htmlcell.o \ + src/html/htmlfilter.o \ + src/html/htmlhelp.o \ + src/html/htmlhelp_io.o \ + src/html/htmlparser.o \ + src/html/htmltag.o \ + src/html/htmlwin.o \ + src/html/htmlwinparser.o \ + src/html/mod_fonts.o \ + src/html/mod_hline.o \ + src/html/mod_image.o \ + src/html/mod_layout.o \ + src/html/mod_links.o \ + src/html/mod_list.o \ + src/html/mod_pre.o \ + src/html/mod_tables.o \ + src/html/search.o + +UNIXOBJS = \ + src/unix/gsocket.o \ + src/unix/threadpsx.o \ + src/unix/utilsunx.o + +ZLIBOBJS = \ + src/zlib/adler32.o \ + src/zlib/compress.o \ + src/zlib/crc32.o \ + src/zlib/gzio.o \ + src/zlib/uncompr.o \ + src/zlib/deflate.o \ + src/zlib/trees.o \ + src/zlib/zutil.o \ + src/zlib/inflate.o \ + src/zlib/infblock.o \ + src/zlib/inftrees.o \ + src/zlib/infcodes.o \ + src/zlib/infutil.o \ + src/zlib/inffast.o + +PNGOBJS = \ + src/png/png.o \ + src/png/pngread.o \ + src/png/pngrtran.o \ + src/png/pngrutil.o \ + src/png/pngpread.o \ + src/png/pngtrans.o \ + src/png/pngwrite.o \ + src/png/pngwtran.o \ + src/png/pngwutil.o \ + src/png/pngerror.o \ + src/png/pngmem.o \ + src/png/pngwio.o \ + src/png/pngrio.o \ + src/png/pngget.o \ + src/png/pngset.o + + +JPEGOBJS = \ + src/jpeg/jcomapi.o \ + src/jpeg/jutils.o \ + src/jpeg/jerror.o \ + src/jpeg/jmemmgr.o \ + src/jpeg/jmemnobs.o \ + src/jpeg/jcapimin.o \ + src/jpeg/jcapistd.o \ + src/jpeg/jctrans.o \ + src/jpeg/jcparam.o \ + src/jpeg/jdatadst.o \ + src/jpeg/jcinit.o \ + src/jpeg/jcmaster.o \ + src/jpeg/jcmarker.o \ + src/jpeg/jcmainct.o \ + src/jpeg/jcprepct.o \ + src/jpeg/jccoefct.o \ + src/jpeg/jccolor.o \ + src/jpeg/jcsample.o \ + src/jpeg/jchuff.o \ + src/jpeg/jcphuff.o \ + src/jpeg/jcdctmgr.o \ + src/jpeg/jfdctfst.o \ + src/jpeg/jfdctflt.o \ + src/jpeg/jfdctint.o \ + src/jpeg/jdapimin.o \ + src/jpeg/jdapistd.o \ + src/jpeg/jdtrans.o \ + src/jpeg/jdatasrc.o \ + src/jpeg/jdmaster.o \ + src/jpeg/jdinput.o \ + src/jpeg/jdmarker.o \ + src/jpeg/jdhuff.o \ + src/jpeg/jdphuff.o \ + src/jpeg/jdmainct.o \ + src/jpeg/jdcoefct.o \ + src/jpeg/jdpostct.o \ + src/jpeg/jddctmgr.o \ + src/jpeg/jidctfst.o \ + src/jpeg/jidctflt.o \ + src/jpeg/jidctint.o \ + src/jpeg/jidctred.o \ + src/jpeg/jdsample.o \ + src/jpeg/jdcolor.o \ + src/jpeg/jquant1.o \ + src/jpeg/jquant2.o \ + src/jpeg/jdmerge.o + + +OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(HTMLOBJS) $(UNIXOBJS) \ + $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) + +HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ + $(GENERIC_HEADERS) $(WX_HEADERS) + +REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif \ + ./src/generic ./src/unix ./src/motif/xmombo ./src/html \ + ./src/zlib ./src/jpeg ./src/png + +all: $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ + +$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + @if test ! -d ./lib; then mkdir ./lib; fi + @if test ! -d ./src; then mkdir ./src; fi + @if test ! -d ./src/common; then mkdir ./src/common; fi + @if test ! -d ./src/gtk; then mkdir ./src/gtk; fi + @if test ! -d ./src/motif; then mkdir ./src/motif; fi + @if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi + @if test ! -d ./src/generic; then mkdir ./src/generic; fi + @if test ! -d ./src/unix; then mkdir ./src/unix; fi + @if test ! -d ./src/html; then mkdir ./src/html; fi + @if test ! -d ./src/png; then mkdir ./src/png; fi + @if test ! -d ./src/jpeg; then mkdir ./src/jpeg; fi + @if test ! -d ./src/zlib; then mkdir ./src/zlib; fi + +@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) + $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS) + $(RANLIB) ./lib/$@ + +@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) + $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) + +CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@ + @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi + @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi + @if test -e ./lib/@WX_LIBRARY_LINK3@; then rm -f ./lib/@WX_LIBRARY_LINK3@; fi + $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ + $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ + $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ + +CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@ + @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi + @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi + @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then rm -f $(libdir)/@WX_LIBRARY_LINK3@; fi + $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@ + $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@ + $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@ + +$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h + +parser.o: parser.c lexer.c + $(CCLEX) -c $(CFLAGS) -o $@ parser.c + +parser.c: $(COMMDIR)/parser.y lexer.c + $(YACC) $(COMMDIR)/parser.y + @sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \ + sed -e "s/BUFSIZ/5000/g" | \ + sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \ + sed -e "s/yy/PROIO_yy/g" | \ + sed -e "s/input/PROIO_input/g" | \ + sed -e "s/unput/PROIO_unput/g" > parser.c + @$(RM) y.tab.c + +lexer.c: $(COMMDIR)/lexer.l + $(LEX) $(COMMDIR)/lexer.l + @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \ + sed -e "s/yy/PROIO_yy/g" | \ + sed -e "s/input/PROIO_input/g" | \ + sed -e "s/unput/PROIO_unput/g" > lexer.c + @$(RM) lex.yy.c + +preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h + @echo " " + @echo " Installing wxWindows..." + @echo " " + + $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config + $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + + @if test ! -d $(libdir)/wx; then mkdir $(libdir)/wx; fi + @if test ! -d $(libdir)/wx/include; then mkdir $(libdir)/wx/include; fi + @if test ! -d $(libdir)/wx/include/wx; then mkdir $(libdir)/wx/include/wx; fi + @if test ! -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then mkdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi + $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + + @if test ! -d $(includedir)/wx; then mkdir $(includedir)/wx; fi + @if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi + @if test ! -d $(includedir)/wx/motif; then mkdir $(includedir)/wx/motif; fi + @if test ! -d $(includedir)/wx/html; then mkdir $(includedir)/wx/html; fi + @if test ! -d $(includedir)/wx/protocol; then mkdir $(includedir)/wx/protocol; fi + @if test ! -d $(includedir)/wx/unix; then mkdir $(includedir)/wx/unix; fi + @if test ! -d $(includedir)/wx/generic; then mkdir $(includedir)/wx/generic; fi + @list='$(HEADERS)'; for p in $$list; do \ + $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ + echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ + done + +write_message: + @echo " " + @echo " The installation of wxWindows is finished. On certain" + @echo " platforms (e.g. Linux, Solaris) you'll now have to run" + @echo " ldconfig if you installed a shared library." + @echo " " + @echo " wxWindows comes with no guarantees and doesn't claim" + @echo " to be suitable for any purpose." + @echo " " + @echo " Read the wxWindows Licence on licencing conditions." + @echo " " + +install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message + +uninstall: + @echo " " + @echo " Uninstalling wxWindows..." + @echo " " + @echo " Removing library..." + @rm -f $(libdir)/@WX_TARGET_LIBRARY@ + @rm -f $(libdir)/@WX_LIBRARY_LINK1@ + @rm -f $(libdir)/@WX_LIBRARY_LINK2@ + @rm -f $(libdir)/@WX_LIBRARY_LINK3@ + @echo " Removing helper files..." + @rm -f $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + @rm -f $(bindir)/wx-config + @echo " Removing headers..." + @list='$(HEADERS)'; for p in $$list; do \ + rm -f $(includedir)/wx/$$p; \ + done + @echo " Removing directories..." + @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi + @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi + @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi + @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi + @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi + @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi + @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi + @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi + @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi + @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi + @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi + +clean: + rm -f ./src/msw/*.o + rm -f ./src/gtk/*.o + rm -f ./src/motif/*.o + rm -f ./src/html/*.o + rm -f ./src/common/*.o + rm -f ./src/unix/*.o + rm -f ./src/generic/*.o + rm -f ./src/png/*.o + rm -f ./src/jpeg/*.o + rm -f ./src/zlib/*.o + rm -f *.o + rm -f parser.c + rm -f lexer.c + rm -f ./lib/* + +cleanall: clean diff --git a/configure.in b/configure.in index 646e62592c..8726cdcf41 100644 --- a/configure.in +++ b/configure.in @@ -2673,6 +2673,12 @@ AC_OUTPUT([ src/makeprog.env src/makelib.env Makefile + samples/Makefile + samples/bombs/Makefile + samples/caret/Makefile + samples/checklst/Makefile + samples/config/Makefile + samples/controls/Makefile ], [ chmod +x wx-config diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src index 9dcda76273..3870301071 100755 --- a/distrib/gtk/copy_src +++ b/distrib/gtk/copy_src @@ -15,23 +15,13 @@ echo Base dir.. cd ../.. cp wxGTK.spec ~/wxgtk_dist/wxGTK -cp Makefile.am ~/wxgtk_dist/wxGTK -cp acconfig.h ~/wxgtk_dist/wxGTK -cp acinclude.m4 ~/wxgtk_dist/wxGTK -cp aclocal.m4 ~/wxgtk_dist/wxGTK -cp configure.in ~/wxgtk_dist/wxGTK cp configure ~/wxgtk_dist/wxGTK cp config.sub ~/wxgtk_dist/wxGTK cp config.guess ~/wxgtk_dist/wxGTK cp install-sh ~/wxgtk_dist/wxGTK -cp ltconfig ~/wxgtk_dist/wxGTK -cp ltmain.sh ~/wxgtk_dist/wxGTK -cp missing ~/wxgtk_dist/wxGTK cp mkinstalldirs ~/wxgtk_dist/wxGTK cp wx-config.in ~/wxgtk_dist/wxGTK -cp makefile.unx.in ~/wxgtk_dist/wxGTK cp setup.h.in ~/wxgtk_dist/wxGTK -cp stamp-h.in ~/wxgtk_dist/wxGTK cp Makefile.in ~/wxgtk_dist/wxGTK echo Docs.. diff --git a/distrib/motif/copy_src b/distrib/motif/copy_src index c941a993a6..a5795ca243 100755 --- a/distrib/motif/copy_src +++ b/distrib/motif/copy_src @@ -15,23 +15,12 @@ echo Base dir.. cd ../.. cp wxMotif.spec ~/wxmotif_dist/wxMotif -cp Makefile.am ~/wxmotif_dist/wxMotif -cp acconfig.h ~/wxmotif_dist/wxMotif -cp acinclude.m4 ~/wxmotif_dist/wxMotif -cp aclocal.m4 ~/wxmotif_dist/wxMotif -cp configure.in ~/wxmotif_dist/wxMotif cp configure ~/wxmotif_dist/wxMotif cp config.sub ~/wxmotif_dist/wxMotif cp config.guess ~/wxmotif_dist/wxMotif cp install-sh ~/wxmotif_dist/wxMotif -cp ltconfig ~/wxmotif_dist/wxMotif -cp ltmain.sh ~/wxmotif_dist/wxMotif -cp missing ~/wxmotif_dist/wxMotif cp mkinstalldirs ~/wxmotif_dist/wxMotif cp wx-config.in ~/wxmotif_dist/wxMotif -cp makefile.unx.in ~/wxmotif_dist/wxMotif -cp setup.h.in ~/wxmotif_dist/wxMotif -cp stamp-h.in ~/wxmotif_dist/wxMotif cp Makefile.in ~/wxmotif_dist/wxMotif echo Docs.. diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index c2ed5fe31b..254576ad21 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -1,7 +1,7 @@ #!################################################################################ #! File: unx.t -#! Purpose: tmake template file from which makefile.unx.in is generated by running -#! tmake -t unx wxwin.pro -o makefile.unx.in +#! Purpose: tmake template file from which Makefile.in is generated by running +#! tmake -t unx wxwin.pro -o Makefile.in #! Author: Vadim Zeitlin, Robert Roebling, Julian Smart #! Created: 14.07.99 #! Version: $Id$ @@ -397,11 +397,6 @@ lexer.c: $(COMMDIR)/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) lex.yy.c -samples: $(OBJECTS) - @if test ! -e ./samples/dialog/dialog.cpp; \ - then cp -f -r $(WXDIR)/samples .; \ - fi - preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h @echo " " @echo " Installing wxWindows..." diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index 85946c0d92..089549410f 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -1,4 +1,16 @@ +28th August '99: Ninth wxGTK 2.1 snapshot released + +As the old makefile system didn't work, I trashed it and wrote +a new one. It does work on Linux and Solaris but anything else +is untested. + +Addition of new layout classes that work like Java's, GTK's +or Qt`s - basically, you pack item in a box and let it tell +you how much space it needs. + +A few more minor fixes. + 6th August '99: Eight wxGTK 2.1 snapshot released The new makefile system is not able to produce shared libraries diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 5cc34a7f41..33d915d787 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -16,23 +16,6 @@ install instructions just do (in the base dir): > ldconfig > exit -On all variants of Unix except Linux (and maybe except *BSD), shared libraries -are not supportet out of the box due to the utter stupidity of libtool, so you'll -have to do this to get shared library support: - -> ./configure --with-gtk --disable-static --enable-shared - -Then you'll have to edit the wrongly created libtool script. There are two -important entries with respect to shared library creation, which are - - archive_cmds="\$LD -shared .... - archive_expsym_cmds="\$LD -shared .... - -which should be something like - - archive_cmds="\$CC -shared .... - archive_expsym_cmds="\$CC -shared .... - Afterwards you can continue with > make diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt index 4cb90c7518..34fcf18016 100644 --- a/docs/gtk/readme.txt +++ b/docs/gtk/readme.txt @@ -1,18 +1,15 @@ - Welcome to wxWindows/Gtk 2.1 snapshot 8, + Welcome to wxWindows/Gtk 2.1 snapshot 9, you have downloaded version 2.1 of the GTK+ 1.2 port of the wxWindows GUI library. This is a developers release and is it not suited for production development. Beware that major changes can happen before a final release. -Beginning with snapshot 6, wxWindows uses a completely -new make file system on Unix that uses GNU automake, -GNU autoconf and GNU autoheader. You do not need these -programs in order to use the library, but for taking -part in its development, they are required. Read the -INSTALL.txt file for learning what you can do with the -new configure/automake/libtool system. +Beginning with snapshot 9, wxWindows uses a completely +new make file system on Unix which no longer uses the +various GNU tools and I hope that I'll never again have +to write any more makefiles. More information is available from my homepage at: diff --git a/docs/gtk/todo.txt b/docs/gtk/todo.txt index 96bce1ccb8..92adcfb9e9 100644 --- a/docs/gtk/todo.txt +++ b/docs/gtk/todo.txt @@ -5,14 +5,8 @@ Finalise DnD API. More testing of Unicode support. -New wxSizer class implementation. - Make wxSockets work on all platform. -Do something about reentry problems with GUI threads - when doing asynchronous work (clipboard transfer, - DnD, sockets, different threads). - Add ID based i18n system as a replacement for the unelegant gettext system. @@ -22,8 +16,6 @@ Add TIFF handler. Someone? (Hint, hint). Improve, update translations. Install *.mo files somewehere. -Completely remove internal usage of C++ iostreams. - Sleep, eat, walk, study, shave, read, play piano and wash less. -------------------- Medium priority --------------------- diff --git a/docs/latex/wx/scrolwin.tex b/docs/latex/wx/scrolwin.tex index 91b5fc2b86..bdc315b480 100644 --- a/docs/latex/wx/scrolwin.tex +++ b/docs/latex/wx/scrolwin.tex @@ -16,6 +16,7 @@ scroll position. \wxheading{Derived from} +\helpref{wxPanel}{wxpanel}\\ \helpref{wxWindow}{wxwindow}\\ \helpref{wxEvtHandler}{wxevthandler}\\ \helpref{wxObject}{wxobject} diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex index 7990b1133a..a8308baed1 100644 --- a/docs/latex/wx/window.tex +++ b/docs/latex/wx/window.tex @@ -772,6 +772,16 @@ Returns TRUE if the window is enabled for input, FALSE otherwise. \helpref{wxWindow::Enable}{wxwindowenable} +\memebersection{wxWindow:IsExposed}\label{wxwindowisexposed} + +\constfunc{bool}{IsExposed}{\param{int }{x}, \param{int }{y}} + +\constfunc{bool}{IsExposed}{\param{int }{x}, \param{int }{y}, \param{int }{w}, \param{int }{h}} + +Returns TRUE if the given point or rectange area has been exposed since the +last repaint. Call this in an paint event handler to optimize redrawing by +only redrawing those area, which have been exposed. + \membersection{wxWindow::IsRetained}\label{wxwindowisretained} \constfunc{virtual bool}{IsRetained}{\void} diff --git a/docs/motif2/install.txt b/docs/motif2/install.txt index 02f22033ff..3a7d4c11b5 100644 --- a/docs/motif2/install.txt +++ b/docs/motif2/install.txt @@ -16,23 +16,6 @@ install instructions just do (in the base dir): > ldconfig > exit -On all variants of Unix except Linux (and maybe except *BSD), shared libraries -are not supportet out of the box due to the utter stupidity of libtool, so you'll -have to do this to get shared library support: - -> ./configure --with-motif --disable-static --enable-shared - -Then you'll have to edit the wrongly created libtool script. There are two -important entries with respect to shared library creation, which are - - archive_cmds="\$LD -shared .... - archive_expsym_cmds="\$LD -shared .... - -which should be something like - - archive_cmds="\$CC -shared .... - archive_expsym_cmds="\$CC -shared .... - Afterwards you can continue with > make diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 53eefcf67d..0000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -SUBDIRS = wx diff --git a/include/wx/Makefile.am b/include/wx/Makefile.am deleted file mode 100644 index 776be6a67a..0000000000 --- a/include/wx/Makefile.am +++ /dev/null @@ -1,197 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -SUBDIRS = generic @TOOLKIT_DIR@ @INCLUDE_SUBDIRS@ - -wx_includedir = ${includedir}/wx -wx_include_HEADERS = \ -\ - arrimpl.cpp \ - listimpl.cpp \ -\ - accel.h \ - app.h \ - bitmap.h \ - bmpbuttn.h \ - brush.h \ - buffer.h \ - busyinfo.h \ - button.h \ - caret.h \ - checkbox.h \ - checklst.h \ - choicdlg.h \ - choice.h \ - clipbrd.h \ - cmndata.h \ - colordlg.h \ - colour.h \ - combobox.h \ - confbase.h \ - config.h \ - control.h \ - cursor.h \ - dataobj.h \ - date.h \ - datstrm.h \ - db.h \ - dbtable.h \ - dc.h \ - dcclient.h \ - dcmemory.h \ - dcprint.h \ - dcps.h \ - dcscreen.h \ - dde.h \ - debug.h \ - defs.h \ - dialog.h \ - dirdlg.h \ - dnd.h \ - docmdi.h \ - docview.h \ - dragimag.h \ - dynarray.h \ - dynlib.h \ - event.h \ - expr.h \ - ffile.h \ - file.h \ - fileconf.h \ - filedlg.h \ - filefn.h \ - filesys.h \ - font.h \ - fontdlg.h \ - frame.h \ - fs_inet.h \ - fs_zip.h \ - gauge.h \ - gdicmn.h \ - gdiobj.h \ - grid.h \ - gsocket.h \ - hash.h \ - help.h \ - helpbase.h \ - helphtml.h \ - helpwin.h \ - helpxlp.h \ - icon.h \ - image.h \ - imaglist.h \ - intl.h \ - ioswrap.h \ - ipcbase.h \ - joystick.h \ - layout.h \ - laywin.h \ - list.h \ - listbox.h \ - listctrl.h \ - log.h \ - longlong.h \ - matrix.h \ - mdi.h \ - memory.h \ - menu.h \ - menuitem.h \ - metafile.h \ - mimetype.h \ - minifram.h \ - module.h \ - msgdlg.h \ - mstream.h \ - notebook.h \ - object.h \ - objstrm.h \ - odbc.h \ - ownerdrw.h \ - palette.h \ - panel.h \ - paper.h \ - pen.h \ - pnghand.h \ - print.h \ - printdlg.h \ - prntbase.h \ - process.h \ - progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ - radiobox.h \ - radiobut.h \ - region.h \ - resource.h \ - sashwin.h \ - sckaddr.h \ - sckipc.h \ - sckstrm.h \ - scrolbar.h \ - scrolwin.h \ - serbase.h \ - settings.h \ - setup.h \ - slider.h \ - socket.h \ - spinbutt.h \ - splitter.h \ - statbmp.h \ - statbox.h \ - statline.h \ - stattext.h \ - statusbr.h \ - stream.h \ - strconv.h \ - string.h \ - tab.h \ - tabctrl.h \ - taskbar.h \ - tbar95.h \ - tbarbase.h \ - tbarmsw.h \ - tbarsmpl.h \ - textctrl.h \ - textdlg.h \ - textfile.h \ - txtstrm.h \ - thread.h \ - time.h \ - timer.h \ - tipdlg.h \ - tokenzr.h \ - toolbar.h \ - tooltip.h \ - treectrl.h \ - types.h \ - url.h \ - utils.h \ - valgen.h \ - validate.h \ - valtext.h \ - variant.h \ - version.h \ - wave.h \ - wfstream.h \ - window.h \ - wx.h \ - wx_cw.h \ - wx_cw_cm.h \ - wx_cw_d.h \ - wxchar.h \ - wxexpr.h \ - wxhtml.h \ - wxprec.h \ - xpmhand.h \ - zipstrm.h \ - zstream.h - -# setup.h is installed in another directory because several versions of wxwin -# should be able to coexist on the same machine -portheadersdir = ${datadir}/@PACKAGE@/include/wx/@TOOLKIT_DIR@ -portheaders_headers = setup.h - diff --git a/include/wx/generic/Makefile.am b/include/wx/generic/Makefile.am deleted file mode 100644 index baebae8cd2..0000000000 --- a/include/wx/generic/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx/generic subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -wx_generic_includedir = ${includedir}/wx/generic -wx_generic_include_HEADERS = \ - caret.h \ - choicdgg.h \ - colrdlgg.h \ - dcpsg.h \ - dirdlgg.h \ - fontdlgg.h \ - gridg.h \ - helpext.h \ - helpwxht.h \ - helphtml.h \ - helpxlp.h \ - imaglist.h \ - laywin.h \ - listctrl.h \ - msgdlgg.h \ - notebook.h \ - panelg.h \ - printps.h \ - prntdlgg.h \ - progdlgg.h \ - sashwin.h \ - scrolwin.h \ - splitter.h \ - statusbr.h \ - tabg.h \ - textdlgg.h \ - treectrl.h - -# why do these get installed ? -# info.xpm \ -# question.xpm \ -# error.xpm \ -# warning.xpm diff --git a/include/wx/gtk/Makefile.am b/include/wx/gtk/Makefile.am deleted file mode 100644 index 304b0416bd..0000000000 --- a/include/wx/gtk/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx/gtk subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -wx_gtk_includedir = ${includedir}/wx/gtk -wx_gtk_include_HEADERS = \ - accel.h \ - app.h \ - bitmap.h \ - bmpbuttn.h \ - brush.h \ - button.h \ - checkbox.h \ - checklst.h \ - choice.h \ - clipbrd.h \ - colour.h \ - combobox.h \ - control.h \ - cursor.h \ - dataobj.h \ - dc.h \ - dcclient.h \ - dcmemory.h \ - dcscreen.h \ - dialog.h \ - dnd.h \ - filedlg.h \ - font.h \ - frame.h \ - gauge.h \ - gdiobj.h \ - icon.h \ - joystick.h \ - listbox.h \ - mdi.h \ - menu.h \ - menuitem.h \ - minifram.h \ - notebook.h \ - palette.h \ - pen.h \ - radiobox.h \ - radiobut.h \ - region.h \ - scrolbar.h \ - settings.h \ - slider.h \ - spinbutt.h \ - statbmp.h \ - statbox.h \ - statline.h \ - stattext.h \ - tbargtk.h \ - textctrl.h \ - timer.h \ - tooltip.h \ - treectrl.h \ - wave.h \ - win_gtk.h \ - window.h - -# why do these get installed ? -# info.xpm \ -# question.xpm \ -# error.xpm \ -# warning.xpm diff --git a/include/wx/gtk1/Makefile.am b/include/wx/gtk1/Makefile.am deleted file mode 100644 index 304b0416bd..0000000000 --- a/include/wx/gtk1/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx/gtk subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -wx_gtk_includedir = ${includedir}/wx/gtk -wx_gtk_include_HEADERS = \ - accel.h \ - app.h \ - bitmap.h \ - bmpbuttn.h \ - brush.h \ - button.h \ - checkbox.h \ - checklst.h \ - choice.h \ - clipbrd.h \ - colour.h \ - combobox.h \ - control.h \ - cursor.h \ - dataobj.h \ - dc.h \ - dcclient.h \ - dcmemory.h \ - dcscreen.h \ - dialog.h \ - dnd.h \ - filedlg.h \ - font.h \ - frame.h \ - gauge.h \ - gdiobj.h \ - icon.h \ - joystick.h \ - listbox.h \ - mdi.h \ - menu.h \ - menuitem.h \ - minifram.h \ - notebook.h \ - palette.h \ - pen.h \ - radiobox.h \ - radiobut.h \ - region.h \ - scrolbar.h \ - settings.h \ - slider.h \ - spinbutt.h \ - statbmp.h \ - statbox.h \ - statline.h \ - stattext.h \ - tbargtk.h \ - textctrl.h \ - timer.h \ - tooltip.h \ - treectrl.h \ - wave.h \ - win_gtk.h \ - window.h - -# why do these get installed ? -# info.xpm \ -# question.xpm \ -# error.xpm \ -# warning.xpm diff --git a/include/wx/html/Makefile.am b/include/wx/html/Makefile.am deleted file mode 100644 index 68fa19b4b5..0000000000 --- a/include/wx/html/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx/html subdir) -## Author: Harm van der Heijden -## -## Process this file with automake to produce Makefile.in - -wx_html_includedir = ${includedir}/wx/html -wx_html_include_HEADERS = \ -forcelink.h \ -htmlcell.h \ -htmldefs.h \ -htmlfilter.h \ -htmlhelp.h \ -htmlparser.h \ -htmltag.h \ -htmlwin.h \ -htmlwinparser.h \ -mod_templ.h \ -version.h diff --git a/include/wx/motif/Makefile.am b/include/wx/motif/Makefile.am deleted file mode 100644 index cbd7bdeda6..0000000000 --- a/include/wx/motif/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx/motif subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -wx_motif_includedir = ${includedir}/wx/motif -wx_motif_include_HEADERS = \ - accel.h \ - app.h \ - bitmap.h \ - bmpbuttn.h \ - brush.h \ - button.h \ - checkbox.h \ - checklst.h \ - choice.h \ - clipbrd.h \ - colordlg.h \ - colour.h \ - combobox.h \ - control.h \ - cursor.h \ - dataobj.h \ - dc.h \ - dcclient.h \ - dcmemory.h \ - dcprint.h \ - dcscreen.h \ - dialog.h \ - dirdlg.h \ - dnd.h \ - filedlg.h \ - font.h \ - fontdlg.h \ - frame.h \ - gauge.h \ - gdiobj.h \ - helpxxxx.h \ - icon.h \ - joystick.h \ - listbox.h \ - mdi.h \ - menu.h \ - menuitem.h \ - metafile.h \ - minifram.h \ - msgdlg.h \ - palette.h \ - pen.h \ - print.h \ - printdlg.h \ - private.h \ - radiobox.h \ - radiobut.h \ - region.h \ - scrolbar.h \ - settings.h \ - slider.h \ - spinbutt.h \ - statbmp.h \ - statbox.h \ - stattext.h \ - tabctrl.h \ - taskbar.h \ - textctrl.h \ - timer.h \ - toolbar.h \ - wave.h \ - window.h - -# setup.h is installed in another directory because several versions of wxwin -# should be able to coexist on the same machine -portheadersdir = ${datadir}/@PACKAGE@/include/wx -portheaders_HEADERS = setup.h - diff --git a/include/wx/protocol/Makefile.am b/include/wx/protocol/Makefile.am deleted file mode 100644 index 6607bc630d..0000000000 --- a/include/wx/protocol/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx/protocol subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -wx_protocol_includedir = ${includedir}/wx/protocol -wx_protocol_include_HEADERS = file.h ftp.h http.h protocol.h - diff --git a/include/wx/unix/Makefile.am b/include/wx/unix/Makefile.am deleted file mode 100644 index b213b1d9d4..0000000000 --- a/include/wx/unix/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## Purpose: The automake makefile for wxWindows (include/wx/unix subdir) -## Author: Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -wx_unix_includedir = ${includedir}/wx/unix -wx_unix_include_HEADERS = execute.h - diff --git a/include/wx/version.h b/include/wx/version.h index e22c21138e..14c4152056 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -18,7 +18,7 @@ #define wxRELEASE_NUMBER 0 #define wxVERSION_STRING "wxWindows 2.1.0" #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER -#define wxBETA_NUMBER 8 +#define wxBETA_NUMBER 9 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0) #endif diff --git a/samples/.cvsignore b/samples/.cvsignore index 70845e08eb..e69de29bb2 100644 --- a/samples/.cvsignore +++ b/samples/.cvsignore @@ -1 +0,0 @@ -Makefile.in diff --git a/samples/Makefile.am b/samples/Makefile.am deleted file mode 100644 index d119098a49..0000000000 --- a/samples/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# The makefile for wxWindows samples: only one sample is always built, the -# minimal one, the other samples to build are determined at configure time -# because many of them require the library to have some features compiled into -# it) -# -# $Id$ - -SUBDIRS = minimal \ - @SAMPLES_SUBDIRS@ - -# do nothing during "make [un]install" in the samples subdirectory (can't -# override install because install-recursive is its dependency which is still -# built) -# -# this results in warnings from make about "overriding commands for garget -# install-recursive", but it's more than compensated by the time we gain by not -# entering/leaving all samples directories (but if somebody has a better -# solution it would be welcome!) -install-recursive: - @true - -uninstall-recursive: - @true - diff --git a/samples/Makefile.in b/samples/Makefile.in new file mode 100644 index 0000000000..80f1032767 --- /dev/null +++ b/samples/Makefile.in @@ -0,0 +1,72 @@ +# +# Makefile : Builds wxWindows samples for Unix. +# + +all: + cp -u -r @top_srcdir@/samples .. + cd bombs; make + cd checklst; make + cd config; make + cd controls; make + cd dialogs; make + cd docview; make + cd docvwmdi; make + cd dynamic; make + cd fractal; make + cd grid; make + cd help; make + cd image; make + cd internat; make + cd layout; make + cd listctrl; make + cd memcheck; make + cd minifram; make + cd minimal; make + cd notebook; make + cd printing; make + cd proplist; make + cd resource; make + cd sashtest; make + cd splitter; make + cd text; make + cd toolbar; make + cd typetest; make + cd validate; make + cd treectrl; make + cd wxpoem; make + cd dnd; make + cd thread; make + +clean: + cd bombs; make clean + cd checklst; make clean + cd config; make clean + cd controls; make clean + cd dialogs; make clean + cd docview; make clean + cd docvwmdi; make clean + cd dynamic; make clean + cd fractal; make clean + cd grid; make clean + cd help; make clean + cd image; make clean + cd internat; make clean + cd layout; make clean + cd listctrl; make clean + cd memcheck; make clean + cd minifram; make clean + cd minimal; make clean + cd notebook; make clean + cd printing; make clean + cd proplist; make clean + cd resource; make clean + cd sashtest; make clean + cd splitter; make clean + cd toolbar; make clean + cd typetest; make clean + cd validate; make clean + cd treectrl; make clean + cd wxpoem; make clean + cd dnd; make clean + cd thread; make clean + diff --git a/samples/bombs/.cvsignore b/samples/bombs/.cvsignore index f5eaa1a859..e69de29bb2 100644 --- a/samples/bombs/.cvsignore +++ b/samples/bombs/.cvsignore @@ -1,2 +0,0 @@ -Makefile.in - diff --git a/samples/bombs/Makefile.am b/samples/bombs/Makefile.am deleted file mode 100644 index 01414e1f40..0000000000 --- a/samples/bombs/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = bombs - -bombs_SOURCES = bombs.cpp bombs1.cpp game.cpp diff --git a/samples/bombs/Makefile.in b/samples/bombs/Makefile.in new file mode 100644 index 0000000000..a502d5da53 --- /dev/null +++ b/samples/bombs/Makefile.in @@ -0,0 +1,20 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for bombs example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=bombs + +OBJECTS = bombs.o bombs1.o game.o + +include ../../src/makeprog.env + diff --git a/samples/bombs/makefile.unx b/samples/bombs/makefile.unx deleted file mode 100644 index 118dabbfd4..0000000000 --- a/samples/bombs/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for bombs example (UNIX). - -PROGRAM=bombs - -OBJECTS = bombs.o bombs1.o game.o - -include ../../src/makeprog.env - diff --git a/samples/caret/.cvsignore b/samples/caret/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/caret/.cvsignore +++ b/samples/caret/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/caret/Makefile.am b/samples/caret/Makefile.am deleted file mode 100644 index 7c7262b290..0000000000 --- a/samples/caret/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = caret - -caret_SOURCES = caret.cpp diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in new file mode 100644 index 0000000000..8643c70183 --- /dev/null +++ b/samples/caret/Makefile.in @@ -0,0 +1,20 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for caret example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=caret + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx deleted file mode 100644 index e7897f65e8..0000000000 --- a/samples/caret/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for caret example (UNIX). - -PROGRAM=caret - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - diff --git a/samples/checklst/.cvsignore b/samples/checklst/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/checklst/.cvsignore +++ b/samples/checklst/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/checklst/Makefile.am b/samples/checklst/Makefile.am deleted file mode 100644 index e2fda8e9c2..0000000000 --- a/samples/checklst/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = checklst - -checklst_SOURCES = checklst.cpp diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in new file mode 100644 index 0000000000..4bc8493433 --- /dev/null +++ b/samples/checklst/Makefile.in @@ -0,0 +1,20 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for checklst example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=checklst + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/config/.cvsignore b/samples/config/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/config/.cvsignore +++ b/samples/config/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/config/Makefile.am b/samples/config/Makefile.am deleted file mode 100644 index 61ddbf43f3..0000000000 --- a/samples/config/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = conftest - -conftest_SOURCES = conftest.cpp diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in new file mode 100644 index 0000000000..a0b7361ec5 --- /dev/null +++ b/samples/config/Makefile.in @@ -0,0 +1,20 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for config example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=conftest + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx deleted file mode 100644 index 892ffd1f30..0000000000 --- a/samples/config/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for config example (UNIX). - -PROGRAM=conftest - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - diff --git a/samples/controls/.cvsignore b/samples/controls/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/controls/.cvsignore +++ b/samples/controls/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/controls/Makefile.am b/samples/controls/Makefile.am deleted file mode 100644 index cd8cd39d21..0000000000 --- a/samples/controls/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = controls - -controls_SOURCES = controls.cpp diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in new file mode 100644 index 0000000000..5ae328b70d --- /dev/null +++ b/samples/controls/Makefile.in @@ -0,0 +1,20 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for controls example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=controls + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx deleted file mode 100644 index 8e5eeb17a1..0000000000 --- a/samples/controls/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for controls example (UNIX). - -PROGRAM=controls - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - diff --git a/samples/makefile.unx b/samples/makefile.unx deleted file mode 100644 index 9ceed0d702..0000000000 --- a/samples/makefile.unx +++ /dev/null @@ -1,82 +0,0 @@ -# -# Makefile : Builds wxWindows utils for Unix. - -# Replace this with your own path if necessary -WXDIR = .. - -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/make.env - -TARGET=motif - -# Change these if needed. - -THISDIR = $(WXDIR)/samples - -all: - cd bombs; $(MAKE) -f makefile.unx $(TARGET) - cd config; $(MAKE) -f makefile.unx $(TARGET) - cd controls; $(MAKE) -f makefile.unx $(TARGET) - cd dialogs; $(MAKE) -f makefile.unx $(TARGET) - cd docview; $(MAKE) -f makefile.unx $(TARGET) - cd docvwmdi; $(MAKE) -f makefile.unx $(TARGET) - cd dynamic; $(MAKE) -f makefile.unx $(TARGET) - cd fractal; $(MAKE) -f makefile.unx $(TARGET) - cd grid; $(MAKE) -f makefile.unx $(TARGET) - cd help; $(MAKE) -f makefile.unx $(TARGET) - cd image; $(MAKE) -f makefile.unx $(TARGET) - cd internat; $(MAKE) -f makefile.unx $(TARGET) - cd layout; $(MAKE) -f makefile.unx $(TARGET) - cd memcheck; $(MAKE) -f makefile.unx $(TARGET) - cd minifram; $(MAKE) -f makefile.unx $(TARGET) - cd minimal; $(MAKE) -f makefile.unx $(TARGET) - cd notebook; $(MAKE) -f makefile.unx $(TARGET) - cd printing; $(MAKE) -f makefile.unx $(TARGET) - cd proplist; $(MAKE) -f makefile.unx $(TARGET) - cd resource; $(MAKE) -f makefile.unx $(TARGET) - cd sashtest; $(MAKE) -f makefile.unx $(TARGET) - cd splitter; $(MAKE) -f makefile.unx $(TARGET) - cd tab; $(MAKE) -f makefile.unx $(TARGET) - cd toolbar; $(MAKE) -f makefile.unx $(TARGET) - cd typetest; $(MAKE) -f makefile.unx $(TARGET) - cd validate; $(MAKE) -f makefile.unx $(TARGET) - cd treectrl; $(MAKE) -f makefile.unx $(TARGET) - cd wxpoem; $(MAKE) -f makefile.unx $(TARGET) - cd dnd; $(MAKE) -f makefile.unx $(TARGET) - cd thread; $(MAKE) -f makefile.unx $(TARGET) - -clean: - cd bombs; $(MAKE) -f makefile.unx clean$(TARGET) - cd config; $(MAKE) -f makefile.unx clean$(TARGET) - cd controls; $(MAKE) -f makefile.unx clean$(TARGET) - cd dialogs; $(MAKE) -f makefile.unx clean$(TARGET) - cd docview; $(MAKE) -f makefile.unx clean$(TARGET) - cd docvwmdi; $(MAKE) -f makefile.unx clean$(TARGET) - cd dynamic; $(MAKE) -f makefile.unx clean$(TARGET) - cd fractal; $(MAKE) -f makefile.unx clean$(TARGET) - cd grid; $(MAKE) -f makefile.unx clean$(TARGET) - cd help; $(MAKE) -f makefile.unx clean$(TARGET) - cd image; $(MAKE) -f makefile.unx clean$(TARGET) - cd internat; $(MAKE) -f makefile.unx clean$(TARGET) - cd layout; $(MAKE) -f makefile.unx clean$(TARGET) - cd memcheck; $(MAKE) -f makefile.unx clean$(TARGET) - cd minifram; $(MAKE) -f makefile.unx clean$(TARGET) - cd minimal; $(MAKE) -f makefile.unx clean$(TARGET) - cd notebook; $(MAKE) -f makefile.unx clean$(TARGET) - cd printing; $(MAKE) -f makefile.unx clean$(TARGET) - cd proplist; $(MAKE) -f makefile.unx clean$(TARGET) - cd resource; $(MAKE) -f makefile.unx clean$(TARGET) - cd sashtest; $(MAKE) -f makefile.unx clean$(TARGET) - cd splitter; $(MAKE) -f makefile.unx clean$(TARGET) - cd tab; $(MAKE) -f makefile.unx clean$(TARGET) - cd toolbar; $(MAKE) -f makefile.unx clean$(TARGET) - cd typetest; $(MAKE) -f makefile.unx clean$(TARGET) - cd validate; $(MAKE) -f makefile.unx clean$(TARGET) - cd treectrl; $(MAKE) -f makefile.unx clean$(TARGET) - cd wxpoem; $(MAKE) -f makefile.unx clean$(TARGET) - cd dnd; $(MAKE) -f makefile.unx clean$(TARGET) - cd thread; $(MAKE) -f makefile.unx clean$(TARGET) - -cleanmotif: clean -motif: all diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 60d2de7b85..0000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## Purpose: The automake makefile for wxWindows (src direcotry) -## Author: Phil Blecker, Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -SUBDIRS = ${TOOLKIT_DIR} diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am deleted file mode 100644 index bc745946f1..0000000000 --- a/src/gtk/Makefile.am +++ /dev/null @@ -1,256 +0,0 @@ -## Purpose: The automake makefile for wxWindows (src/gtk subdirectory) -## Author: Phil Blecker, Vadim Zeitlin, Robert Roebling -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = 1.3 -# no-dependencies - -SUFFIXES = .cpp .c - -DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) -LIBS = $(GUILIBS) - -VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH} - -lib_LTLIBRARIES = @WX_LIBRARY_NAME@ -EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la libwx_msw.la - -# empty Motif library -libwx_motif_la_SOURCES = - -# empty MSW/WINE library -libwx_msw_la_SOURCES = - -# these are the common files which always make part of the library -libwx_gtk_la_SOURCES = \ -\ - win_gtk.c \ - extended.c \ - parser.c \ - gsocket.c \ - gsockgtk.c \ -\ - cmndata.cpp \ - config.cpp \ - date.cpp \ - datstrm.cpp \ - dcbase.cpp \ - dlgcmn.cpp \ - docmdi.cpp \ - docview.cpp \ - dynarray.cpp \ - dynlib.cpp \ - event.cpp \ - ffile.cpp \ - file.cpp \ - fileconf.cpp \ - filefn.cpp \ - filesys.cpp \ - framecmn.cpp \ - fs_inet.cpp \ - fs_zip.cpp \ - ftp.cpp \ - gdicmn.cpp \ - hash.cpp \ - helpbase.cpp \ - http.cpp \ - image.cpp \ - imagbmp.cpp \ - imaggif.cpp \ - imagjpeg.cpp \ - imagpng.cpp \ - intl.cpp \ - ipcbase.cpp \ - layout.cpp \ - list.cpp \ - log.cpp \ - longlong.cpp \ - matrix.cpp \ - memory.cpp \ - mimetype.cpp \ - module.cpp \ - mstream.cpp \ - object.cpp \ - objstrm.cpp \ - odbc.cpp \ - paper.cpp \ - prntbase.cpp \ - process.cpp \ - protocol.cpp \ - resource.cpp \ - sckaddr.cpp \ - sckfile.cpp \ - sckipc.cpp \ - sckstrm.cpp \ - serbase.cpp \ - sizer.cpp \ - socket.cpp \ - strconv.cpp \ - stream.cpp \ - string.cpp \ - tbarbase.cpp \ - tbarsmpl.cpp \ - textcmn.cpp \ - textfile.cpp \ - txtstrm.cpp \ - time.cpp \ - timercmn.cpp \ - tokenzr.cpp \ - unzip.c \ - url.cpp \ - utilscmn.cpp \ - valgen.cpp \ - validate.cpp \ - valtext.cpp \ - variant.cpp \ - wfstream.cpp \ - wincmn.cpp \ - wxchar.cpp \ - wxexpr.cpp \ - zstream.cpp \ - zipstrm.cpp \ -\ - db.cpp \ - dbtable.cpp \ -\ - busyinfo.cpp \ - caret.cpp \ - choicdgg.cpp \ - colrdlgg.cpp \ - dcpsg.cpp \ - dirdlgg.cpp \ - fontdlgg.cpp \ - gridg.cpp \ - helpext.cpp \ - helpwxht.cpp \ - helphtml.cpp \ - imaglist.cpp \ - laywin.cpp \ - listctrl.cpp \ - msgdlgg.cpp \ - numdlgg.cpp \ - panelg.cpp \ - printps.cpp \ - prntdlgg.cpp \ - progdlgg.cpp \ - prop.cpp \ - propform.cpp \ - proplist.cpp \ - sashwin.cpp \ - scrolwin.cpp \ - splitter.cpp \ - statusbr.cpp \ - tabg.cpp \ - textdlgg.cpp \ - tipdlg.cpp \ - treectrl.cpp \ -\ - threadpsx.cpp \ - utilsunx.cpp \ -\ - accel.cpp \ - app.cpp \ - bitmap.cpp \ - bmpbuttn.cpp \ - brush.cpp \ - button.cpp \ - checkbox.cpp \ - checklst.cpp \ - choice.cpp \ - clipbrd.cpp \ - colour.cpp \ - combobox.cpp \ - control.cpp \ - cursor.cpp \ - data.cpp \ - dataobj.cpp \ - dc.cpp \ - dcclient.cpp \ - dcmemory.cpp \ - dcscreen.cpp \ - dialog.cpp \ - dnd.cpp \ - filedlg.cpp \ - font.cpp \ - frame.cpp \ - gauge.cpp \ - gdiobj.cpp \ - icon.cpp \ - listbox.cpp \ - main.cpp \ - mdi.cpp \ - menu.cpp \ - minifram.cpp \ - notebook.cpp \ - palette.cpp \ - pen.cpp \ - radiobox.cpp \ - radiobut.cpp \ - region.cpp \ - scrolbar.cpp \ - settings.cpp \ - slider.cpp \ - spinbutt.cpp \ - statbmp.cpp \ - statbox.cpp \ - statline.cpp \ - stattext.cpp \ - tbargtk.cpp \ - textctrl.cpp \ - timer.cpp \ - tooltip.cpp \ - utilsgtk.cpp \ - utilsres.cpp \ - wave.cpp \ - window.cpp \ -\ - htmlcell.cpp \ - htmlfilter.cpp \ - htmlhelp.cpp \ - htmlhelp_io.cpp \ - htmlparser.cpp \ - htmltag.cpp \ - htmlwin.cpp \ - htmlwinparser.cpp \ - mod_fonts.cpp \ - mod_hline.cpp \ - mod_image.cpp \ - mod_layout.cpp \ - mod_links.cpp \ - mod_list.cpp \ - mod_pre.cpp \ - mod_tables.cpp \ - search.cpp - - -# these are the sources which we build by our own rules -# -# TODO: parser.y can be included into SOURCES, but for the sake of my life I -# don't know where to put lexer.l - if I put it in the sources too, -# automake tries to build lexer.lo... and fails, of course. (VZ) -BUILT_SOURCES = parser.c lexer.c -parser.c: $(srcdir)/../common/parser.y lexer.c - $(YACC) $(srcdir)/../common/parser.y - @sed -e "s;$(srcdir)/../common/y.tab.c;parser.y;g" < y.tab.c | \ - sed -e "s/BUFSIZ/5000/g" | \ - sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > parser.c - @$(RM) y.tab.c - -lexer.c: $(srcdir)/../common/lexer.l - $(LEX) $(srcdir)/../common/lexer.l - @sed -e "s;$(srcdir)/../common/lex.yy.c;lexer.l;g" < lex.yy.c | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > lexer.c - @$(RM) lex.yy.c - -libwx_gtk_la_LDFLAGS = -rpath @libdir@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -libwx_gtk_la_LIBADD = $(LTLIBOBJS) -libwx_gtk_la_DEPENDENCIES = $(libwx_gtk_la_LIBADD) lexer.l parser.y diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am deleted file mode 100644 index bc745946f1..0000000000 --- a/src/gtk1/Makefile.am +++ /dev/null @@ -1,256 +0,0 @@ -## Purpose: The automake makefile for wxWindows (src/gtk subdirectory) -## Author: Phil Blecker, Vadim Zeitlin, Robert Roebling -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = 1.3 -# no-dependencies - -SUFFIXES = .cpp .c - -DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) -LIBS = $(GUILIBS) - -VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH} - -lib_LTLIBRARIES = @WX_LIBRARY_NAME@ -EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la libwx_msw.la - -# empty Motif library -libwx_motif_la_SOURCES = - -# empty MSW/WINE library -libwx_msw_la_SOURCES = - -# these are the common files which always make part of the library -libwx_gtk_la_SOURCES = \ -\ - win_gtk.c \ - extended.c \ - parser.c \ - gsocket.c \ - gsockgtk.c \ -\ - cmndata.cpp \ - config.cpp \ - date.cpp \ - datstrm.cpp \ - dcbase.cpp \ - dlgcmn.cpp \ - docmdi.cpp \ - docview.cpp \ - dynarray.cpp \ - dynlib.cpp \ - event.cpp \ - ffile.cpp \ - file.cpp \ - fileconf.cpp \ - filefn.cpp \ - filesys.cpp \ - framecmn.cpp \ - fs_inet.cpp \ - fs_zip.cpp \ - ftp.cpp \ - gdicmn.cpp \ - hash.cpp \ - helpbase.cpp \ - http.cpp \ - image.cpp \ - imagbmp.cpp \ - imaggif.cpp \ - imagjpeg.cpp \ - imagpng.cpp \ - intl.cpp \ - ipcbase.cpp \ - layout.cpp \ - list.cpp \ - log.cpp \ - longlong.cpp \ - matrix.cpp \ - memory.cpp \ - mimetype.cpp \ - module.cpp \ - mstream.cpp \ - object.cpp \ - objstrm.cpp \ - odbc.cpp \ - paper.cpp \ - prntbase.cpp \ - process.cpp \ - protocol.cpp \ - resource.cpp \ - sckaddr.cpp \ - sckfile.cpp \ - sckipc.cpp \ - sckstrm.cpp \ - serbase.cpp \ - sizer.cpp \ - socket.cpp \ - strconv.cpp \ - stream.cpp \ - string.cpp \ - tbarbase.cpp \ - tbarsmpl.cpp \ - textcmn.cpp \ - textfile.cpp \ - txtstrm.cpp \ - time.cpp \ - timercmn.cpp \ - tokenzr.cpp \ - unzip.c \ - url.cpp \ - utilscmn.cpp \ - valgen.cpp \ - validate.cpp \ - valtext.cpp \ - variant.cpp \ - wfstream.cpp \ - wincmn.cpp \ - wxchar.cpp \ - wxexpr.cpp \ - zstream.cpp \ - zipstrm.cpp \ -\ - db.cpp \ - dbtable.cpp \ -\ - busyinfo.cpp \ - caret.cpp \ - choicdgg.cpp \ - colrdlgg.cpp \ - dcpsg.cpp \ - dirdlgg.cpp \ - fontdlgg.cpp \ - gridg.cpp \ - helpext.cpp \ - helpwxht.cpp \ - helphtml.cpp \ - imaglist.cpp \ - laywin.cpp \ - listctrl.cpp \ - msgdlgg.cpp \ - numdlgg.cpp \ - panelg.cpp \ - printps.cpp \ - prntdlgg.cpp \ - progdlgg.cpp \ - prop.cpp \ - propform.cpp \ - proplist.cpp \ - sashwin.cpp \ - scrolwin.cpp \ - splitter.cpp \ - statusbr.cpp \ - tabg.cpp \ - textdlgg.cpp \ - tipdlg.cpp \ - treectrl.cpp \ -\ - threadpsx.cpp \ - utilsunx.cpp \ -\ - accel.cpp \ - app.cpp \ - bitmap.cpp \ - bmpbuttn.cpp \ - brush.cpp \ - button.cpp \ - checkbox.cpp \ - checklst.cpp \ - choice.cpp \ - clipbrd.cpp \ - colour.cpp \ - combobox.cpp \ - control.cpp \ - cursor.cpp \ - data.cpp \ - dataobj.cpp \ - dc.cpp \ - dcclient.cpp \ - dcmemory.cpp \ - dcscreen.cpp \ - dialog.cpp \ - dnd.cpp \ - filedlg.cpp \ - font.cpp \ - frame.cpp \ - gauge.cpp \ - gdiobj.cpp \ - icon.cpp \ - listbox.cpp \ - main.cpp \ - mdi.cpp \ - menu.cpp \ - minifram.cpp \ - notebook.cpp \ - palette.cpp \ - pen.cpp \ - radiobox.cpp \ - radiobut.cpp \ - region.cpp \ - scrolbar.cpp \ - settings.cpp \ - slider.cpp \ - spinbutt.cpp \ - statbmp.cpp \ - statbox.cpp \ - statline.cpp \ - stattext.cpp \ - tbargtk.cpp \ - textctrl.cpp \ - timer.cpp \ - tooltip.cpp \ - utilsgtk.cpp \ - utilsres.cpp \ - wave.cpp \ - window.cpp \ -\ - htmlcell.cpp \ - htmlfilter.cpp \ - htmlhelp.cpp \ - htmlhelp_io.cpp \ - htmlparser.cpp \ - htmltag.cpp \ - htmlwin.cpp \ - htmlwinparser.cpp \ - mod_fonts.cpp \ - mod_hline.cpp \ - mod_image.cpp \ - mod_layout.cpp \ - mod_links.cpp \ - mod_list.cpp \ - mod_pre.cpp \ - mod_tables.cpp \ - search.cpp - - -# these are the sources which we build by our own rules -# -# TODO: parser.y can be included into SOURCES, but for the sake of my life I -# don't know where to put lexer.l - if I put it in the sources too, -# automake tries to build lexer.lo... and fails, of course. (VZ) -BUILT_SOURCES = parser.c lexer.c -parser.c: $(srcdir)/../common/parser.y lexer.c - $(YACC) $(srcdir)/../common/parser.y - @sed -e "s;$(srcdir)/../common/y.tab.c;parser.y;g" < y.tab.c | \ - sed -e "s/BUFSIZ/5000/g" | \ - sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > parser.c - @$(RM) y.tab.c - -lexer.c: $(srcdir)/../common/lexer.l - $(LEX) $(srcdir)/../common/lexer.l - @sed -e "s;$(srcdir)/../common/lex.yy.c;lexer.l;g" < lex.yy.c | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > lexer.c - @$(RM) lex.yy.c - -libwx_gtk_la_LDFLAGS = -rpath @libdir@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -libwx_gtk_la_LIBADD = $(LTLIBOBJS) -libwx_gtk_la_DEPENDENCIES = $(libwx_gtk_la_LIBADD) lexer.l parser.y diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am deleted file mode 100644 index 1ab35e134a..0000000000 --- a/src/motif/Makefile.am +++ /dev/null @@ -1,254 +0,0 @@ -## Purpose: The automake makefile for wxWindows (src/motif subdirectory) -## Author: Phil Blecker, Vadim Zeitlin -## Version: $Id$ -## -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = 1.3 -# no-dependencies - -SUFFIXES = .cpp .c - -DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) -LIBS = $(GUILIBS) - -VPATH = .:${srcdir}:${srcdir}/xmcombo:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH} - -EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}" - -lib_LTLIBRARIES = @WX_LIBRARY_NAME@ -EXTRA_LTLIBRARIES = libwx_motif.la libwx_gtk.la libwx_msw.la - -# empty GTK library -libwx_gtk_la_SOURCES = - -# empty MSW/WINE library -libwx_msw_la_SOURCES = - -# these are the common files which always make part of the library -libwx_motif_la_SOURCES = \ -\ - extended.c \ - parser.c \ - xmcombo.c \ - gsocket.c \ - gsockmot.cpp \ -\ - cmndata.cpp \ - dynarray.cpp \ - filefn.cpp \ - hash.cpp \ - list.cpp \ - matrix.cpp \ - memory.cpp \ - module.cpp \ - object.cpp \ - strconv.cpp \ - string.cpp \ - timercmn.cpp \ - utilscmn.cpp \ - tokenzr.cpp \ - variant.cpp \ - wxchar.cpp \ -\ - config.cpp \ - date.cpp \ - datstrm.cpp \ - db.cpp \ - dbtable.cpp \ - dcbase.cpp \ - dlgcmn.cpp \ - docmdi.cpp \ - docview.cpp \ - dynlib.cpp \ - event.cpp \ - ffile.cpp \ - file.cpp \ - fileconf.cpp \ - filesys.cpp \ - fs_inet.cpp \ - fs_zip.cpp \ - framecmn.cpp \ - ftp.cpp \ - gdicmn.cpp \ - helpbase.cpp \ - http.cpp \ - image.cpp \ - imagbmp.cpp \ - imaggif.cpp \ - imagjpeg.cpp \ - imagpng.cpp \ - intl.cpp \ - ipcbase.cpp \ - layout.cpp \ - log.cpp \ - longlong.cpp \ - mimetype.cpp \ - mstream.cpp \ - objstrm.cpp \ - odbc.cpp \ - paper.cpp \ - prntbase.cpp \ - process.cpp \ - protocol.cpp \ - resource.cpp \ - sckaddr.cpp \ - sckfile.cpp \ - sckipc.cpp \ - sckstrm.cpp \ - serbase.cpp \ - sizer.cpp \ - socket.cpp \ - stream.cpp \ - tbarbase.cpp \ - tbarsmpl.cpp \ - textcmn.cpp \ - textfile.cpp \ - txtstrm.cpp \ - time.cpp \ - url.cpp \ - valgen.cpp \ - validate.cpp \ - valtext.cpp \ - wfstream.cpp \ - wincmn.cpp \ - wxexpr.cpp \ - unzip.c \ - zipstrm.cpp \ - zstream.cpp \ -\ - busyinfo.cpp \ - caret.cpp \ - choicdgg.cpp \ - colrdlgg.cpp \ - dcpsg.cpp \ - dirdlgg.cpp \ - fontdlgg.cpp \ - gridg.cpp \ - helpext.cpp \ - helphtml.cpp \ - imaglist.cpp \ - laywin.cpp \ - listctrl.cpp \ - numdlgg.cpp \ - panelg.cpp \ - printps.cpp \ - prntdlgg.cpp \ - progdlgg.cpp \ - prop.cpp \ - sashwin.cpp \ - scrolwin.cpp \ - splitter.cpp \ - statusbr.cpp \ - tabg.cpp \ - textdlgg.cpp \ - tipdlg.cpp \ - treectrl.cpp \ -\ - threadpsx.cpp \ - utilsunx.cpp \ -\ - accel.cpp \ - app.cpp \ - bitmap.cpp \ - bmpbuttn.cpp \ - brush.cpp \ - button.cpp \ - checkbox.cpp \ - checklst.cpp \ - choice.cpp \ - clipbrd.cpp \ - colour.cpp \ - combobox.cpp \ - control.cpp \ - cursor.cpp \ - data.cpp \ - dataobj.cpp \ - dc.cpp \ - dcclient.cpp \ - dcmemory.cpp \ - dcscreen.cpp \ - dialog.cpp \ - dnd.cpp \ - filedlg.cpp \ - font.cpp \ - frame.cpp \ - gauge.cpp \ - gdiobj.cpp \ - icon.cpp \ - listbox.cpp \ - main.cpp \ - mdi.cpp \ - menu.cpp \ - menuitem.cpp \ - minifram.cpp \ - msgdlg.cpp \ - notebook.cpp \ - palette.cpp \ - pen.cpp \ - radiobox.cpp \ - radiobut.cpp \ - region.cpp \ - scrolbar.cpp \ - settings.cpp \ - slider.cpp \ - spinbutt.cpp \ - statbmp.cpp \ - statbox.cpp \ - stattext.cpp \ - textctrl.cpp \ - timer.cpp \ - toolbar.cpp \ - utils.cpp \ - window.cpp \ -\ - htmlcell.cpp \ - htmlfilter.cpp \ - htmlhelp.cpp \ - htmlhelp_io.cpp \ - htmlparser.cpp \ - htmltag.cpp \ - htmlwin.cpp \ - htmlwinparser.cpp \ - mod_fonts.cpp \ - mod_hline.cpp \ - mod_image.cpp \ - mod_layout.cpp \ - mod_links.cpp \ - mod_list.cpp \ - mod_pre.cpp \ - mod_tables.cpp \ - search.cpp - -# propform.cpp \ -# proplist.cpp \ - -# these are the sources which we build by our own rules -# -# TODO: parser.y can be included into SOURCES, but for the sake of my life I -# don't know where to put lexer.l - if I put it in the sources too, -# automake tries to build lexer.lo... and fails, of course. (VZ) -BUILT_SOURCES = parser.c lexer.c -parser.c: $(srcdir)/../common/parser.y lexer.c - $(YACC) $(srcdir)/../common/parser.y - @sed -e "s;$(srcdir)/../common/y.tab.c;parser.y;g" < y.tab.c | \ - sed -e "s/BUFSIZ/5000/g" | \ - sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > parser.c - @$(RM) y.tab.c - -lexer.c: $(srcdir)/../common/lexer.l - $(LEX) $(srcdir)/../common/lexer.l - @sed -e "s;$(srcdir)/../common/lex.yy.c;lexer.l;g" < lex.yy.c | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > lexer.c - @$(RM) lex.yy.c - -libwx_motif_la_LDFLAGS = -rpath @libdir@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -libwx_motif_la_LIBADD = $(LTLIBOBJS) -libwx_motif_la_DEPENDENCIES = $(libwx_motif_la_LIBADD) lexer.l parser.y diff --git a/wxGTK.spec b/wxGTK.spec index e0839a4e80..2f53edd46a 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,7 +1,7 @@ # Note that this is NOT a relocatable package %define pref /usr %define ver 2.1.0 -%define rel 8 +%define rel 9 Summary: The GTK+ 1.2 port of the wxWindows library Name: wxGTK @@ -9,7 +9,7 @@ Version: %{ver} Release: %{rel} Copyright: wxWindows Licence Group: X11/Libraries -Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b8.tgz +Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b9.tgz URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html Packager: Robert Roebling Requires: gtk+ >= 1.2.1