Committing in .

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a401b17434dbb55f140cf43cbcf5063517b5bde6..f28036562ee38b969d947330057a034634cc54a5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 11:02, 1999/10/21
+# This file was automatically generated by tmake at 15:47, 1999/11/11
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -187,6 +187,7 @@ WX_HEADERS = \
                confbase.h \
                config.h \
                control.h \
+               ctrlsub.h \
                cursor.h \
                dataobj.h \
                date.h \
@@ -203,6 +204,7 @@ WX_HEADERS = \
                debug.h \
                defs.h \
                dialog.h \
+               dialup.h \
                dirdlg.h \
                dnd.h \
                docmdi.h \
@@ -220,6 +222,9 @@ WX_HEADERS = \
                filesys.h \
                font.h \
                fontdlg.h \
+               fontenum.h \
+               fontmap.h \
+               fontutil.h \
                frame.h \
                fs_inet.h \
                fs_zip.h \
@@ -561,7 +566,8 @@ MSW_HEADERS = \
                msw/xpmhand.h
 
 UNIX_HEADERS = \
-               unix/execute.h
+               unix/execute.h \
+               unix/fontutil.h
 
 GENERIC_HEADERS = \
                generic/caret.h \
@@ -624,6 +630,7 @@ GTK_GENERICOBJS = \
                dirdlgg.o \
                filedlgg.o \
                grid.o \
+               helpext.o \
                helphtml.o \
                helpwxht.o \
                imaglist.o \
@@ -643,6 +650,7 @@ GTK_GENERICOBJS = \
                scrolwin.o \
                splitter.o \
                statusbr.o \
+               tabg.o \
                textdlgg.o \
                tipdlg.o \
                treectrl.o \
@@ -657,6 +665,7 @@ GTK_GENERICDEPS = \
                dirdlgg.d \
                filedlgg.d \
                grid.d \
+               helpext.d \
                helphtml.d \
                helpwxht.d \
                imaglist.d \
@@ -676,6 +685,7 @@ GTK_GENERICDEPS = \
                scrolwin.d \
                splitter.d \
                statusbr.d \
+               tabg.d \
                textdlgg.d \
                tipdlg.d \
                treectrl.d \
@@ -689,6 +699,7 @@ GTK_COMMONOBJS = \
                cmndata.o \
                config.o \
                ctrlcmn.o \
+               ctrlsub.o \
                date.o \
                datstrm.o \
                db.o \
@@ -708,6 +719,7 @@ GTK_COMMONOBJS = \
                filefn.o \
                filesys.o \
                fontcmn.o \
+               fontmap.o \
                framecmn.o \
                fs_inet.o \
                fs_zip.o \
@@ -728,9 +740,11 @@ GTK_COMMONOBJS = \
                intl.o \
                ipcbase.o \
                layout.o \
+               lboxcmn.o \
                list.o \
                log.o \
                memory.o \
+               menucmn.o \
                mimetype.o \
                module.o \
                mstream.o \
@@ -781,6 +795,7 @@ GTK_COMMONDEPS = \
                cmndata.d \
                config.d \
                ctrlcmn.d \
+               ctrlsub.d \
                date.d \
                datstrm.d \
                db.d \
@@ -800,6 +815,7 @@ GTK_COMMONDEPS = \
                filefn.d \
                filesys.d \
                fontcmn.d \
+               fontmap.d \
                framecmn.d \
                fs_inet.d \
                fs_zip.d \
@@ -820,9 +836,11 @@ GTK_COMMONDEPS = \
                intl.d \
                ipcbase.d \
                layout.d \
+               lboxcmn.d \
                list.d \
                log.d \
                memory.d \
+               menucmn.d \
                mimetype.d \
                module.d \
                mstream.d \
@@ -994,6 +1012,7 @@ MOTIF_GENERICOBJS = \
                dirdlgg.o \
                fontdlgg.o \
                grid.o \
+               helpext.o \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \
@@ -1031,6 +1050,7 @@ MOTIF_GENERICDEPS = \
                dirdlgg.d \
                fontdlgg.d \
                grid.d \
+               helpext.d \
                helphtml.d \
                helpwxht.d \
                helpxlp.d \
@@ -1067,6 +1087,7 @@ MOTIF_COMMONOBJS = \
                cmndata.o \
                config.o \
                ctrlcmn.o \
+               ctrlsub.o \
                date.o \
                datstrm.o \
                db.o \
@@ -1086,6 +1107,7 @@ MOTIF_COMMONOBJS = \
                filefn.o \
                filesys.o \
                fontcmn.o \
+               fontmap.o \
                framecmn.o \
                fs_inet.o \
                fs_zip.o \
@@ -1106,15 +1128,16 @@ MOTIF_COMMONOBJS = \
                intl.o \
                ipcbase.o \
                layout.o \
+               lboxcmn.o \
                list.o \
                log.o \
                memory.o \
+               menucmn.o \
                mimetype.o \
                module.o \
                mstream.o \
                object.o \
                objstrm.o \
-               odbc.o \
                paper.o \
                prntbase.o \
                process.o \
@@ -1160,6 +1183,7 @@ MOTIF_COMMONDEPS = \
                cmndata.d \
                config.d \
                ctrlcmn.d \
+               ctrlsub.d \
                date.d \
                datstrm.d \
                db.d \
@@ -1179,6 +1203,7 @@ MOTIF_COMMONDEPS = \
                filefn.d \
                filesys.d \
                fontcmn.d \
+               fontmap.d \
                framecmn.d \
                fs_inet.d \
                fs_zip.d \
@@ -1199,15 +1224,16 @@ MOTIF_COMMONDEPS = \
                intl.d \
                ipcbase.d \
                layout.d \
+               lboxcmn.d \
                list.d \
                log.d \
                memory.d \
+               menucmn.d \
                mimetype.d \
                module.d \
                mstream.d \
                object.d \
                objstrm.d \
-               odbc.d \
                paper.d \
                prntbase.d \
                process.d \
@@ -1270,7 +1296,6 @@ MOTIF_GUIOBJS = \
                dialog.o \
                filedlg.o \
                font.o \
-               fontenum.o \
                frame.o \
                gauge.o \
                gdiobj.o \
@@ -1326,7 +1351,6 @@ MOTIF_GUIDEPS = \
                dialog.d \
                filedlg.d \
                font.d \
-               fontenum.d \
                frame.d \
                gauge.d \
                gdiobj.d \
@@ -1409,6 +1433,7 @@ MSW_COMMONOBJS = \
                cmndata.o \
                config.o \
                ctrlcmn.o \
+               ctrlsub.o \
                date.o \
                datstrm.o \
                db.o \
@@ -1428,6 +1453,7 @@ MSW_COMMONOBJS = \
                filefn.o \
                filesys.o \
                fontcmn.o \
+               fontmap.o \
                framecmn.o \
                fs_inet.o \
                fs_zip.o \
@@ -1448,9 +1474,11 @@ MSW_COMMONOBJS = \
                intl.o \
                ipcbase.o \
                layout.o \
+               lboxcmn.o \
                list.o \
                log.o \
                memory.o \
+               menucmn.o \
                mimetype.o \
                module.o \
                mstream.o \
@@ -1502,6 +1530,7 @@ MSW_COMMONDEPS = \
                cmndata.d \
                config.d \
                ctrlcmn.d \
+               ctrlsub.d \
                date.d \
                datstrm.d \
                db.d \
@@ -1521,6 +1550,7 @@ MSW_COMMONDEPS = \
                filefn.d \
                filesys.d \
                fontcmn.d \
+               fontmap.d \
                framecmn.d \
                fs_inet.d \
                fs_zip.d \
@@ -1541,9 +1571,11 @@ MSW_COMMONDEPS = \
                intl.d \
                ipcbase.d \
                layout.d \
+               lboxcmn.d \
                list.d \
                log.d \
                memory.d \
+               menucmn.d \
                mimetype.d \
                module.d \
                mstream.d \
@@ -1619,6 +1651,8 @@ MSW_GUIOBJS = \
                filedlg.o \
                font.o \
                fontdlg.o \
+               fontenum.o \
+               fontutil.o \
                frame.o \
                gauge95.o \
                gdiobj.o \
@@ -1706,6 +1740,8 @@ MSW_GUIDEPS = \
                filedlg.d \
                font.d \
                fontdlg.d \
+               fontenum.d \
+               fontutil.d \
                frame.d \
                gauge95.d \
                gdiobj.d \
@@ -1849,7 +1885,6 @@ HTMLOBJS = \
                m_list.o \
                m_pre.o \
                m_tables.o \
-               search.o \
                winpars.o
 
 HTMLDEPS = \
@@ -1870,17 +1905,20 @@ HTMLDEPS = \
                m_list.d \
                m_pre.d \
                m_tables.d \
-               search.d \
                winpars.d
 
 UNIX_OBJS = \
                dialup.o \
+               fontenum.o \
+               fontutil.o \
                gsocket.o \
                threadpsx.o \
                utilsunx.o
 
 UNIX_DEPS = \
                dialup.d \
+               fontenum.d \
+               fontutil.d \
                gsocket.d \
                threadpsx.d \
                utilsunx.d
@@ -2028,7 +2066,7 @@ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
        $(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
 
 parser.o:    parser.c lexer.c
        $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
@@ -2053,7 +2091,7 @@ lexer.c:  $(COMMDIR)/lexer.l
 
 -include $(DEPFILES)
 
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
@@ -2070,7 +2108,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-       $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
        $(INSTALL) -d $(datadir)/wx
        $(INSTALL) -d $(datadir)/wx/afm
@@ -2144,6 +2182,7 @@ ALL_DIST:
        mkdir _dist_dir
        mkdir $(DISTDIR)
        cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+       cp $(WXDIR)/configure.in $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)
@@ -2288,6 +2327,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
@@ -2330,6 +2370,10 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
        mkdir $(DISTDIR)/samples/html/help/helpfiles
        cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
+       mkdir $(DISTDIR)/samples/html/helpview
+       cp $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
+       cp $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
+       cp $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
        mkdir $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
@@ -2454,7 +2498,6 @@ SAMPLES_DIST:
        mkdir $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
-       cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
        mkdir $(DISTDIR)/samples/toolbar/bitmaps
        cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps