X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8636aed89614be928547793f91cea7ca54a0d9a8..d95e254418b19430f1f8dee85ab67d64602662ac:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 0a6fff17dc..2d7560d84a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 19:37, 1999/08/24 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # 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 +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@ @@ -111,8 +112,11 @@ ZLIBDIR = $(WXDIR)/src/zlib GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif MSWDIR = $(WXDIR)/src/msw +ODBCDIR = $(WXDIR)/src/iodbc INCDIR = $(WXDIR)/include SAMPDIR = $(WXDIR)/samples +UTILSDIR = $(WXDIR)/utils +MISCDIR = $(WXDIR)/misc DOCDIR = $(WXDIR)/docs @@ -123,6 +127,43 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT) ############################## 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 \ @@ -255,6 +296,7 @@ WX_HEADERS = \ slider.h \ socket.h \ spinbutt.h \ + spinctrl.h \ splitter.h \ statbmp.h \ statbox.h \ @@ -351,6 +393,7 @@ GTK_HEADERS = \ gtk/settings.h \ gtk/slider.h \ gtk/spinbutt.h \ + gtk/spinctrl.h \ gtk/statbmp.h \ gtk/statbox.h \ gtk/statline.h \ @@ -524,6 +567,7 @@ GENERIC_HEADERS = \ generic/dirdlgg.h \ generic/filedlgg.h \ generic/fontdlgg.h \ + generic/grid.h \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ @@ -553,17 +597,18 @@ PROTOCOL_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/htmlfilter.h \ - html/htmlhelp.h \ - html/htmlparser.h \ + html/htmlfilt.h \ + html/htmlpars.h \ html/htmltag.h \ html/htmlwin.h \ - html/htmlwinparser.h \ - html/mod_templ.h \ - html/version.h + html/m_templ.h \ + html/winpars.h GTK_GENERICOBJS = \ busyinfo.o \ @@ -573,12 +618,13 @@ GTK_GENERICOBJS = \ dcpsg.o \ dirdlgg.o \ filedlgg.o \ - gridg.o \ + grid.o \ helphtml.o \ helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ + logg.o \ msgdlgg.o \ numdlgg.o \ panelg.o \ @@ -605,12 +651,13 @@ GTK_GENERICDEPS = \ dcpsg.d \ dirdlgg.d \ filedlgg.d \ - gridg.d \ + grid.d \ helphtml.d \ helpwxht.d \ imaglist.d \ laywin.d \ listctrl.d \ + logg.d \ msgdlgg.d \ numdlgg.d \ panelg.d \ @@ -650,6 +697,7 @@ GTK_COMMONOBJS = \ fileconf.o \ filefn.o \ filesys.o \ + fontcmn.o \ framecmn.o \ fs_inet.o \ fs_zip.o \ @@ -659,10 +707,12 @@ GTK_COMMONOBJS = \ hash.o \ helpbase.o \ http.o \ + imagall.o \ imagbmp.o \ image.o \ imaggif.o \ imagjpeg.o \ + imagpcx.o \ imagpng.o \ imagpnm.o \ intl.o \ @@ -685,6 +735,7 @@ GTK_COMMONOBJS = \ sckfile.o \ sckipc.o \ sckstrm.o \ + serbase.o \ sizer.o \ socket.o \ strconv.o \ @@ -733,6 +784,7 @@ GTK_COMMONDEPS = \ fileconf.d \ filefn.d \ filesys.d \ + fontcmn.d \ framecmn.d \ fs_inet.d \ fs_zip.d \ @@ -742,10 +794,12 @@ GTK_COMMONDEPS = \ hash.d \ helpbase.d \ http.d \ + imagall.d \ imagbmp.d \ image.d \ imaggif.d \ imagjpeg.d \ + imagpcx.d \ imagpng.d \ imagpnm.d \ intl.d \ @@ -768,6 +822,7 @@ GTK_COMMONDEPS = \ sckfile.d \ sckipc.d \ sckstrm.d \ + serbase.d \ sizer.d \ socket.d \ strconv.d \ @@ -840,6 +895,7 @@ GTK_GUIOBJS = \ settings.o \ slider.o \ spinbutt.o \ + spinctrl.o \ statbmp.o \ statbox.o \ statline.o \ @@ -899,6 +955,7 @@ GTK_GUIDEPS = \ settings.d \ slider.d \ spinbutt.d \ + spinctrl.d \ statbmp.d \ statbox.d \ statline.d \ @@ -921,13 +978,14 @@ MOTIF_GENERICOBJS = \ dcpsg.o \ dirdlgg.o \ fontdlgg.o \ - gridg.o \ + grid.o \ helphtml.o \ helpwxht.o \ helpxlp.o \ imaglist.o \ laywin.o \ listctrl.o \ + logg.o \ msgdlgg.o \ notebook.o \ numdlgg.o \ @@ -941,6 +999,7 @@ MOTIF_GENERICOBJS = \ sashwin.o \ scrolwin.o \ splitter.o \ + statline.o \ statusbr.o \ tabg.o \ textdlgg.o \ @@ -956,13 +1015,14 @@ MOTIF_GENERICDEPS = \ dcpsg.d \ dirdlgg.d \ fontdlgg.d \ - gridg.d \ + grid.d \ helphtml.d \ helpwxht.d \ helpxlp.d \ imaglist.d \ laywin.d \ listctrl.d \ + logg.d \ msgdlgg.d \ notebook.d \ numdlgg.d \ @@ -976,6 +1036,7 @@ MOTIF_GENERICDEPS = \ sashwin.d \ scrolwin.d \ splitter.d \ + statline.d \ statusbr.d \ tabg.d \ textdlgg.d \ @@ -1006,6 +1067,7 @@ MOTIF_COMMONOBJS = \ fileconf.o \ filefn.o \ filesys.o \ + fontcmn.o \ framecmn.o \ fs_inet.o \ fs_zip.o \ @@ -1015,10 +1077,12 @@ MOTIF_COMMONOBJS = \ hash.o \ helpbase.o \ http.o \ + imagall.o \ imagbmp.o \ image.o \ imaggif.o \ imagjpeg.o \ + imagpcx.o \ imagpng.o \ imagpnm.o \ intl.o \ @@ -1042,6 +1106,7 @@ MOTIF_COMMONOBJS = \ sckfile.o \ sckipc.o \ sckstrm.o \ + serbase.o \ sizer.o \ socket.o \ strconv.o \ @@ -1092,6 +1157,7 @@ MOTIF_COMMONDEPS = \ fileconf.d \ filefn.d \ filesys.d \ + fontcmn.d \ framecmn.d \ fs_inet.d \ fs_zip.d \ @@ -1101,10 +1167,12 @@ MOTIF_COMMONDEPS = \ hash.d \ helpbase.d \ http.d \ + imagall.d \ imagbmp.d \ image.d \ imaggif.d \ imagjpeg.d \ + imagpcx.d \ imagpng.d \ imagpnm.d \ intl.d \ @@ -1128,6 +1196,7 @@ MOTIF_COMMONDEPS = \ sckfile.d \ sckipc.d \ sckstrm.d \ + serbase.d \ sizer.d \ socket.d \ strconv.d \ @@ -1164,6 +1233,7 @@ MOTIF_GUIOBJS = \ brush.o \ button.o \ checkbox.o \ + checklst.o \ choice.o \ clipbrd.o \ colour.o \ @@ -1179,6 +1249,7 @@ MOTIF_GUIOBJS = \ dialog.o \ filedlg.o \ font.o \ + fontenum.o \ frame.o \ gauge.o \ gdiobj.o \ @@ -1199,6 +1270,7 @@ MOTIF_GUIOBJS = \ scrolbar.o \ settings.o \ slider.o \ + spinbutt.o \ statbmp.o \ statbox.o \ stattext.o \ @@ -1217,6 +1289,7 @@ MOTIF_GUIDEPS = \ brush.d \ button.d \ checkbox.d \ + checklst.d \ choice.d \ clipbrd.d \ colour.d \ @@ -1232,6 +1305,7 @@ MOTIF_GUIDEPS = \ dialog.d \ filedlg.d \ font.d \ + fontenum.d \ frame.d \ gauge.d \ gdiobj.d \ @@ -1252,6 +1326,7 @@ MOTIF_GUIDEPS = \ scrolbar.d \ settings.d \ slider.d \ + spinbutt.d \ statbmp.d \ statbox.d \ stattext.d \ @@ -1265,8 +1340,9 @@ MSW_GENERICOBJS = \ busyinfo.o \ choicdgg.o \ dirdlgg.o \ - gridg.o \ + grid.o \ laywin.o \ + logg.o \ numdlgg.o \ panelg.o \ progdlgg.o \ @@ -1286,8 +1362,9 @@ MSW_GENERICDEPS = \ busyinfo.d \ choicdgg.d \ dirdlgg.d \ - gridg.d \ + grid.d \ laywin.d \ + logg.d \ numdlgg.d \ panelg.d \ progdlgg.d \ @@ -1326,6 +1403,7 @@ MSW_COMMONOBJS = \ fileconf.o \ filefn.o \ filesys.o \ + fontcmn.o \ framecmn.o \ fs_inet.o \ fs_zip.o \ @@ -1335,10 +1413,12 @@ MSW_COMMONOBJS = \ hash.o \ helpbase.o \ http.o \ + imagall.o \ imagbmp.o \ image.o \ imaggif.o \ imagjpeg.o \ + imagpcx.o \ imagpng.o \ imagpnm.o \ intl.o \ @@ -1352,6 +1432,7 @@ MSW_COMMONOBJS = \ mstream.o \ object.o \ objstrm.o \ + odbc.o \ paper.o \ prntbase.o \ process.o \ @@ -1361,12 +1442,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 \ @@ -1410,6 +1493,7 @@ MSW_COMMONDEPS = \ fileconf.d \ filefn.d \ filesys.d \ + fontcmn.d \ framecmn.d \ fs_inet.d \ fs_zip.d \ @@ -1419,10 +1503,12 @@ MSW_COMMONDEPS = \ hash.d \ helpbase.d \ http.d \ + imagall.d \ imagbmp.d \ image.d \ imaggif.d \ imagjpeg.d \ + imagpcx.d \ imagpng.d \ imagpnm.d \ intl.d \ @@ -1436,6 +1522,7 @@ MSW_COMMONDEPS = \ mstream.d \ object.d \ objstrm.d \ + odbc.d \ paper.d \ prntbase.d \ process.d \ @@ -1445,12 +1532,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 \ @@ -1506,6 +1595,7 @@ MSW_GUIOBJS = \ frame.o \ gauge95.o \ gdiobj.o \ + gsocket.o \ helpwin.o \ icon.o \ imaglist.o \ @@ -1537,6 +1627,7 @@ MSW_GUIOBJS = \ settings.o \ slider95.o \ spinbutt.o \ + spinctrl.o \ statbmp.o \ statbox.o \ statbr95.o \ @@ -1591,6 +1682,7 @@ MSW_GUIDEPS = \ frame.d \ gauge95.d \ gdiobj.d \ + gsocket.d \ helpwin.d \ icon.d \ imaglist.d \ @@ -1622,6 +1714,7 @@ MSW_GUIDEPS = \ settings.d \ slider95.d \ spinbutt.d \ + spinctrl.d \ statbmp.d \ statbox.d \ statbr95.d \ @@ -1641,50 +1734,122 @@ MSW_GUIDEPS = \ window.d \ xpmhand.d +BASE_OBJS = \ + init.o \ + config.o \ + date.o \ + dynarray.o \ + dynlib.o \ + event.o \ + extended.o \ + ffile.o \ + file.o \ + fileconf.o \ + filefn.o \ + filesys.o \ + hash.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 = \ + init.d \ + config.d \ + date.d \ + dynarray.d \ + dynlib.d \ + event.d \ + extended.d \ + ffile.d \ + file.d \ + fileconf.d \ + filefn.d \ + filesys.d \ + hash.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 \ - htmlfilter.o \ - htmlhelp.o \ - htmlhelp_io.o \ - htmlparser.o \ + htmlfilt.o \ + htmlpars.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 \ - htmlfilter.d \ - htmlhelp.d \ - htmlhelp_io.d \ - htmlparser.d \ + htmlfilt.d \ + htmlpars.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 -UNIXDEPS = \ +UNIX_DEPS = \ + dialup.d \ gsocket.d \ threadpsx.d \ utilsunx.d @@ -1771,16 +1936,41 @@ JPEGOBJS = \ 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@ +IODBC_OBJS = \ + 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@ +IODBCOBJS = @IODBCOBJS@ + +OBJECTS = @ALL_OBJECTS@ + +DEPFILES = @ALL_DEPFILES@ + +HEADERS = @ALL_HEADERS@ + +all: @WX_ALL@ @WX_LIBRARY_NAME_STATIC@: $(OBJECTS) @$(INSTALL) -d ./lib @@ -1791,7 +1981,7 @@ all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ @$(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@ @@ -1799,13 +1989,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@ -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@ - $(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 @@ -1840,6 +2030,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@ @@ -1850,6 +2041,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 @@ -1866,8 +2063,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( write_message: @echo " " @echo " The installation of wxWindows is finished. On certain" - @echo " platforms (e.g. Linux, Solaris) you'll now have to run" - @echo " ldconfig if you installed a shared library." + @echo " platforms (e.g. Linux) you'll now have to run ldconfig" + @echo " if you installed a shared library." @echo " " @echo " wxWindows comes with no guarantees and doesn't claim" @echo " to be suitable for any purpose." @@ -1875,7 +2072,7 @@ write_message: @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 " " @@ -1889,6 +2086,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; \ @@ -1900,7 +2102,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 @@ -1950,6 +2152,7 @@ ALL_DIST: mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/zlib + mkdir $(DISTDIR)/src/iodbc cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common @@ -1959,9 +2162,7 @@ ALL_DIST: cp $(COMMDIR)/*.y $(DISTDIR)/src/common cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html - cp $(HTMLDIR)/*.h $(DISTDIR)/src/html cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps - cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix cp $(PNGDIR)/*.h $(DISTDIR)/src/png @@ -1973,6 +2174,13 @@ ALL_DIST: cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg + cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc GTK_DIST: cp $(WXDIR)/wxGTK.spec $(DISTDIR) @@ -2031,14 +2239,257 @@ SAMPLES_DIST: cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst - mkdir $(DISTDIR)/samples/checkls + mkdir $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing - -dist: ALL_DIST @GUIDIST@ SAMPLES_DIST + mkdir $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db + mkdir $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs + mkdir $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd + mkdir $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview + mkdir $(DISTDIR)/samples/docvwmdi + cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi + cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi + cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi + mkdir $(DISTDIR)/samples/drawing + cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing + cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing + cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing + mkdir $(DISTDIR)/samples/dynamic + cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic + cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic + cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic + mkdir $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty + mkdir $(DISTDIR)/samples/fractal + cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal + cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal + mkdir $(DISTDIR)/samples/html + cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html + mkdir $(DISTDIR)/samples/html/about + cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about + cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about + mkdir $(DISTDIR)/samples/html/about/data + cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data + cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data + mkdir $(DISTDIR)/samples/html/help + cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help + 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/printing + cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing + mkdir $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test + mkdir $(DISTDIR)/samples/html/virtual + cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual + cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual + cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual + mkdir $(DISTDIR)/samples/html/widget + cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget + cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget + cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget + mkdir $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip + mkdir $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image + mkdir $(DISTDIR)/samples/internat + mkdir $(DISTDIR)/samples/internat/de + mkdir $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de + cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de + mkdir $(DISTDIR)/samples/layout + cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout + cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout + cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout + mkdir $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl + mkdir $(DISTDIR)/samples/listctrl/bitmap + cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps + mkdir $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi + mkdir $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram + mkdir $(DISTDIR)/samples/minifram/bitmap + cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps + mkdir $(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 + cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook + mkdir $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png + mkdir $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource + mkdir $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit + mkdir $(DISTDIR)/samples/proplist + cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist + cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist + cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist + mkdir $(DISTDIR)/samples/sashtest + cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest + cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest + cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest + mkdir $(DISTDIR)/samples/scroll + cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll + cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll + mkdir $(DISTDIR)/samples/splitter + cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter + cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter + mkdir $(DISTDIR)/samples/text + cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text + cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text + cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text + mkdir $(DISTDIR)/samples/thread + cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread + cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread + 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/bitmap + cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps + mkdir $(DISTDIR)/samples/treectrl + cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl + cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl + cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl + cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl + mkdir $(DISTDIR)/samples/typetest + cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest + cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest + cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest + cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest + mkdir $(DISTDIR)/samples/validate + cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate + cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate + cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate + cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate + mkdir $(DISTDIR)/samples/wizard + cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard + cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard + cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard + mkdir $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem + mkdir $(DISTDIR)/samples/wxsocket + cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket + cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket + cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket + +UTILS_DIST: + mkdir $(DISTDIR)/utils + cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils + + mkdir $(DISTDIR)/utils/wxMMedia2 + mkdir $(DISTDIR)/utils/wxMMedia2/lib + mkdir $(DISTDIR)/utils/wxMMedia2/sample + cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2 + cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample + cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample + + mkdir $(DISTDIR)/utils/glcanvas + mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas + cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt + cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + + mkdir $(DISTDIR)/utils/ogl + mkdir $(DISTDIR)/utils/ogl/src + cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl + cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src + cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src + cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src + +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