X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c09ab26a49195b06caaf4eb1ceb159f7eeb08e2f..afc94fa6b43722d604017798a767fa84ef883b47:/distrib/msw/tmake/unx.t?ds=sidebyside diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 29e03dac1a..115f4821a9 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -12,7 +12,7 @@ IncludeTemplate("filelist.t"); #! Generic - + foreach $file (sort keys %wxGeneric) { #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations, #! so take the generic version @@ -48,8 +48,18 @@ $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " " } + #! Base + + foreach $file (sort keys %wxBase) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"BASE_OBJS"} .= $fileobj . " "; + $project{"BASE_DEPS"} .= $filedep . " "; + } + #! Common - + foreach $file (sort keys %wxCommon) { ($fileobj = $file) =~ s/cp?p?$/\o/; ($filedep = $file) =~ s/cp?p?$/\d/; @@ -60,9 +70,6 @@ $project{"BASE_DEPS"} .= $filedep . " "; } - #! if it's the wxBase-only file, nothing more to do with it - next if $wxCommon{$file} =~ /\bBO\b/; - if ( $wxCommon{$file} !~ /\bR\b/ ) { #! unless not for GTK $project{"WXGTK_COMMONOBJS"} .= $fileobj . " "; $project{"WXGTK_COMMONDEPS"} .= $filedep . " " @@ -80,7 +87,7 @@ } #! GUI - + foreach $file (sort keys %wxMSW) { #! Mingw32 doesn't have the OLE headers and has some troubles with #! socket code @@ -216,10 +223,11 @@ VP5 = @top_srcdir@/src/unix 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 +VP9 = @top_srcdir@/src/tiff +VP10 = @top_srcdir@/src/zlib +VP11 = @top_srcdir@/src/iodbc -VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10) +VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11) top_srcdir = @top_srcdir@ prefix = @prefix@ @@ -281,6 +289,7 @@ HTMLDIR = $(WXDIR)/src/html UNIXDIR = $(WXDIR)/src/unix PNGDIR = $(WXDIR)/src/png JPEGDIR = $(WXDIR)/src/jpeg +TIFFDIR = $(WXDIR)/src/tiff ZLIBDIR = $(WXDIR)/src/zlib GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif @@ -296,6 +305,7 @@ DOCDIR = $(WXDIR)/docs ########################## Archive name ############################### WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz +WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz DISTDIR = ./_dist_dir/wx$(TOOLKIT) ############################## Files ################################## @@ -489,7 +499,42 @@ JPEGOBJS = \ jquant2.o \ jdmerge.o -IODBCOBJS = \ +TIFFOBJS = \ + tif_aux.o \ + tif_close.o \ + tif_codec.o \ + tif_compress.o \ + tif_dir.o \ + tif_dirinfo.o \ + tif_dirread.o \ + tif_dirwrite.o \ + tif_dumpmode.o \ + tif_error.o \ + tif_fax3.o \ + tif_fax3sm.o \ + tif_getimage.o \ + tif_jpeg.o \ + tif_flush.o \ + tif_lzw.o \ + tif_luv.o \ + tif_next.o \ + tif_open.o \ + tif_packbits.o \ + tif_pixarlog.o \ + tif_predict.o \ + tif_print.o \ + tif_read.o \ + tif_swab.o \ + tif_strip.o \ + tif_thunder.o \ + tif_tile.o \ + tif_unix.o \ + tif_version.o \ + tif_warning.o \ + tif_write.o \ + tif_zip.o + +IODBC_OBJS = \ catalog.o \ connect.o \ dlf.o \ @@ -515,13 +560,16 @@ GENERICOBJS = @GENERICOBJS@ GENERICDEPS = @GENERICDEPS@ UNIXOBJS = @UNIXOBJS@ UNIXDEPS = @UNIXDEPS@ +IODBCOBJS = @IODBCOBJS@ -OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS) +OBJECTS = @ALL_OBJECTS@ DEPFILES = @ALL_DEPFILES@ HEADERS = @ALL_HEADERS@ +BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@ + all: @WX_ALL@ @WX_LIBRARY_NAME_STATIC@: $(OBJECTS) @@ -531,7 +579,7 @@ all: @WX_ALL@ @WX_LIBRARY_NAME_SHARED@: $(OBJECTS) @$(INSTALL) -d ./lib - $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) + $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS) CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ @@ -549,7 +597,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 @@ -574,7 +622,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 " " @@ -591,7 +639,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 @@ -665,6 +713,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) @@ -703,6 +752,7 @@ ALL_DIST: mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/jpeg + mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/zlib mkdir $(DISTDIR)/src/iodbc cp $(SRCDIR)/*.in $(DISTDIR)/src @@ -726,6 +776,9 @@ ALL_DIST: cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg + cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff + cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff + cp $(TIFFDIR)/README $(DISTDIR)/src/tiff cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc @@ -768,76 +821,117 @@ MSW_DIST: SAMPLES_DIST: mkdir $(DISTDIR)/samples cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples + mkdir $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs + mkdir $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret + mkdir $(DISTDIR)/samples/config cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config + cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config + mkdir $(DISTDIR)/samples/controls mkdir $(DISTDIR)/samples/controls/icons cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons + mkdir $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst + mkdir $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing + cp $(SAMPDIR)/printing/makefile.unx $(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 + mkdir $(DISTDIR)/samples/db cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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 cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd + mkdir $(DISTDIR)/samples/docview cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.h $(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/makefile.unx $(DISTDIR)/samples/fractal cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal + + mkdir $(DISTDIR)/samples/help + mkdir $(DISTDIR)/samples/help/doc + cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc + mkdir $(DISTDIR)/samples/html cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html mkdir $(DISTDIR)/samples/html/about @@ -851,12 +945,13 @@ 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/*.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 @@ -878,14 +973,18 @@ SAMPLES_DIST: 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/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat @@ -894,50 +993,98 @@ SAMPLES_DIST: 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/makefile.unx $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout + mkdir $(DISTDIR)/samples/listctrl + mkdir $(DISTDIR)/samples/listctrl/bitmaps cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/makefile.unx $(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 + cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps + mkdir $(DISTDIR)/samples/mdi + mkdir $(DISTDIR)/samples/mdi/bitmaps cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/makefile.unx $(DISTDIR)/samples/mdi cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps + + mkdir $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/*.cpp $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/*.xpm $(DISTDIR)/samples/memcheck + + mkdir $(DISTDIR)/samples/menu + cp $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu + cp $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu + cp $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu + mkdir $(DISTDIR)/samples/minifram + mkdir $(DISTDIR)/samples/minifram/bitmaps cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/makefile.unx $(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 + cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps + mkdir $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal + cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal + + mkdir $(DISTDIR)/samples/nettest + cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest + cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest + 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/propsize + cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize + cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize + cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize mkdir $(DISTDIR)/samples/sashtest cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest @@ -945,6 +1092,9 @@ SAMPLES_DIST: mkdir $(DISTDIR)/samples/scroll cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll + mkdir $(DISTDIR)/samples/scrollsub + cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub + cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub mkdir $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter @@ -958,10 +1108,9 @@ 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/bitmap - cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps + mkdir $(DISTDIR)/samples/toolbar/bitmaps + cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps mkdir $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl @@ -1031,6 +1180,8 @@ MISC_DIST: dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. + mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples + cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../.. $(RM) -r _dist_dir clean: