Moved main Makefile.am for wxGTK to /src/gtk

Removed LTLIBOBJECT code from configure with
    excpetion of PNG, JPEG, ZLIB and iODBC
  Added missing #ifdef for the Xkbdetectauto thing


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

configure.in

@@ -30,7 +30,7 @@ dnl       never defined in configure.in (remove these lines to see what I'm
 dnl       speaking about) - Tom Tromey <tromey@cygnus.com> told me that it will
 dnl       be fixed in the next release.
 LIBOBJS=
-LIBOBJS="$LIBOBJS common/extended.o"
+dnl LIBOBJS="$LIBOBJS common/extended.o"
 
 dnl ------------------------------------------------------------------------
 dnl Check platform (host system)
@@ -148,7 +148,7 @@ esac
 if test "$USE_UNIX" = 1 ; then
   wxUSE_UNIX=yes
   AC_DEFINE(__UNIX__)
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"
+  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/../unix"
   INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
 fi
 
@@ -934,9 +934,7 @@ if test "$wxUSE_GTK" = 1; then
 
   TOOLKIT_INCLUDE="$GTK_CFLAGS"
   GUI_TK_LIBRARY="$GTK_LIBS"
-
   TOOLKIT=GTK
-  LTLIBOBJS="$LTLIBOBJS image.lo utilsgtk.lo win_gtk.lo"
 fi
 
 if test "$wxUSE_MOTIF" = 1; then
@@ -1285,29 +1283,25 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_ZLIB" = "yes" ; then
   AC_DEFINE(wxUSE_ZLIB)
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/zlib"
+  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/../zlib"
   LTLIBOBJS="$LTLIBOBJS adler32.lo compress.lo crc32.lo gzio.lo uncompr.lo deflate.lo trees.lo zutil.lo inflate.lo infblock.lo inftrees.lo infcodes.lo infutil.lo inffast.lo"
-  if eval "test x$wxUSE_STREAMS = x1"; then
-    LTLIBOBJS="$LTLIBOBJS zstream.lo"
-  fi
 fi
 
 if test "$wxUSE_LIBPNG" = "yes" ; then
   AC_DEFINE(wxUSE_LIBPNG)
-  LTLIBOBJS="$LTLIBOBJS imagpng.lo png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo pngwutil.lo pngread.lo pngrio.lo pngwio.lo pngwrite.lo pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo"
+  LTLIBOBJS="$LTLIBOBJS png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo pngwutil.lo pngread.lo pngrio.lo pngwio.lo pngwrite.lo pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo"
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/png"
+  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/../png"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
 if test "$wxUSE_LIBGIF" = "yes" ; then
   AC_DEFINE(wxUSE_LIBGIF)
-  LTLIBOBJS="$LTLIBOBJS imaggif.lo"
 fi
 
 if test "$wxUSE_LIBJPEG" = "yes" ; then
   AC_DEFINE(wxUSE_LIBJPEG)
-  EXTRA_VPATH="$EXTRA_VPATH:\${srcdir}/jpeg"
+  EXTRA_VPATH="$EXTRA_VPATH:\${srcdir}/../jpeg"
-  LTLIBOBJS="$LTLIBOBJS imagjpeg.lo \
+  LTLIBOBJS="$LTLIBOBJS \
              jcomapi.lo jutils.lo jerror.lo jmemmgr.lo jmemnobs.lo \
              jcapimin.lo jcapistd.lo jctrans.lo jcparam.lo jdatadst.lo \
              jcinit.lo jcmaster.lo jcmarker.lo jcmainct.lo jcprepct.lo \
@@ -1354,13 +1348,13 @@ if test "$wxUSE_GUI" = "yes"; then
   dnl    need the dcs, pens, brushes, ...), this just can't be done now
   dnl 4. menu stuff: wxMenu, wxMenuBar, wxMenuItem
   dnl 5. misc stuff: timers, settings, message box
-  LTLIBOBJS="$LTLIBOBJS \
+  dnl   LTLIBOBJS="$LTLIBOBJS \
-main.lo app.lo event.lo wincmn.lo window.lo control.lo framecmn.lo frame.lo dialog.lo panelg.lo \
+  dnl main.lo app.lo event.lo wincmn.lo window.lo control.lo framecmn.lo frame.lo dialog.lo panelg.lo \
-button.lo stattext.lo textctrl.lo \
+  dnl button.lo stattext.lo textctrl.lo \
-bitmap.lo brush.lo colour.lo cursor.lo data.lo dc.lo dcbase.lo dcclient.lo \
+  dnl bitmap.lo brush.lo colour.lo cursor.lo data.lo dc.lo dcbase.lo dcclient.lo \
-dcmemory.lo dcscreen.lo font.lo gdicmn.lo gdiobj.lo icon.lo palette.lo pen.lo region.lo \
+  dnl dcmemory.lo dcscreen.lo font.lo gdicmn.lo gdiobj.lo icon.lo palette.lo pen.lo region.lo \
-menu.lo \
+  dnl menu.lo \
-settings.lo timer.lo msgdlgg.lo"
+  dnl settings.lo timer.lo msgdlgg.lo"
 else
   AC_DEFINE(wxUSE_NOGUI)
 fi
@@ -1371,7 +1365,6 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_UNIX" = "yes"; then
   AC_DEFINE(wxUSE_UNIX)
-  LTLIBOBJS="$LTLIBOBJS utilsunx.lo"
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -1380,18 +1373,15 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_APPLE_IEEE" = "yes"; then
   AC_DEFINE(wxUSE_APPLE_IEEE)
-  LTLIBOBJS="$LTLIBOBJS extended.lo"
 fi
 
 if test "$wxUSE_TIMEDATE" = "yes"; then
   AC_DEFINE(wxUSE_TIMEDATE)
-  LTLIBOBJS="$LTLIBOBJS date.lo time.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
 if test "$wxUSE_FILE" = "yes"; then
   AC_DEFINE(wxUSE_FILE)
-  LTLIBOBJS="$LTLIBOBJS file.lo"
 fi
 
 if test "$wxUSE_TEXTFILE" = "yes"; then
@@ -1399,7 +1389,6 @@ if test "$wxUSE_TEXTFILE" = "yes"; then
     AC_MSG_WARN(wxTextFile requires wxFile and it won't be compiled without it)
   else
     AC_DEFINE(wxUSE_TEXTFILE)
-    LTLIBOBJS="$LTLIBOBJS textfile.lo"
   fi
 fi
 
@@ -1408,7 +1397,6 @@ if test "$wxUSE_CONFIG" = "yes" ; then
     AC_MSG_WARN(wxConfig requires wxTextFile and it won't be compiled without it)
   else
     AC_DEFINE(wxUSE_CONFIG)
-    LTLIBOBJS="$LTLIBOBJS config.lo fileconf.lo"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
   fi
 fi
@@ -1418,25 +1406,21 @@ if test "$wxUSE_INTL" = "yes" ; then
     AC_MSG_WARN(I18n code requires wxFile and it won't be compiled without it)
   else
     AC_DEFINE(wxUSE_INTL)
-    LTLIBOBJS="$LTLIBOBJS intl.lo"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
   fi
 fi
 
 if test "$wxUSE_LOG" = "yes"; then
   AC_DEFINE(wxUSE_LOG)
-  LTLIBOBJS="$LTLIBOBJS log.lo"
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
   AC_DEFINE(wxUSE_LONGLONG)
-  LTLIBOBJS="$LTLIBOBJS longlong.lo"
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     if test "$wxUSE_THREADS" = "yes" ; then
         AC_DEFINE(wxUSE_SOCKETS)
-        LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo"
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
         INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
     else
@@ -1447,10 +1431,6 @@ fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
   AC_DEFINE(wxUSE_STREAMS)
-  LTLIBOBJS="$LTLIBOBJS stream.lo wfstream.lo datstrm.lo mstream.lo objstrm.lo"
-  if test "$wxUSE_SOCKETS" = "yes" ; then
-    LTLIBOBJS="$LTLIBOBJS sckstrm.lo"
-  fi
 fi
 
 if test "$wxUSE_SERIAL" = "yes" ; then
@@ -1494,7 +1474,6 @@ if test "$wxUSE_JOYSTICK" = 1; then
   AC_CHECK_HEADERS(linux/joystick.h)
   if test "$ac_cv_header_linux_joystick_h" = "yes"; then
     AC_DEFINE(wxUSE_JOYSTICK)
-    LTLIBOBJS="$LTLIBOBJS joystick.lo"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
   fi
 fi
@@ -1524,7 +1503,6 @@ fi
 
 if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
   AC_DEFINE(wxUSE_DYNLIB_CLASS)
-  LTLIBOBJS="$LTLIBOBJS dynlib.lo"
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -1546,7 +1524,7 @@ dnl ----------------------------------------------------------------
 IODBC_C_SRC=""
 if test "$wxUSE_ODBC" = "yes" ; then
   AC_DEFINE(wxUSE_ODBC)
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/iodbc"
+  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/../iodbc"
   LTLIBOBJS="$LTLIBOBJS catalog.lo connect.lo dlf.lo dlproc.lo execute.lo fetch.lo hdbc.lo henv.lo herr.lo hstmt.lo info.lo itrace.lo misc.lo prepare.lo result.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
 fi
@@ -1557,7 +1535,6 @@ dnl ----------------------------------------------------------------
 
 if test "$wxUSE_POSTSCRIPT" = "yes" ; then
   AC_DEFINE(wxUSE_POSTSCRIPT)
-  LTLIBOBJS="$LTLIBOBJS printps.lo dcpsg.lo"
 fi
 
 AC_DEFINE(wxUSE_AFM_FOR_POSTSCRIPT)
@@ -1570,42 +1547,34 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_CONSTRAINTS" = "yes"; then
   AC_DEFINE(wxUSE_CONSTRAINTS)
-
-  LTLIBOBJS="$LTLIBOBJS layout.lo laywin.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
   AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
-  LTLIBOBJS="$LTLIBOBJS mdi.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
   AC_DEFINE(wxUSE_DOC_VIEW_ARCHITECTURE)
-  LTLIBOBJS="$LTLIBOBJS docview.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
   if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    LTLIBOBJS="$LTLIBOBJS docmdi.lo"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
   fi
 fi
 
 if test "$wxUSE_HELP" = "yes"; then
   AC_DEFINE(wxUSE_HELP)
-  LTLIBOBJS="$LTLIBOBJS helpext.lo helphtml.lo helpbase.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 fi
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
   AC_DEFINE(wxUSE_PRINTING_ARCHITECTURE)
-  LTLIBOBJS="$LTLIBOBJS prntbase.lo paper.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
 if test "$wxUSE_PROLOGIO" = "yes" ; then
   AC_DEFINE(wxUSE_PROLOGIO)
-  LTLIBOBJS="$LTLIBOBJS wxexpr.lo parser.lo"
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then
@@ -1631,22 +1600,16 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_IPC" = "yes"; then
   AC_DEFINE(wxUSE_IPC)
-  LTLIBOBJS="$LTLIBOBJS ipcbase.lo sckipc.lo"
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
   AC_DEFINE(wxUSE_CLIPBOARD)
-  LTLIBOBJS="$LTLIBOBJS clipbrd.lo dataobj.lo"
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
   if test "$WXGTK12" = 1 ; then
     AC_DEFINE(wxUSE_DRAG_AND_DROP)
-    LTLIBOBJS="$LTLIBOBJS dnd.lo"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
-    if test "$wxUSE_CLIPBOARD" != "yes"; then
-      LTLIBOBJS="$LTLIBOBJS dataobj.lo"
-    fi
   else
     AC_MSG_WARN(drag and drop is only supported under GTK 1.2)
   fi
@@ -1662,61 +1625,50 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_ACCEL" = "yes"; then
   AC_DEFINE(wxUSE_ACCEL)
-  LTLIBOBJS="$LTLIBOBJS accel.lo"
 fi
 
 if test "$wxUSE_CARET" = "yes"; then
   AC_DEFINE(wxUSE_CARET)
-  LTLIBOBJS="$LTLIBOBJS caret.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
 if test "$wxUSE_COMBOBOX" = "yes"; then
   AC_DEFINE(wxUSE_COMBOBOX)
-  LTLIBOBJS="$LTLIBOBJS choice.lo combobox.lo"
 fi
 
 if test "$wxUSE_BMPBUTTON" = "yes"; then
   AC_DEFINE(wxUSE_BMPBUTTON)
-  LTLIBOBJS="$LTLIBOBJS bmpbuttn.lo"
 fi
 
 if test "$wxUSE_CHECKBOX" = "yes"; then
   AC_DEFINE(wxUSE_CHECKBOX)
-  LTLIBOBJS="$LTLIBOBJS checkbox.lo"
 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then
   AC_DEFINE(wxUSE_CHECKLISTBOX)
-  LTLIBOBJS="$LTLIBOBJS checklst.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
 if test "$wxUSE_GAUGE" = "yes"; then
   AC_DEFINE(wxUSE_GAUGE)
-  LTLIBOBJS="$LTLIBOBJS gauge.lo"
 fi
 
 if test "$wxUSE_GRID" = "yes"; then
   AC_DEFINE(wxUSE_GRID)
-  LTLIBOBJS="$LTLIBOBJS gridg.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
 if test "$wxUSE_IMAGLIST" = "yes"; then
   AC_DEFINE(wxUSE_IMAGLIST)
-  LTLIBOBJS="$LTLIBOBJS imaglist.lo"
 fi
 
 if test "$wxUSE_LISTBOX" = "yes"; then
   AC_DEFINE(wxUSE_LISTBOX)
-  LTLIBOBJS="$LTLIBOBJS listbox.lo"
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
   if test "$wxUSE_IMAGLIST" = "yes"; then
     AC_DEFINE(wxUSE_LISTCTRL)
-    LTLIBOBJS="$LTLIBOBJS listctrl.lo"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
   else
     AC_MSG_WARN([wxListCtrl requires wxImageList and won't be compiled without it])
@@ -1725,77 +1677,63 @@ fi
 
 if test "$wxUSE_NOTEBOOK" = "yes"; then
   AC_DEFINE(wxUSE_NOTEBOOK)
-  LTLIBOBJS="$LTLIBOBJS notebook.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
 if test "$wxUSE_RADIOBOX" = "yes"; then
   AC_DEFINE(wxUSE_RADIOBOX)
-  LTLIBOBJS="$LTLIBOBJS radiobox.lo"
 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then
   AC_DEFINE(wxUSE_RADIOBTN)
-  LTLIBOBJS="$LTLIBOBJS radiobut.lo"
 fi
 
 if test "wxUSE_SASH" = 1; then
   AC_DEFINE(wxUSE_SASH)
-  LTLIBOBJS="$LTLIBOBJS sashwin.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
 fi
 
 if test "$wxUSE_SCROLLBAR" = "yes"; then
   AC_DEFINE(wxUSE_SCROLLBAR)
-  LTLIBOBJS="$LTLIBOBJS scrolbar.lo scrolwin.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
 fi
 
 if test "$wxUSE_SLIDER" = "yes"; then
   AC_DEFINE(wxUSE_SLIDER)
-  LTLIBOBJS="$LTLIBOBJS slider.lo"
 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then
   AC_DEFINE(wxUSE_SPINBTN)
-  LTLIBOBJS="$LTLIBOBJS spinbutt.lo"
 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then
   AC_DEFINE(wxUSE_SPLITTER)
-  LTLIBOBJS="$LTLIBOBJS splitter.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
 fi
 
 if test "$wxUSE_STATBMP" = "yes"; then
   AC_DEFINE(wxUSE_STATBMP)
-  LTLIBOBJS="$LTLIBOBJS statbmp.lo"
 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then
   AC_DEFINE(wxUSE_STATBOX)
-  LTLIBOBJS="$LTLIBOBJS statbox.lo"
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then
   AC_DEFINE(wxUSE_STATLINE)
-  LTLIBOBJS="$LTLIBOBJS statline.lo"
 fi
 
 if test "$wxUSE_STATUSBAR" = "yes"; then
   AC_DEFINE(wxUSE_STATUSBAR)
-  LTLIBOBJS="$LTLIBOBJS statusbr.lo"
 fi
 
 if test "$wxUSE_TABDIALOG" = "yes"; then
   AC_DEFINE(wxUSE_TAB_DIALOG)
-  LTLIBOBJS="$LTLIBOBJS tabg.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then
   AC_DEFINE(wxUSE_TOOLBAR)
-  LTLIBOBJS="$LTLIBOBJS tbarbase.lo tbargtk.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
 fi
 
@@ -1804,14 +1742,12 @@ if test "$wxUSE_TOOLTIPS" = "yes" ; then
       AC_MSG_WARN(tooltips are not supported yet under Motif)
     else
       AC_DEFINE(wxUSE_TOOLTIPS)
-      LTLIBOBJS="$LTLIBOBJS tooltip.lo"
     fi
 fi
 
 if test "$wxUSE_TREECTRL" = "yes"; then
   if test "$wxUSE_IMAGLIST" = "yes"; then
     AC_DEFINE(wxUSE_TREECTRL)
-    LTLIBOBJS="$LTLIBOBJS treectrl.lo"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
   else
     AC_MSG_WARN([wxTreeCtrl requires wxImageList and won't be compiled without it])
@@ -1829,44 +1765,36 @@ dnl fi
 
 if test "$wxUSE_METAFILE" = "yes"; then
   AC_DEFINE(wxUSE_METAFILE)
-  LTLIBOBJS="$LTLIBOBJS metafile.lo"
 fi
 
 if test "$wxUSE_COMMONDLGS" = "yes"; then
   dnl these classes don't depend on anything at all
-  LTLIBOBJS="$LTLIBOBJS progdlgg.lo filedlg.lo fontdlgg.lo"
 
   if test "$wxUSE_CONSTRAINTS" != "yes"; then
     AC_MSG_WARN(many common dialogs cannot be used without constraints so they won't be compiled without them)
   else
     AC_DEFINE(wxUSE_CONSTRAINTS)
     AC_DEFINE(wxUSE_TEXTDLG)
-    LTLIBOBJS="$LTLIBOBJS colrdlgg.lo textdlgg.lo choicdgg.lo"
 
     if test "$wxUSE_TREECTRL" != "yes"; then
       AC_MSG_WARN(wxDirDialog cannot be used without wxTreeCtrl and it won't be compiled without it)
     else
       AC_DEFINE(wxUSE_DIRDLG)
-      LTLIBOBJS="$LTLIBOBJS dirdlgg.lo"
     fi
   fi
 
-  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
+  if test "$wxUSE_PRINTING_ARCHITECTURE" = "no"; then
-    LTLIBOBJS="$LTLIBOBJS prntdlgg.lo"
-  else
     AC_MSG_WARN([wxPrintDialog class won't be compiled without printing support])
   fi
 fi
 
 if test "$wxUSE_MINIFRAME" = "yes"; then
   AC_DEFINE(wxUSE_MINIFRAME)
-  LTLIBOBJS="$LTLIBOBJS minifram.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
 if test "$wxUSE_VALIDATORS" = "yes"; then
   AC_DEFINE(wxUSE_VALIDATORS)
-  LTLIBOBJS="$LTLIBOBJS valgen.lo validate.lo valtext.lo"
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
@@ -1974,7 +1902,9 @@ dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 AC_OUTPUT([
             wx-config
-            Makefile src/Makefile
+            Makefile 
+	    src/Makefile
+	    src/gtk/Makefile
             include/Makefile
             include/wx/Makefile
             include/wx/generic/Makefile

samples/Makefile.in

@@ -0,0 +1,336 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# 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$
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @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 = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AR = @AR@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+DLLTOOL = @DLLTOOL@
+DOCS_SUBDIRS = @DOCS_SUBDIRS@
+EXTRA_LIBS = @EXTRA_LIBS@
+EXTRA_VPATH = @EXTRA_VPATH@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CONFIG = @GTK_CONFIG@
+GTK_LIBS = @GTK_LIBS@
+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
+LD = @LD@
+LEX = @LEX@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+NM = @NM@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+SAMPLES_SUBDIRS = @SAMPLES_SUBDIRS@
+STRIP = @STRIP@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_DEF = @TOOLKIT_DEF@
+TOOLKIT_DIR = @TOOLKIT_DIR@
+TOOLKIT_INCLUDE = @TOOLKIT_INCLUDE@
+USER_SUBDIRS = @USER_SUBDIRS@
+UTILS_SUBDIRS = @UTILS_SUBDIRS@
+VERSION = @VERSION@
+WXDEBUG_DEFINE = @WXDEBUG_DEFINE@
+WX_LIBRARY_NAME = @WX_LIBRARY_NAME@
+WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
+WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
+WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
+YACC = @YACC@
+
+SUBDIRS = minimal  @SAMPLES_SUBDIRS@
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../setup.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu samples/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+@SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	  test "$$subdir" = "." && dot_seen=yes; \
+	done; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = samples
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu samples/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+	for subdir in $(SUBDIRS); do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+install-exec-am:
+install-exec: install-exec-recursive
+
+install-data-am:
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am:
+uninstall: uninstall-recursive
+all-am: Makefile
+all-redirect: all-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-recursive
+
+clean-am:  clean-tags clean-generic mostlyclean-am
+
+clean: clean-recursive
+
+distclean-am:  distclean-tags distclean-generic clean-am
+	-rm -f libtool
+
+distclean: distclean-recursive
+
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
+
+.PHONY: install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# 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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

samples/bombs/Makefile.in

@@ -0,0 +1,379 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @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 = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AR = @AR@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+DLLTOOL = @DLLTOOL@
+DOCS_SUBDIRS = @DOCS_SUBDIRS@
+EXTRA_LIBS = @EXTRA_LIBS@
+EXTRA_VPATH = @EXTRA_VPATH@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CONFIG = @GTK_CONFIG@
+GTK_LIBS = @GTK_LIBS@
+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
+LD = @LD@
+LEX = @LEX@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+NM = @NM@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+SAMPLES_SUBDIRS = @SAMPLES_SUBDIRS@
+STRIP = @STRIP@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_DEF = @TOOLKIT_DEF@
+TOOLKIT_DIR = @TOOLKIT_DIR@
+TOOLKIT_INCLUDE = @TOOLKIT_INCLUDE@
+USER_SUBDIRS = @USER_SUBDIRS@
+UTILS_SUBDIRS = @UTILS_SUBDIRS@
+VERSION = @VERSION@
+WXDEBUG_DEFINE = @WXDEBUG_DEFINE@
+WX_LIBRARY_NAME = @WX_LIBRARY_NAME@
+WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
+WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
+WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
+YACC = @YACC@
+
+SUFFIXES = .cpp
+
+DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
+
+noinst_PROGRAMS = bombs
+
+bombs_SOURCES = bombs.cpp bombs1.cpp game.cpp
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../setup.h
+CONFIG_CLEAN_FILES = 
+PROGRAMS =  $(noinst_PROGRAMS)
+
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_LIBS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+bombs_OBJECTS =  bombs.o bombs1.o game.o
+bombs_LDADD = $(LDADD)
+bombs_DEPENDENCIES = 
+bombs_LDFLAGS = 
+CXXFLAGS = @CXXFLAGS@
+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+DEP_FILES =  .deps/bombs.P .deps/bombs1.P .deps/game.P
+SOURCES = $(bombs_SOURCES)
+OBJECTS = $(bombs_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .cpp .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu samples/bombs/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+bombs: $(bombs_OBJECTS) $(bombs_DEPENDENCIES)
+	@rm -f bombs
+	$(CXXLINK) $(bombs_LDFLAGS) $(bombs_OBJECTS) $(bombs_LDADD) $(LIBS)
+.cpp.o:
+	$(CXXCOMPILE) -c $<
+.cpp.lo:
+	$(LTCXXCOMPILE) -c $<
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = samples/bombs
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu samples/bombs/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+
+%.o: %.cpp
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.cpp
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(PROGRAMS)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-noinstPROGRAMS mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+		mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
+		clean-depend clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-noinstPROGRAMS distclean-compile \
+		distclean-libtool distclean-tags distclean-depend \
+		distclean-generic clean-am
+	-rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-noinstPROGRAMS \
+		maintainer-clean-compile maintainer-clean-libtool \
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/Makefile.am

@@ -1,226 +1,3 @@
-## Purpose: The automake makefile for wxWindows.
+# replace with $(TOOLKIT_DIR)
-## Author:  Phil Blecker, Vadim Zeitlin
-## Version: $Id$
-##
-## Process this file with automake to produce Makefile.in
 
-SUFFIXES = .cpp
+SUBDIRS = gtk
-
-DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-LIBS = $(GUILIBS)
-
-VPATH = .:${srcdir}:${srcdir}/common:${srcdir}/@TOOLKIT_DIR@:${srcdir}/generic:${EXTRA_VPATH}
-
-EXTRA_DIST = "${srcdir}/common ${srcdir}/generic ${srcdir}/@TOOLKIT_DIR@"
-
-lib_LTLIBRARIES = @WX_LIBRARY_NAME@
-EXTRA_LTLIBRARIES = libwx_gtk2.la libwx_motif2.la
-
-# these are the common files which always make part of the library
-libwx_gtk2_la_SOURCES = \
- cmndata.cpp \
- dynarray.cpp \
- filefn.cpp \
- hash.cpp \
- list.cpp \
- matrix.cpp \
- memory.cpp \
- module.cpp \
- object.cpp \
- string.cpp \
- timercmn.cpp \
- utilscmn.cpp \
- tokenzr.cpp \
- variant.cpp \
- wxchar.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
-
-# these are the files which are only sometimes linked into the library - they
-# still *must* be all enumerated here to satisfy automake requirments!
-#
-# NB: the files are listed in directory/alphabetical order: first the files
-#     from common, then from generic, then from unix, then from gtk.
-EXTRA_libwx_gtk2_la_SOURCES = \
- config.cpp \
- date.cpp \
- datetime.cpp \
- datstrm.cpp \
- db.cpp \
- dbtable.cpp \
- dcbase.cpp \
- docmdi.cpp \
- docview.cpp \
- dynlib.cpp \
- event.cpp \
- file.cpp \
- fileconf.cpp \
- framecmn.cpp \
- ftp.cpp \
- gdicmn.cpp \
- helpbase.cpp \
- http.cpp \
- image.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 \
- resourc2.cpp \
- resource.cpp \
- sckaddr.cpp \
- sckfile.cpp \
- sckint.cpp \
- sckipc.cpp \
- sckstrm.cpp \
- serbase.cpp \
- socket.cpp \
- stream.cpp \
- tbarbase.cpp \
- tbarsmpl.cpp \
- textfile.cpp \
- time.cpp \
- url.cpp \
- valgen.cpp \
- validate.cpp \
- valtext.cpp \
- wfstream.cpp \
- wincmn.cpp \
- wxexpr.cpp \
- zstream.cpp \
-\
- caret.cpp \
- choicdgg.cpp \
- colrdlgg.cpp \
- dcpsg.cpp \
- dirdlgg.cpp \
- fontdlgg.cpp \
- gridg.cpp \
- helpext.cpp \
- helphtml.cpp \
- helpxlp.cpp \
- imaglist.cpp \
- laywin.cpp \
- listctrl.cpp \
- msgdlgg.cpp \
- notebook.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 \
- 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 \
- joystick.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 \
- threadno.cpp \
- threadsgi.cpp \
- timer.cpp \
- tooltip.cpp \
- treectrl.cpp \
- utilsgtk.cpp \
- utilsres.cpp \
- wave.cpp \
- window.cpp
-
-libwx_gtk2_la_LDFLAGS = -rpath @libdir@ -release @WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
-libwx_gtk2_la_LIBADD = $(LTLIBOBJS)
-libwx_gtk2_la_DEPENDENCIES = $(libwx_gtk2_la_LIBADD) lexer.l
-
-libwx_motif2_la_SOURCES = ${libwx_gtk2_la_SOURCES}
-EXTRA_libwx_motif2_la_SOURCES = ${EXTRA_libwx_gtk2_la_SOURCES}
-libwx_motif2_la_LDFLAGS = -rpath @libdir@ ${libwx_gtk2_la_LDFLAGS}
-libwx_motif2_la_LIBADD = ${libwx_gtk2_la_LIBADD}
-libwx_motif2_la_DEPENDENCIES = ${libwx_gtk2_la_DEPENDENCIES}

src/gtk/Makefile.am

@@ -0,0 +1,217 @@
+## Purpose: The automake makefile for wxWindows.
+## Author:  Phil Blecker, Vadim Zeitlin
+## Version: $Id$
+##
+## Process this file with automake to produce Makefile.in
+
+SUFFIXES = .cpp .c
+
+DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
+LIBS = $(GUILIBS)
+
+VPATH = .:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}
+
+EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
+
+lib_LTLIBRARIES = @WX_LIBRARY_NAME@
+EXTRA_LTLIBRARIES = libwx_gtk2.la libwx_motif2.la
+
+# these are the common files which always make part of the library
+libwx_gtk2_la_SOURCES = \
+\
+ win_gtk.c \
+ extended.c \
+ utilsgtk.cpp \
+\
+ cmndata.cpp \
+ dynarray.cpp \
+ filefn.cpp \
+ hash.cpp \
+ list.cpp \
+ matrix.cpp \
+ memory.cpp \
+ module.cpp \
+ object.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 \
+ docmdi.cpp \
+ docview.cpp \
+ dynlib.cpp \
+ event.cpp \
+ file.cpp \
+ fileconf.cpp \
+ framecmn.cpp \
+ ftp.cpp \
+ gdicmn.cpp \
+ helpbase.cpp \
+ http.cpp \
+ image.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 \
+ resourc2.cpp \
+ resource.cpp \
+ sckaddr.cpp \
+ sckfile.cpp \
+ sckint.cpp \
+ sckipc.cpp \
+ sckstrm.cpp \
+ serbase.cpp \
+ socket.cpp \
+ stream.cpp \
+ tbarbase.cpp \
+ tbarsmpl.cpp \
+ textfile.cpp \
+ time.cpp \
+ url.cpp \
+ valgen.cpp \
+ validate.cpp \
+ valtext.cpp \
+ wfstream.cpp \
+ wincmn.cpp \
+ wxexpr.cpp \
+ zstream.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 \
+ msgdlgg.cpp \
+ notebook.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 \
+ 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 \
+ joystick.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 \
+ threadno.cpp \
+ threadsgi.cpp \
+ timer.cpp \
+ tooltip.cpp \
+ treectrl.cpp \
+ utilsgtk.cpp \
+ utilsres.cpp \
+ wave.cpp \
+ window.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_gtk2_la_LDFLAGS = -rpath @libdir@ -release @WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
+libwx_gtk2_la_LIBADD = $(LTLIBOBJS)
+libwx_gtk2_la_DEPENDENCIES = $(libwx_gtk2_la_LIBADD) lexer.l parser.y

src/gtk/utilsgtk.cpp

@@ -40,7 +40,9 @@
     // under HP-UX XKBlib.h defines structures with field named "explicit" -
     // which is, of course, an error for a C++ compiler
     #define explicit __wx_explicit
+#endif
     #include "X11/XKBlib.h"
+#ifdef __HPUX__
     #undef explicit
 #endif // __HPUX__
 

src/gtk1/Makefile.am

@@ -0,0 +1,217 @@
+## Purpose: The automake makefile for wxWindows.
+## Author:  Phil Blecker, Vadim Zeitlin
+## Version: $Id$
+##
+## Process this file with automake to produce Makefile.in
+
+SUFFIXES = .cpp .c
+
+DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
+LIBS = $(GUILIBS)
+
+VPATH = .:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}
+
+EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
+
+lib_LTLIBRARIES = @WX_LIBRARY_NAME@
+EXTRA_LTLIBRARIES = libwx_gtk2.la libwx_motif2.la
+
+# these are the common files which always make part of the library
+libwx_gtk2_la_SOURCES = \
+\
+ win_gtk.c \
+ extended.c \
+ utilsgtk.cpp \
+\
+ cmndata.cpp \
+ dynarray.cpp \
+ filefn.cpp \
+ hash.cpp \
+ list.cpp \
+ matrix.cpp \
+ memory.cpp \
+ module.cpp \
+ object.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 \
+ docmdi.cpp \
+ docview.cpp \
+ dynlib.cpp \
+ event.cpp \
+ file.cpp \
+ fileconf.cpp \
+ framecmn.cpp \
+ ftp.cpp \
+ gdicmn.cpp \
+ helpbase.cpp \
+ http.cpp \
+ image.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 \
+ resourc2.cpp \
+ resource.cpp \
+ sckaddr.cpp \
+ sckfile.cpp \
+ sckint.cpp \
+ sckipc.cpp \
+ sckstrm.cpp \
+ serbase.cpp \
+ socket.cpp \
+ stream.cpp \
+ tbarbase.cpp \
+ tbarsmpl.cpp \
+ textfile.cpp \
+ time.cpp \
+ url.cpp \
+ valgen.cpp \
+ validate.cpp \
+ valtext.cpp \
+ wfstream.cpp \
+ wincmn.cpp \
+ wxexpr.cpp \
+ zstream.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 \
+ msgdlgg.cpp \
+ notebook.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 \
+ 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 \
+ joystick.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 \
+ threadno.cpp \
+ threadsgi.cpp \
+ timer.cpp \
+ tooltip.cpp \
+ treectrl.cpp \
+ utilsgtk.cpp \
+ utilsres.cpp \
+ wave.cpp \
+ window.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_gtk2_la_LDFLAGS = -rpath @libdir@ -release @WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
+libwx_gtk2_la_LIBADD = $(LTLIBOBJS)
+libwx_gtk2_la_DEPENDENCIES = $(libwx_gtk2_la_LIBADD) lexer.l parser.y

src/gtk1/utilsgtk.cpp

@@ -40,7 +40,9 @@
     // under HP-UX XKBlib.h defines structures with field named "explicit" -
     // which is, of course, an error for a C++ compiler
     #define explicit __wx_explicit
+#endif
     #include "X11/XKBlib.h"
+#ifdef __HPUX__
     #undef explicit
 #endif // __HPUX__