#!################################################################################
#${
#! include the code which parses filelist.txt file and initializes
- #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes.
+ #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix, %wxGTK, %wxMOTIF and
+ #! %wxOS2PM hashes.
IncludeTemplate("filelist.t");
#! Generic
}
foreach $file (sort keys %wxGeneric) {
+ #! skip generic files not required for the wxMotif port
next if $wxGeneric{$file} =~ /\bX\b/;
$file2 = $file;
$project{"WXMOTIF_GENERICDEPS"} .= $file2 . " "
}
+ foreach $file (sort keys %wxGeneric) {
+ #! skip generic files not required for the wxPM port
+ next if $wxGeneric{$file} =~ /\bP\b/;
+
+ $file2 = $file;
+ $file =~ s/cp?p?$/\o/;
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXOS2PM_GENERICOBJS"} .= $file . " ";
+ $project{"WXOS2PM_GENERICDEPS"} .= $file2 . " "
+ }
+
#! Base
foreach $file (sort keys %wxBase) {
$project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " ";
$project{"WXMOTIF_COMMONDEPS"} .= $filedep . " "
}
+ if ( $wxCommon{$file} !~ /\bP\b/ ) { #! unless not for OS2PM
+ $project{"WXOS2PM_COMMONOBJS"} .= $fileobj . " ";
+ $project{"WXOS2PM_COMMONDEPS"} .= $filedep . " ";
+ }
#! ODBC needs extra files (sql*.h) so not compiled by default.
if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) {
$project{"WXMOTIF_GUIDEPS"} .= $file2 . " "
}
+ foreach $file (sort keys %wxOS2PM) {
+ $file2 = $file;
+ $file =~ s/cp?p?$/\o/;
+ $file2 =~ s/cp?p?$/\d/;
+ $project{"WXOS2PM_GUIOBJS"} .= $file . " ";
+ $project{"WXOS2PM_GUIDEPS"} .= $file2 . " "
+ }
+
#! others
foreach $file (sort keys %wxHTML) {
foreach $file (sort keys %wxGTKINCLUDE) {
$project{"WXGTK_HEADERS"} .= "gtk/" . $file . " "
}
+
+ foreach $file (sort keys %wxOS2PMINCLUDE) {
+ $project{"WXOS2PM_HEADERS"} .= "os2/" . $file . " "
+ }
foreach $file (sort keys %wxMSWINCLUDE) {
$project{"WXMSW_HEADERS"} .= "msw/" . $file . " "
}
-
+
foreach $file (sort keys %wxHTMLINCLUDE) {
$project{"WXHTML_HEADERS"} .= "html/" . $file . " "
}
VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11)
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
top_srcdir = @top_srcdir@
prefix = @prefix@
target_alias = @target_alias@
target_triplet = @target@
+USE_GUI=@USE_GUI@
+
############################# Dirs #################################
WXDIR = $(top_srcdir)
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
MSWDIR = $(WXDIR)/src/msw
+PMDIR = $(WXDIR)/src/os2
ODBCDIR = $(WXDIR)/src/iodbc
INCDIR = $(WXDIR)/include
SAMPDIR = $(WXDIR)/samples
+DEMODIR = $(WXDIR)/demos
UTILSDIR = $(WXDIR)/utils
MISCDIR = $(WXDIR)/misc
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
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
DISTDIR = ./_dist_dir/wx$(TOOLKIT)
############################## Files ##################################
MSW_HEADERS = \
#$ ExpandList("WXMSW_HEADERS");
+PM_HEADERS = \
+ #$ ExpandList("WXOS2PM_HEADERS");
+
UNIX_HEADERS = \
#$ ExpandList("WXUNIX_HEADERS");
MSW_GUIDEPS = \
#$ ExpandList("WXMSW_GUIDEPS");
+PM_GENERICOBJS = \
+ #$ ExpandList("WXOS2PM_GENERICOBJS");
+
+PM_GENERICDEPS = \
+ #$ ExpandList("WXOS2PM_GENERICDEPS");
+
+PM_COMMONOBJS = \
+ parser.o \
+ #$ ExpandList("WXOS2PM_COMMONOBJS");
+
+PM_COMMONDEPS = \
+ parser.d \
+ #$ ExpandList("WXOS2PM_COMMONDEPS");
+
+PM_GUIOBJS = \
+ #$ ExpandList("WXOS2PM_GUIOBJS");
+
+PM_GUIDEPS = \
+ #$ ExpandList("WXOS2PM_GUIDEPS");
+
BASE_OBJS = \
#$ ExpandList("BASE_OBJS");
HEADERS = @ALL_HEADERS@
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+
all: @WX_ALL@
@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
@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@
lexer.c: $(COMMDIR)/lexer.l
$(LEX) $(COMMDIR)/lexer.l
- @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
+ @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \
sed -e "s/yy/PROIO_yy/g" | \
sed -e "s/input/PROIO_input/g" | \
sed -e "s/unput/PROIO_unput/g" > lexer.c
- @$(RM) lex.yy.c
+ @$(RM) @LEX_STEM@.c
-include $(DEPFILES)
+afminstall:
+ $(INSTALL) -d $(datadir)
+ $(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
+
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
@echo " "
@echo " Installing wxWindows..."
$(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@
$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
$(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
- $(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
- $(INSTALL) -d $(includedir)/wx/motif
- $(INSTALL) -d $(includedir)/wx/html
- $(INSTALL) -d $(includedir)/wx/protocol
- $(INSTALL) -d $(includedir)/wx/unix
- $(INSTALL) -d $(includedir)/wx/generic
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
@list='$(HEADERS)'; for p in $$list; do \
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
done
-
+
write_message:
@echo " "
@echo " The installation of wxWindows is finished. On certain"
@echo " Read the wxWindows Licence on licencing conditions."
@echo " "
-install: preinstall @WX_ALL_INSTALLED@ write_message
+install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
uninstall:
@echo " "
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/include/wx/protocol
cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
+ cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
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
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
mkdir $(DISTDIR)/src/msw/ole
cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
+DEMOS_DIST:
+ mkdir $(DISTDIR)/demos
+ cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
+
+ mkdir $(DISTDIR)/demos/bombs
+ cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
+ cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
+ cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs
+ cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
+ cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
+ cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
+
+ mkdir $(DISTDIR)/demos/forty
+ cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
+ cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
+ cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
+ cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
+ cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
+ cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
+
+ mkdir $(DISTDIR)/demos/life
+ mkdir $(DISTDIR)/demos/life/bitmaps
+ cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
+ cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life
+ cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
+ cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
+ cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
+ cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
+
+ mkdir $(DISTDIR)/demos/poem
+ cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
+ cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
+ cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
+ cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
+ cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
+
+ mkdir $(DISTDIR)/demos/fractal
+ cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
+ cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
+ cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
+
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/calendar
+ cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
+ cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+ cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
+
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/console
+ cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+ cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+ cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
+
mkdir $(DISTDIR)/samples/controls
mkdir $(DISTDIR)/samples/controls/icons
cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
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)/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/*.cpp $(DISTDIR)/samples/forty
- cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
- cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+ mkdir $(DISTDIR)/samples/font
+ cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
+ cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
+ cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
- 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/grid
+ cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
+ cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
+ cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
mkdir $(DISTDIR)/samples/help
mkdir $(DISTDIR)/samples/help/doc
cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
-
+ cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
+
mkdir $(DISTDIR)/samples/internat
mkdir $(DISTDIR)/samples/internat/de
mkdir $(DISTDIR)/samples/internat/fr
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/dialup
+ cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
+ cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
+ cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
mkdir $(DISTDIR)/samples/newgrid
cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+ cp $(SAMPDIR)/newgrid/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/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/resource
cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+ cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
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
cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
+
mkdir $(DISTDIR)/samples/scroll
cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
+ cp $(SAMPDIR)/scroll/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/scrollsub
cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
+
mkdir $(DISTDIR)/samples/splitter
+ cp $(SAMPDIR)/splitter/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/*.xpm $(DISTDIR)/samples/toolbar
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
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
+
+ mkdir $(DISTDIR)/samples/sockets
+ cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
+ cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
+ cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
UTILS_DIST:
mkdir $(DISTDIR)/utils
mkdir $(DISTDIR)/misc/gs_afm
cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_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) ../..
+ mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos
+ cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../..
$(RM) -r _dist_dir
clean: