]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed terminology (widget vs. binded window)
[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 3b83477621c569218d8dc1f255889bcba8145333..3be6793df7fd711d0763b83ca5298b14d3211aac 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
 #
-# This file was automatically generated by tmake at 15:11, 1999/09/30
+# This file was automatically generated by tmake at 14:12, 1999/10/09
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -44,8 +44,9 @@ VP6 = @top_srcdir@/src/html
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/zlib
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/zlib
+VP10 = @top_srcdir@/src/iodbc
 
 
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -125,6 +126,43 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
 
 
 ############################## 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 \
 WX_HEADERS = \
                accel.h \
                app.h \
@@ -526,7 +564,7 @@ GENERIC_HEADERS = \
                generic/dirdlgg.h \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/dirdlgg.h \
                generic/filedlgg.h \
                generic/fontdlgg.h \
-               generic/gridg.h \
+               generic/grid.h \
                generic/helpext.h \
                generic/helphtml.h \
                generic/helpwxht.h \
                generic/helpext.h \
                generic/helphtml.h \
                generic/helpwxht.h \
@@ -555,19 +593,19 @@ PROTOCOL_HEADERS = \
                protocol/protocol.h
 
 HTML_HEADERS = \
                protocol/protocol.h
 
 HTML_HEADERS = \
-               html/forcelink.h \
+               html/forcelnk.h \
                html/helpctrl.h \
                html/helpdata.h \
                html/helpfrm.h \
                html/htmlcell.h \
                html/htmldefs.h \
                html/helpctrl.h \
                html/helpdata.h \
                html/helpfrm.h \
                html/htmlcell.h \
                html/htmldefs.h \
-               html/htmlfilter.h \
-               html/htmlparser.h \
+               html/htmlfilt.h \
+               html/htmlpars.h \
                html/htmltag.h \
                html/htmlwin.h \
                html/htmltag.h \
                html/htmlwin.h \
-               html/htmlwinparser.h \
-               html/mod_templ.h \
-               html/version.h
+               html/m_templ.h \
+               html/version.h \
+               html/winpars.h
 
 GTK_GENERICOBJS = \
                busyinfo.o \
 
 GTK_GENERICOBJS = \
                busyinfo.o \
@@ -577,7 +615,7 @@ GTK_GENERICOBJS = \
                dcpsg.o \
                dirdlgg.o \
                filedlgg.o \
                dcpsg.o \
                dirdlgg.o \
                filedlgg.o \
-               gridg.o \
+               grid.o \
                helphtml.o \
                helpwxht.o \
                imaglist.o \
                helphtml.o \
                helpwxht.o \
                imaglist.o \
@@ -610,7 +648,7 @@ GTK_GENERICDEPS = \
                dcpsg.d \
                dirdlgg.d \
                filedlgg.d \
                dcpsg.d \
                dirdlgg.d \
                filedlgg.d \
-               gridg.d \
+               grid.d \
                helphtml.d \
                helpwxht.d \
                imaglist.d \
                helphtml.d \
                helpwxht.d \
                imaglist.d \
@@ -935,7 +973,7 @@ MOTIF_GENERICOBJS = \
                dcpsg.o \
                dirdlgg.o \
                fontdlgg.o \
                dcpsg.o \
                dirdlgg.o \
                fontdlgg.o \
-               gridg.o \
+               grid.o \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \
@@ -972,7 +1010,7 @@ MOTIF_GENERICDEPS = \
                dcpsg.d \
                dirdlgg.d \
                fontdlgg.d \
                dcpsg.d \
                dirdlgg.d \
                fontdlgg.d \
-               gridg.d \
+               grid.d \
                helphtml.d \
                helpwxht.d \
                helpxlp.d \
                helphtml.d \
                helpwxht.d \
                helpxlp.d \
@@ -1206,6 +1244,7 @@ MOTIF_GUIOBJS = \
                dialog.o \
                filedlg.o \
                font.o \
                dialog.o \
                filedlg.o \
                font.o \
+               fontenum.o \
                frame.o \
                gauge.o \
                gdiobj.o \
                frame.o \
                gauge.o \
                gdiobj.o \
@@ -1261,6 +1300,7 @@ MOTIF_GUIDEPS = \
                dialog.d \
                filedlg.d \
                font.d \
                dialog.d \
                filedlg.d \
                font.d \
+               fontenum.d \
                frame.d \
                gauge.d \
                gdiobj.d \
                frame.d \
                gauge.d \
                gdiobj.d \
@@ -1295,7 +1335,7 @@ MSW_GENERICOBJS = \
                busyinfo.o \
                choicdgg.o \
                dirdlgg.o \
                busyinfo.o \
                choicdgg.o \
                dirdlgg.o \
-               gridg.o \
+               grid.o \
                laywin.o \
                logg.o \
                numdlgg.o \
                laywin.o \
                logg.o \
                numdlgg.o \
@@ -1317,7 +1357,7 @@ MSW_GENERICDEPS = \
                busyinfo.d \
                choicdgg.d \
                dirdlgg.d \
                busyinfo.d \
                choicdgg.d \
                dirdlgg.d \
-               gridg.d \
+               grid.d \
                laywin.d \
                logg.d \
                numdlgg.d \
                laywin.d \
                logg.d \
                numdlgg.d \
@@ -1387,6 +1427,7 @@ MSW_COMMONOBJS = \
                mstream.o \
                object.o \
                objstrm.o \
                mstream.o \
                object.o \
                objstrm.o \
+               odbc.o \
                paper.o \
                prntbase.o \
                process.o \
                paper.o \
                prntbase.o \
                process.o \
@@ -1476,6 +1517,7 @@ MSW_COMMONDEPS = \
                mstream.d \
                object.d \
                objstrm.d \
                mstream.d \
                object.d \
                objstrm.d \
+               odbc.d \
                paper.d \
                prntbase.d \
                process.d \
                paper.d \
                prntbase.d \
                process.d \
@@ -1685,52 +1727,122 @@ MSW_GUIDEPS = \
                window.d \
                xpmhand.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 \
                helpfrm.o \
                htmlcell.o \
 HTMLOBJS = \
                helpctrl.o \
                helpdata.o \
                helpfrm.o \
                htmlcell.o \
-               htmlfilter.o \
-               htmlparser.o \
+               htmlfilt.o \
+               htmlpars.o \
                htmltag.o \
                htmlwin.o \
                htmltag.o \
                htmlwin.o \
-               htmlwinparser.o \
-               mod_fonts.o \
-               mod_hline.o \
-               mod_image.o \
-               mod_layout.o \
-               mod_links.o \
-               mod_list.o \
-               mod_pre.o \
-               mod_tables.o \
-               search.o
+               m_fonts.o \
+               m_hline.o \
+               m_image.o \
+               m_layout.o \
+               m_links.o \
+               m_list.o \
+               m_pre.o \
+               m_tables.o \
+               search.o \
+               winpars.o
 
 HTMLDEPS = \
                helpctrl.d \
                helpdata.d \
                helpfrm.d \
                htmlcell.d \
 
 HTMLDEPS = \
                helpctrl.d \
                helpdata.d \
                helpfrm.d \
                htmlcell.d \
-               htmlfilter.d \
-               htmlparser.d \
+               htmlfilt.d \
+               htmlpars.d \
                htmltag.d \
                htmlwin.d \
                htmltag.d \
                htmlwin.d \
-               htmlwinparser.d \
-               mod_fonts.d \
-               mod_hline.d \
-               mod_image.d \
-               mod_layout.d \
-               mod_links.d \
-               mod_list.d \
-               mod_pre.d \
-               mod_tables.d \
-               search.d
-
-UNIXOBJS = \
+               m_fonts.d \
+               m_hline.d \
+               m_image.d \
+               m_layout.d \
+               m_links.d \
+               m_list.d \
+               m_pre.d \
+               m_tables.d \
+               search.d \
+               winpars.d
+
+UNIX_OBJS = \
+               dialup.o \
                gsocket.o \
                threadpsx.o \
                utilsunx.o
 
                gsocket.o \
                threadpsx.o \
                utilsunx.o
 
-UNIXDEPS = \
+UNIX_DEPS = \
+               dialup.d \
                gsocket.d \
                threadpsx.d \
                utilsunx.d
                gsocket.d \
                threadpsx.d \
                utilsunx.d
@@ -1817,16 +1929,40 @@ JPEGOBJS    = \
                jquant2.o \
                jdmerge.o
 
                jquant2.o \
                jdmerge.o
 
-
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-
-DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
-
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-         $(GENERIC_HEADERS) $(WX_HEADERS)
-
-all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
+IODBCOBJS = \
+               catalog.o \
+               connect.o \
+               dlf.o \
+               dlproc.o \
+               execute.o \
+               fetch.o \
+               hdbc.o \
+               henv.o \
+               herr.o \
+               hstmt.o \
+               info.o \
+               itrace.o \
+               misc.o \
+               prepare.o \
+               result.o
+
+GUIOBJS = @GUIOBJS@
+GUIDEPS = @GUIDEPS@
+GUIHEADERS = @GUIHEADERS@
+COMMONOBJS = @COMMONOBJS@
+COMMONDEPS = @COMMONDEPS@
+GENERICOBJS = @GENERICOBJS@
+GENERICDEPS = @GENERICDEPS@
+UNIXOBJS = @UNIXOBJS@
+UNIXDEPS = @UNIXDEPS@
+
+OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
+
+DEPFILES = @ALL_DEPFILES@
+
+HEADERS = @ALL_HEADERS@
+
+all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
@@ -1837,7 +1973,7 @@ all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
        
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
        
-CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
        @$(RM) ./lib/@WX_LIBRARY_LINK3@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
        @$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -1845,13 +1981,13 @@ CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
        
        $(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@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
        $(RM) $(libdir)/@WX_LIBRARY_LINK1@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2@
        $(RM) $(libdir)/@WX_LIBRARY_LINK3@
        $(RM) $(libdir)/@WX_LIBRARY_LINK1@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2@
        $(RM) $(libdir)/@WX_LIBRARY_LINK3@
-       $(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@
+       $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
+       $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
+       $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
        
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
        
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
@@ -1928,7 +2064,7 @@ write_message:
        @echo " Read the wxWindows Licence on licencing conditions."
        @echo " "
 
        @echo " Read the wxWindows Licence on licencing conditions."
        @echo " "
 
-install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message
+install: preinstall @WX_ALL_INSTALLED@ write_message
 
 uninstall:
        @echo " "
 
 uninstall:
        @echo " "
@@ -2194,6 +2330,10 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+       mkdir $(DISTDIR)/samples/newgrid
+       cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+       cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
+       cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
        mkdir $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
        mkdir $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
wxWidgets (Impactor)