wx/mac/dcscreen.h \
wx/mac/dialog.h \
wx/mac/dirdlg.h \
+ wx/mac/display.h \
wx/mac/dnd.h \
wx/mac/filedlg.h \
wx/mac/font.h \
wx/motif/cursor.h \
wx/motif/dataform.h \
wx/motif/dataobj.h \
+ wx/motif/dataobj2.h \
wx/motif/dc.h \
wx/motif/dcclient.h \
wx/motif/dcmemory.h \
monodll_dcscreen.o \
monodll_dialog.o \
monodll_dirdlg.o \
+ monodll_display.o \
monodll_dnd.o \
monodll_filedlg.o \
monodll_font.o \
monolib_dcscreen.o \
monolib_dialog.o \
monolib_dirdlg.o \
+ monolib_display.o \
monolib_dnd.o \
monolib_filedlg.o \
monolib_font.o \
coredll_dcscreen.o \
coredll_dialog.o \
coredll_dirdlg.o \
+ coredll_display.o \
coredll_dnd.o \
coredll_filedlg.o \
coredll_font.o \
corelib_dcscreen.o \
corelib_dialog.o \
corelib_dirdlg.o \
+ corelib_display.o \
corelib_dnd.o \
corelib_filedlg.o \
corelib_font.o \
@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONODLL_ODEP)
@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
-@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
-
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/mac/display.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONOLIB_ODEP)
@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
-@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
-
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/mac/display.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
+@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP)
+@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
+
@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETDLL_ODEP)
@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
-@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/os2/gsocket.c $(NETDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
-
netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
+@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP)
+@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
+
@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETLIB_ODEP)
@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
-@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/os2/gsocket.c $(NETLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
-
coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/mac/display.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/mac/display.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
ALL_DIST: distrib_clean
mkdir _dist_dir
mkdir $(DISTDIR)
+ cp $(WXDIR)/configure.in $(DISTDIR)
+ cp $(WXDIR)/configure $(DISTDIR)
+ cp $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
cp $(WXDIR)/wxwin.m4 $(DISTDIR)
cp $(WXDIR)/aclocal.m4 $(DISTDIR)
cp $(WXDIR)/config.sub $(DISTDIR)
cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
mkdir $(DISTDIR)/src/regex
cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
- cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
- cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
- cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
cp $(REGEXDIR)/README $(DISTDIR)/src/regex
- cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
- cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
-# cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
cp -Rf $(EXPATDIR) $(DISTDIR)/src
(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
mkdir $(DISTDIR)/src/iodbc
# this target is the common part of distribution script for all GUI toolkits,
# but is not used when building wxBase distribution
ALL_GUI_DIST: ALL_DIST
- cp $(WXDIR)/configure.in $(DISTDIR)
- cp $(WXDIR)/configure $(DISTDIR)
cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
- cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
- mkdir $(DISTDIR)/contrib
- cp -R $(WXDIR)/contrib $(DISTDIR)
MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
cp $(WXDIR)/wxWINE.spec $(DISTDIR)
cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
-# this target does not generate a complete wxPython dist, it only includes
-# those files needed for the Debian source package.
-# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
+
+# Copy all the files from wxPython needed for the Debian source package,
+# and then remove some that are not needed.
PYTHON_DIST:
- mkdir $(DISTDIR)/wxPython
- mkdir $(DISTDIR)/wxPython/contrib
- mkdir $(DISTDIR)/wxPython/contrib/dllwidget
- mkdir $(DISTDIR)/wxPython/contrib/gizmos
- mkdir $(DISTDIR)/wxPython/contrib/glcanvas
- mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
- mkdir $(DISTDIR)/wxPython/contrib/ogl
- mkdir $(DISTDIR)/wxPython/contrib/stc
- mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
- mkdir $(DISTDIR)/wxPython/contrib/xrc
- mkdir $(DISTDIR)/wxPython/demo
- mkdir $(DISTDIR)/wxPython/demo/bitmaps
- mkdir $(DISTDIR)/wxPython/demo/bmp_source
- mkdir $(DISTDIR)/wxPython/demo/data
- mkdir $(DISTDIR)/wxPython/demo/dllwidget
- mkdir $(DISTDIR)/wxPython/src
- mkdir $(DISTDIR)/wxPython/src/gtk
- mkdir $(DISTDIR)/wxPython/scripts
- mkdir $(DISTDIR)/wxPython/wxPython
- mkdir $(DISTDIR)/wxPython/wxPython/lib
- mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
- mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
- mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
- mkdir $(DISTDIR)/wxPython/wxPython/tools
- mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
-
- cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
- cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
- cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
- cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
- cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
- cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
- -cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
- cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
- -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
- -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
- -cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
- -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
- -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
- -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
- -cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
- -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
- -cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
- -cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
- -cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
- -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
- cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
- cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
- cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
- cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
- cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
- cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
- cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
- cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
+ for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \
+ echo "Copying dir: $$dir..."; \
+ mkdir $(DISTDIR)/$$dir; \
+ cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
+ done; \
+ \
+ find $(DISTDIR)/wxPython -name "*~" > RM_FILES; \
+ find $(DISTDIR)/wxPython -name "*.pyc" >> RM_FILES; \
+ find $(DISTDIR)/wxPython -name "*.bat" >> RM_FILES; \
+ find $(DISTDIR)/wxPython -name "core" >> RM_FILES; \
+ find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
+ find $(DISTDIR)/wxPython -name "*.orig" >> RM_FILES; \
+ find $(DISTDIR)/wxPython -name "*.rej" >> RM_FILES; \
+ for f in `cat RM_FILES`; do rm $$f; done; \
+ rm RM_FILES
+
distrib_clean:
$(RM) -r _dist_dir
@# in other dist targets. Ugly and hardly portable but it
@# will run on any Debian box and that's enough for now.
- find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
- \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
- -print0 | xargs -0 rm -rf
+ rm -rf $(DISTDIR)/contrib/build
+ find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \
+ -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
+ -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
+ -o -name "*.bkl" -o -name "*.pro" -o -name "*.def" \
+ -o -name "*.vpj" -o -name "*.sc" \
+ -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
+ \) -print0 | xargs -0 rm -rf
+
+ rm -rf $(DISTDIR)/wxPython/SWIG
+ rm -rf $(DISTDIR)/wxPython/distrib
+ rm -rf $(DISTDIR)/wxPython/distutils
+ rm -rf $(DISTDIR)/wxPython/samples
+ rm -rf $(DISTDIR)/wxPython/contrib/iewin
+ find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
+
+
+ @# We can't get at the individual components of the version here
+ @# anymore, so strip the major and minor version out of the blob.
+
+ ( \
+ wx_version=$(WX_VERSION); \
+ wx_release=$${wx_version%.*}; \
+ rm -rf $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version}; \
+ mv $(DISTDIR) $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};\
+ )
- rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
- mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
projects / wxWidgets.git / blobdiff