X11INC = $(WXDIR)/include/wx/x11
MGLDIR = $(WXDIR)/src/mgl
MOTIFDIR = $(WXDIR)/src/motif
+MSDOSDIR = $(WXDIR)/src/msdos
MSWDIR = $(WXDIR)/src/msw
PMDIR = $(WXDIR)/src/os2
MACDIR = $(WXDIR)/src/mac
cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
-# cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
+ #cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
mkdir $(DISTDIR)/src/regex
cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
mkdir $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx
cp $(INCDIR)/wx/fmappriv.h $(DISTDIR)/include/wx
+ # copy wxpresets
+ mkdir $(DISTDIR)/build
+ mkdir $(DISTDIR)/build/bakefiles
+ mkdir $(DISTDIR)/build/bakefiles/wxpresets
+ mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
+ mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
+ cp $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
+ cp $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
+ cp $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
+ cp $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
+ mkdir $(DISTDIR)/build/aclocal
+ cp $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal
# this target is the common part of distribution script for all GUI toolkits,
# but is not used when building wxBase distribution
mkdir $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/include/wx/xml
+ mkdir $(DISTDIR)/include/wx/msdos
mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/src/unix
+ mkdir $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/src/msw
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
cp $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome
cp $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome
+ mkdir $(DISTDIR)/src/mac
+ mkdir $(DISTDIR)/src/mac/corefoundation
+ cp $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
+ mkdir $(DISTDIR)/include/wx/mac
+ mkdir $(DISTDIR)/include/wx/mac/corefoundation
+ cp $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
+
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)
cp $(X11DIR)/*.cpp $(DISTDIR)/src/x11
cp $(X11DIR)/*.c $(DISTDIR)/src/x11
cp $(X11DIR)/*.xbm $(DISTDIR)/src/x11
+ mkdir $(DISTDIR)/src/mac
+ mkdir $(DISTDIR)/src/mac/corefoundation
+ cp $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
+ mkdir $(DISTDIR)/include/wx/mac
+ mkdir $(DISTDIR)/include/wx/mac/corefoundation
+ cp $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)
cp $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
cp $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
cp $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
-# obsolete
-# mkdir $(DISTDIR)/src/mac/macsock
-# cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)
MGL_DIST: UNIV_DIST
cp $(WXDIR)/wxMGL.spec $(DISTDIR)
cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
+ mkdir $(DISTDIR)/include/wx/msdos
+ cp $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
+ mkdir $(DISTDIR)/src/msdos
+ cp $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)
mkdir $(DISTDIR)/samples/internat/ka
mkdir $(DISTDIR)/samples/internat/pl
mkdir $(DISTDIR)/samples/internat/ru
+ mkdir $(DISTDIR)/samples/internat/sv
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/ka/*.mo $(DISTDIR)/samples/internat/ka
cp $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl
cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
+ cp $(SAMPDIR)/internat/sv/*.mo $(DISTDIR)/samples/internat/sv
cp $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg
cp $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs
cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
cp $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka
cp $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl
cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
+ cp $(SAMPDIR)/internat/sv/*.po $(DISTDIR)/samples/internat/sv
mkdir $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-
+
mkdir $(DISTDIR)/samples/multimon
cp $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon
cp $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon
cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xpm $(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
-
mkdir $(DISTDIR)/samples/render
cp $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render
cp $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render
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/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/propsize
cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
-# mkdir $(DISTDIR)/samples/treelay
-# cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
-# cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
-# cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
-# cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
-
mkdir $(DISTDIR)/samples/typetest
cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
cp $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest
cp $(INTLDIR)/Makefile $(DISTDIR)/locale
cp $(INTLDIR)/*.po $(DISTDIR)/locale
-cp $(INTLDIR)/*.mo $(DISTDIR)/locale
+ subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
+ for dir in "$$subdirs"; do \
+ mkdir $(DISTDIR)/locale/$$dir; \
+ cp $(INTLDIR)/$$dir/*.[pm]o $(DISTDIR)/locale/$$dir; \
+ done
MANUAL_DIST:
mkdir $(DISTDIR)/docs
cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
-# Copy all the files from wxPython needed for the Debian source package,
+# Copy all the files from wxPython needed for the Debian source package,
# and then remove some that are not needed.
PYTHON_DIST:
for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \