wxListCtrlCompare typedef now is defined correctly (was missing CALLBACK)

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 504eefe05f95fe3c6645ab2ed01d01b6f46cf05c..b3705be04861945001b202301e07c948fa6d4ba2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 17:12, 1999/08/25
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -114,12 +114,13 @@ MSWDIR   = $(WXDIR)/src/msw
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 UTILSDIR = $(WXDIR)/utils
+MISCDIR  = $(WXDIR)/misc
 
 DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -555,10 +556,12 @@ PROTOCOL_HEADERS = \
 
 HTML_HEADERS = \
                html/forcelink.h \
+               html/helpctrl.h \
+               html/helpdata.h \
+               html/helpfrm.h \
                html/htmlcell.h \
                html/htmldefs.h \
                html/htmlfilter.h \
-               html/htmlhelp.h \
                html/htmlparser.h \
                html/htmltag.h \
                html/htmlwin.h \
@@ -580,6 +583,7 @@ GTK_GENERICOBJS = \
                imaglist.o \
                laywin.o \
                listctrl.o \
+               logg.o \
                msgdlgg.o \
                numdlgg.o \
                panelg.o \
@@ -612,6 +616,7 @@ GTK_GENERICDEPS = \
                imaglist.d \
                laywin.d \
                listctrl.d \
+               logg.d \
                msgdlgg.d \
                numdlgg.d \
                panelg.d \
@@ -664,6 +669,7 @@ GTK_COMMONOBJS = \
                image.o \
                imaggif.o \
                imagjpeg.o \
+               imagpcx.o \
                imagpng.o \
                imagpnm.o \
                intl.o \
@@ -686,6 +692,7 @@ GTK_COMMONOBJS = \
                sckfile.o \
                sckipc.o \
                sckstrm.o \
+               serbase.o \
                sizer.o \
                socket.o \
                strconv.o \
@@ -747,6 +754,7 @@ GTK_COMMONDEPS = \
                image.d \
                imaggif.d \
                imagjpeg.d \
+               imagpcx.d \
                imagpng.d \
                imagpnm.d \
                intl.d \
@@ -769,6 +777,7 @@ GTK_COMMONDEPS = \
                sckfile.d \
                sckipc.d \
                sckstrm.d \
+               serbase.d \
                sizer.d \
                socket.d \
                strconv.d \
@@ -929,6 +938,7 @@ MOTIF_GENERICOBJS = \
                imaglist.o \
                laywin.o \
                listctrl.o \
+               logg.o \
                msgdlgg.o \
                notebook.o \
                numdlgg.o \
@@ -942,6 +952,7 @@ MOTIF_GENERICOBJS = \
                sashwin.o \
                scrolwin.o \
                splitter.o \
+               statline.o \
                statusbr.o \
                tabg.o \
                textdlgg.o \
@@ -964,6 +975,7 @@ MOTIF_GENERICDEPS = \
                imaglist.d \
                laywin.d \
                listctrl.d \
+               logg.d \
                msgdlgg.d \
                notebook.d \
                numdlgg.d \
@@ -977,6 +989,7 @@ MOTIF_GENERICDEPS = \
                sashwin.d \
                scrolwin.d \
                splitter.d \
+               statline.d \
                statusbr.d \
                tabg.d \
                textdlgg.d \
@@ -1020,6 +1033,7 @@ MOTIF_COMMONOBJS = \
                image.o \
                imaggif.o \
                imagjpeg.o \
+               imagpcx.o \
                imagpng.o \
                imagpnm.o \
                intl.o \
@@ -1043,6 +1057,7 @@ MOTIF_COMMONOBJS = \
                sckfile.o \
                sckipc.o \
                sckstrm.o \
+               serbase.o \
                sizer.o \
                socket.o \
                strconv.o \
@@ -1106,6 +1121,7 @@ MOTIF_COMMONDEPS = \
                image.d \
                imaggif.d \
                imagjpeg.d \
+               imagpcx.d \
                imagpng.d \
                imagpnm.d \
                intl.d \
@@ -1129,6 +1145,7 @@ MOTIF_COMMONDEPS = \
                sckfile.d \
                sckipc.d \
                sckstrm.d \
+               serbase.d \
                sizer.d \
                socket.d \
                strconv.d \
@@ -1165,6 +1182,7 @@ MOTIF_GUIOBJS = \
                brush.o \
                button.o \
                checkbox.o \
+               checklst.o \
                choice.o \
                clipbrd.o \
                colour.o \
@@ -1200,6 +1218,7 @@ MOTIF_GUIOBJS = \
                scrolbar.o \
                settings.o \
                slider.o \
+               spinbutt.o \
                statbmp.o \
                statbox.o \
                stattext.o \
@@ -1218,6 +1237,7 @@ MOTIF_GUIDEPS = \
                brush.d \
                button.d \
                checkbox.d \
+               checklst.d \
                choice.d \
                clipbrd.d \
                colour.d \
@@ -1253,6 +1273,7 @@ MOTIF_GUIDEPS = \
                scrolbar.d \
                settings.d \
                slider.d \
+               spinbutt.d \
                statbmp.d \
                statbox.d \
                stattext.d \
@@ -1268,6 +1289,7 @@ MSW_GENERICOBJS = \
                dirdlgg.o \
                gridg.o \
                laywin.o \
+               logg.o \
                numdlgg.o \
                panelg.o \
                progdlgg.o \
@@ -1289,6 +1311,7 @@ MSW_GENERICDEPS = \
                dirdlgg.d \
                gridg.d \
                laywin.d \
+               logg.d \
                numdlgg.d \
                panelg.d \
                progdlgg.d \
@@ -1340,6 +1363,7 @@ MSW_COMMONOBJS = \
                image.o \
                imaggif.o \
                imagjpeg.o \
+               imagpcx.o \
                imagpng.o \
                imagpnm.o \
                intl.o \
@@ -1362,12 +1386,14 @@ MSW_COMMONOBJS = \
                sckfile.o \
                sckipc.o \
                sckstrm.o \
+               serbase.o \
                sizer.o \
                socket.o \
                strconv.o \
                stream.o \
                string.o \
                tbarbase.o \
+               tbarsmpl.o \
                textcmn.o \
                textfile.o \
                time.o \
@@ -1424,6 +1450,7 @@ MSW_COMMONDEPS = \
                image.d \
                imaggif.d \
                imagjpeg.d \
+               imagpcx.d \
                imagpng.d \
                imagpnm.d \
                intl.d \
@@ -1446,12 +1473,14 @@ MSW_COMMONDEPS = \
                sckfile.d \
                sckipc.d \
                sckstrm.d \
+               serbase.d \
                sizer.d \
                socket.d \
                strconv.d \
                stream.d \
                string.d \
                tbarbase.d \
+               tbarsmpl.d \
                textcmn.d \
                textfile.d \
                time.d \
@@ -1507,6 +1536,7 @@ MSW_GUIOBJS = \
                frame.o \
                gauge95.o \
                gdiobj.o \
+               gsocket.o \
                helpwin.o \
                icon.o \
                imaglist.o \
@@ -1592,6 +1622,7 @@ MSW_GUIDEPS = \
                frame.d \
                gauge95.d \
                gdiobj.d \
+               gsocket.d \
                helpwin.d \
                icon.d \
                imaglist.d \
@@ -1643,10 +1674,11 @@ MSW_GUIDEPS = \
                xpmhand.d
 
 HTMLOBJS = \
+               helpctrl.o \
+               helpdata.o \
+               helpfrm.o \
                htmlcell.o \
                htmlfilter.o \
-               htmlhelp.o \
-               htmlhelp_io.o \
                htmlparser.o \
                htmltag.o \
                htmlwin.o \
@@ -1662,10 +1694,11 @@ HTMLOBJS = \
                search.o
 
 HTMLDEPS = \
+               helpctrl.d \
+               helpdata.d \
+               helpfrm.d \
                htmlcell.d \
                htmlfilter.d \
-               htmlhelp.d \
-               htmlhelp_io.d \
                htmlparser.d \
                htmltag.d \
                htmlwin.d \
@@ -1841,6 +1874,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(prefix)
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)
+       $(INSTALL) -d $(datadir)
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -1851,6 +1885,12 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/afm
+       $(INSTALL) -d $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       
        $(INSTALL) -d $(includedir)/wx
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk
@@ -1890,6 +1930,11 @@ uninstall:
        @echo " Removing helper files..."
        @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        @$(RM) $(bindir)/wx-config
+       @$(RM) $(datadir)/wx/afm/*
+       @$(RM) $(datadir)/wx/gs_afm/*
+       @rmdir $(datadir)/wx/gs_afm
+       @rmdir $(datadir)/wx/afm
+       @rmdir $(datadir)/wx
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
@@ -1901,7 +1946,7 @@ uninstall:
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
        @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
-       @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi
+       @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
@@ -2220,7 +2265,14 @@ UTILS_DIST:
        cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST
+MISC_DIST:
+       mkdir $(DISTDIR)/misc
+       mkdir $(DISTDIR)/misc/afm
+       cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
+       mkdir $(DISTDIR)/misc/gs_afm
+       cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
+       
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
        $(RM) -r _dist_dir