#
-# This file was automatically generated by tmake at 13:22, 1999/10/06
+# This file was automatically generated by tmake at 18:19, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
 
 ############################## Files ##################################
 
+BASE_HEADERS = \
+               app.h \
+               date.h \
+               debug.h \
+               defs.h \
+               dynarray.h \
+               dynlib.h \
+               event.h \
+               ffile.h \
+               file.h \
+               fileconf.h \
+               hash.h \
+               intl.h \
+               list.h \
+               log.h \
+               longlong.h \
+               mimetype.h \
+               module.h \
+               object.h \
+               process.h \
+               setup.h \
+               strconv.h \
+               stream.h \
+               string.h \
+               textfile.h \
+               thread.h \
+               time.h \
+               timer.h \
+               tokenzr.h \
+               txtstrm.h \
+               utils.h \
+               variant.h \
+               version.h \
+               wx.h \
+               wxchar.h \
+               wxprec.h
+
 WX_HEADERS = \
                accel.h \
                app.h \
                mstream.o \
                object.o \
                objstrm.o \
+               odbc.o \
                paper.o \
                prntbase.o \
                process.o \
                mstream.d \
                object.d \
                objstrm.d \
+               odbc.d \
                paper.d \
                prntbase.d \
                process.d \
                window.d \
                xpmhand.d
 
+BASE_OBJS = \
+               config.o \
+               date.o \
+               dynarray.o \
+               dynlib.o \
+               event.o \
+               extended.o \
+               ffile.o \
+               file.o \
+               fileconf.o \
+               filefn.o \
+               filesys.o \
+               hash.o \
+               init.o \
+               intl.o \
+               list.o \
+               log.o \
+               mimetype.o \
+               module.o \
+               object.o \
+               process.o \
+               strconv.o \
+               stream.o \
+               string.o \
+               textfile.o \
+               time.o \
+               timercmn.o \
+               tokenzr.o \
+               txtstrm.o \
+               utilscmn.o \
+               variant.o \
+               wxchar.o \
+               utilsunx.o
+
+BASE_DEPS = \
+               config.d \
+               date.d \
+               dynarray.d \
+               dynlib.d \
+               event.d \
+               extended.d \
+               ffile.d \
+               file.d \
+               fileconf.d \
+               filefn.d \
+               filesys.d \
+               hash.d \
+               init.d \
+               intl.d \
+               list.d \
+               log.d \
+               mimetype.d \
+               module.d \
+               object.d \
+               process.d \
+               strconv.d \
+               stream.d \
+               string.d \
+               textfile.d \
+               time.d \
+               timercmn.d \
+               tokenzr.d \
+               txtstrm.d \
+               utilscmn.d \
+               variant.d \
+               wxchar.d \
+               utilsunx.d
+
 HTMLOBJS = \
                helpctrl.o \
                helpdata.o \
                search.d \
                winpars.d
 
-UNIXOBJS = \
+UNIX_OBJS = \
                dialup.o \
                gsocket.o \
                threadpsx.o \
                utilsunx.o
 
-UNIXDEPS = \
+UNIX_DEPS = \
                dialup.d \
                gsocket.d \
                threadpsx.d \
                jquant2.o \
                jdmerge.o
 
+GUIOBJS = @GUIOBJS@
+GUIDEPS = @GUIDEPS@
+GUIHEADERS = @GUIHEADERS@
+COMMONOBJS = @COMMONOBJS@
+COMMONDEPS = @COMMONDEPS@
+GENERICOBJS = @GENERICOBJS@
+GENERICDEPS = @GENERICDEPS@
+UNIXOBJS = @UNIXOBJS@
+UNIXDEPS = @UNIXDEPS@
 
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
+OBJECTS = @ALL_OBJECTS@
 
-DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
+DEPFILES = @ALL_DEPFILES@
 
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-         $(GENERIC_HEADERS) $(WX_HEADERS)
+HEADERS = @ALL_HEADERS@
 
-all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
+all: @WX_CREATE_LINKS@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
        
-CREATE_LINKS@: @WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_TARGET_LIBRARY@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
        @$(RM) ./lib/@WX_LIBRARY_LINK3@
 
     GUIDIST=MOTIF_DIST
 fi
 
-dnl someone explicitly added -ldl to the list of libraries for these targets -
-dnl I don't know why has this been done, but let's respect this - with the
-dnl exception of the systems which don't have libdl at all (VZ)
-if test "$wxUSE_GTK" = 1 || test "$wxUSE_MOTIF" = 1 || test "$wxUSE_WINE" = 1; then
-    AC_CHECK_LIB(dl, main, GUI_TK_LIBRARY="$GUI_TK_LIBRARY -ldl")
-fi
-
 dnl the name of the directory where the files for this toolkit live
 TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
 
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
     dnl the test is a bit complicated because we check for dlopen() both with
-    dnl and without -ldl
+    dnl and without -ldl and we also try to find shl_load() if there is no
+    dnl dlopen() on this system
     AC_CHECK_FUNCS(dlopen,
-        [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1],
-        [AC_CHECK_LIB(dl, dlopen,
-            [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1])])
-    AC_CHECK_FUNCS( shl_load,
-                    [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
+        [
+            AC_DEFINE(HAVE_DLOPEN)
+            HAVE_DL_FUNCS=1
+        ],
+        [
+            AC_CHECK_LIB(dl, dlopen,
+                        [
+                            AC_DEFINE(HAVE_DLOPEN)
+                            HAVE_DL_FUNCS=1
+                            LIBS="$LIBS -ldl"
+                        ],
+                        [
+                            AC_CHECK_FUNCS(shl_load,
+                                          [
+                                            AC_DEFINE(HAVE_SHL_LOAD)
+                                            HAVE_SHL_FUNCS=1
+                                          ])
+                        ])
+        ])
 
     if test "$HAVE_DL_FUNCS" = 0; then
-        if test "$USE_UNIX" = 1; then
-            AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
-            wxUSE_ODBC=no
-            wxUSE_DYNLIB_CLASS=no
-        else
-            AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
+        if test "$HAVE_SHL_FUNCS" = 0; then
+          if test "$USE_UNIX" = 1; then
+              AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
+              wxUSE_ODBC=no
+              wxUSE_DYNLIB_CLASS=no
+          else
+              AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
+          fi
         fi
     fi
 fi
 GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"
 
 dnl all additional libraries (except wxWindows itself) we link with
-EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
 fi
 
     #! Common
     
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bR\b/;
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
 
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXGTK_COMMONOBJS"} .= $file . " ";
-        $project{"WXGTK_COMMONDEPS"} .= $file2 . " "
-    }
-
-    foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bX\b/;
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMOTIF_COMMONOBJS"} .= $file . " ";
-        $project{"WXMOTIF_COMMONDEPS"} .= $file2 . " "
-    }
+        #! 'B' flag means that the file makes part of wxBase too
+        if ( $wxCommon{$file} =~ /\bB\b/ ) {
+            $project{"BASE_OBJS"} .= $fileobj . " ";
+            $project{"BASE_DEPS"} .= $filedep . " ";
+        }
 
-    foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\b(16)\b/;
+        #! if it's the wxBase-only file, nothing more to do with it
+        next if $wxCommon{$file} =~ /\bBO\b/;
 
-        #! needs extra files (sql*.h) so not compiled by default.
-        next if $file =~ /^odbc\./;
+        if ( $wxCommon{$file} !~ /\bR\b/ ) {    #! unless not for GTK
+            $project{"WXGTK_COMMONOBJS"} .= $fileobj . " ";
+            $project{"WXGTK_COMMONDEPS"} .= $filedep . " "
+        }
+        if ( $wxCommon{$file} !~ /\bX\b/ ) {    #! unless not for Motif
+            $project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " ";
+            $project{"WXMOTIF_COMMONDEPS"} .= $filedep . " "
+        }
 
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMSW_COMMONOBJS"} .= $file . " ";
-        $project{"WXMSW_COMMONDEPS"} .= $file2 . " "
+        #! ODBC needs extra files (sql*.h) so not compiled by default.
+        if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) {
+            $project{"WXMSW_COMMONOBJS"} .= $fileobj . " ";
+            $project{"WXMSW_COMMONDEPS"} .= $filedep . " "
+        }
     }
 
     #! GUI
     }
 
     foreach $file (sort keys %wxUNIX) {
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXUNIXOBJS"} .= $file . " ";
-        $project{"WXUNIXDEPS"} .= $file2 . " "
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        #! 'B' flag means that the file makes part of wxBase too
+        if ( $wxUNIX{$file} =~ /\bB\b/ ) {
+            $project{"BASE_OBJS"} .= $fileobj . " ";
+            $project{"BASE_DEPS"} .= $filedep . " "
+        }
+
+        $project{"WXUNIX_OBJS"} .= $fileobj . " ";
+        $project{"WXUNIX_DEPS"} .= $filedep . " "
     }
     
     #! headers
     
     foreach $file (sort keys %wxWXINCLUDE) {
-        $project{"WX_HEADERS"} .= $file . " "
+        $project{"WX_HEADERS"} .= $file . " ";
+        $project{"BASE_HEADERS"} .= $file . " " if $wxWXINCLUDE{$file} =~ /\bB\b/;
     }
     
     foreach $file (sort keys %wxGENERICINCLUDE) {
 
 ############################## Files ##################################
 
+BASE_HEADERS = \
+               #$ ExpandList("BASE_HEADERS");
+
 WX_HEADERS = \
                #$ ExpandList("WX_HEADERS");
 
 MSW_GUIDEPS = \
                #$ ExpandList("WXMSW_GUIDEPS");
 
+BASE_OBJS = \
+               #$ ExpandList("BASE_OBJS");
+
+BASE_DEPS = \
+               #$ ExpandList("BASE_DEPS");
+
 HTMLOBJS = \
                #$ ExpandList("WXHTMLOBJS");
 
 HTMLDEPS = \
                #$ ExpandList("WXHTMLDEPS");
 
-UNIXOBJS = \
-               #$ ExpandList("WXUNIXOBJS");
+UNIX_OBJS = \
+               #$ ExpandList("WXUNIX_OBJS");
 
-UNIXDEPS = \
-               #$ ExpandList("WXUNIXDEPS");
+UNIX_DEPS = \
+               #$ ExpandList("WXUNIX_DEPS");
 
 ZLIBOBJS    = \
                adler32.o \
                jquant2.o \
                jdmerge.o
 
+GUIOBJS = @GUIOBJS@
+GUIDEPS = @GUIDEPS@
+GUIHEADERS = @GUIHEADERS@
+COMMONOBJS = @COMMONOBJS@
+COMMONDEPS = @COMMONDEPS@
+GENERICOBJS = @GENERICOBJS@
+GENERICDEPS = @GENERICDEPS@
+UNIXOBJS = @UNIXOBJS@
+UNIXDEPS = @UNIXDEPS@
 
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
+OBJECTS = @ALL_OBJECTS@
 
-DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
+DEPFILES = @ALL_DEPFILES@
 
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-         $(GENERIC_HEADERS) $(WX_HEADERS)
+HEADERS = @ALL_HEADERS@
 
-all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
+all: @WX_CREATE_LINKS@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
        
-CREATE_LINKS@: @WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_TARGET_LIBRARY@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
        @$(RM) ./lib/@WX_LIBRARY_LINK3@