### Variables: ###
DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION = $(WX_RELEASE).5
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_RELEASE = 3.0
+WX_RELEASE_NODOT = 30
+WX_VERSION = $(WX_RELEASE).0
LIBDIRNAME = $(wx_top_builddir)/lib
WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
$(CPPFLAGS) $(CFLAGS)
wxzlib_adler32.o \
wxzlib_compress.o \
wxzlib_crc32.o \
- wxzlib_gzio.o \
- wxzlib_uncompr.o \
wxzlib_deflate.o \
- wxzlib_trees.o \
- wxzlib_zutil.o \
- wxzlib_inflate.o \
+ wxzlib_gzclose.o \
+ wxzlib_gzlib.o \
+ wxzlib_gzread.o \
+ wxzlib_gzwrite.o \
wxzlib_infback.o \
+ wxzlib_inffast.o \
+ wxzlib_inflate.o \
wxzlib_inftrees.o \
- wxzlib_inffast.o
+ wxzlib_trees.o \
+ wxzlib_uncompr.o \
+ wxzlib_zutil.o
WXPNG_CFLAGS = -DNDEBUG $(__INC_ZLIB_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
WXPNG_OBJECTS = \
wxpng_png.o \
wxtiff_tif_warning.o \
wxtiff_tif_write.o \
wxtiff_tif_zip.o
-WXEXPAT_CFLAGS = -DNDEBUG -I./src/expat $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXEXPAT_CFLAGS = -DNDEBUG -I./src/expat -DHAVE_EXPAT_CONFIG_H $(____SHARED) \
+ $(CPPFLAGS) $(CFLAGS)
WXEXPAT_OBJECTS = \
wxexpat_xmlparse.o \
wxexpat_xmlrole.o \
wx/clntdata.h \
wx/cmdargs.h \
wx/cmdline.h \
+ wx/compiler.h \
wx/confbase.h \
wx/config.h \
wx/convauto.h \
wx/clntdata.h \
wx/cmdargs.h \
wx/cmdline.h \
+ wx/compiler.h \
wx/confbase.h \
wx/config.h \
wx/convauto.h \
src/common/tarstrm.cpp \
src/common/textbuf.cpp \
src/common/textfile.cpp \
+ src/common/threadinfo.cpp \
src/common/time.cpp \
src/common/timercmn.cpp \
src/common/timerimpl.cpp \
monodll_tarstrm.o \
monodll_textbuf.o \
monodll_textfile.o \
+ monodll_threadinfo.o \
monodll_common_time.o \
monodll_timercmn.o \
monodll_timerimpl.o \
monolib_tarstrm.o \
monolib_textbuf.o \
monolib_textfile.o \
+ monolib_threadinfo.o \
monolib_common_time.o \
monolib_timercmn.o \
monolib_timerimpl.o \
basedll_tarstrm.o \
basedll_textbuf.o \
basedll_textfile.o \
+ basedll_threadinfo.o \
basedll_common_time.o \
basedll_timercmn.o \
basedll_timerimpl.o \
baselib_tarstrm.o \
baselib_textbuf.o \
baselib_textfile.o \
+ baselib_threadinfo.o \
baselib_common_time.o \
baselib_timercmn.o \
baselib_timerimpl.o \
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = \
-@COND_PLATFORM_WIN32_1@ wxbase$(WXBASEPORT)$(WX_VERSION_NODOT)
+@COND_PLATFORM_WIN32_1@ wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
+@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
COND_wxUSE_REGEX_builtin___wxregex___depname = \
@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
-@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
+@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_RELEASE_NODOT)
+@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_RELEASE)
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
@COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
@COND_TOOLKIT_WINCE@BASE_WINCE_SRC = src/msw/wince/time.cpp
wx/gtk/textctrl.h \
wx/gtk/textentry.h \
wx/gtk/tglbtn.h \
- wx/gtk/treeentry_gtk.h \
- wx/generic/fontdlgg.h \
- wx/gtk/gnome/gprint.h
+ wx/generic/fontdlgg.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR = \
wx/generic/fdrepdlg.h \
wx/gtk/toolbar.h \
wx/gtk/textctrl.h \
wx/gtk/textentry.h \
- wx/gtk/tglbtn.h \
- wx/gtk/treeentry_gtk.h
+ wx/gtk/tglbtn.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR)
COND_TOOLKIT_MOTIF_GUI_HDR = \
wx/generic/clrpickerg.h \
wx/valnum.h \
wx/window.h \
wx/windowid.h \
+ wx/windowptr.h \
wx/withimages.h \
wx/wrapsizer.h \
wx/wupdlock.h \
monodll_gtk_textentry.o \
monodll_gtk_tglbtn.o \
monodll_treeentry_gtk.o \
- monodll_fontdlgg.o \
- monodll_gprint.o
+ monodll_fontdlgg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS = \
monodll_generic_accel.o \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_animateg.o
@COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS = monodll_animateg.o
@COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS = monodll_animateg.o
+@COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS = monodll_animateg.o
@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_COCOA@ monodll_src_cocoa_mediactrl.o
@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o
monolib_gtk_textentry.o \
monolib_gtk_tglbtn.o \
monolib_treeentry_gtk.o \
- monolib_fontdlgg.o \
- monolib_gprint.o
+ monolib_fontdlgg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1 = \
monolib_generic_accel.o \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_animateg.o
@COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_1 = monolib_animateg.o
@COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_1 = monolib_animateg.o
+@COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_1 = monolib_animateg.o
@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_COCOA@ monolib_src_cocoa_mediactrl.o
@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
coredll_gtk_textentry.o \
coredll_gtk_tglbtn.o \
coredll_treeentry_gtk.o \
- coredll_fontdlgg.o \
- coredll_gprint.o
+ coredll_fontdlgg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2 = \
coredll_generic_accel.o \
corelib_gtk_textentry.o \
corelib_gtk_tglbtn.o \
corelib_treeentry_gtk.o \
- corelib_fontdlgg.o \
- corelib_gprint.o
+ corelib_fontdlgg.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3 = \
corelib_generic_accel.o \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = advdll_animateg.o
@COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
+@COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advdll_sound_sdl.o
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = advlib_animateg.o
@COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
@COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
+@COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
@COND_SHARED_1@____wxadv_namedll_DEP = $(__advdll___depname)
@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
@COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
-@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).5.r
+@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
@COND_SHARED_0@____SHARED =
@COND_SHARED_1@____SHARED = $(PIC_FLAG)
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).5
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .5.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).5.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .5.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -5.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
-(cd samples && $(MAKE) clean)
- rm -f lib/libwx_$(TOOLCHAIN_NAME).5.rsrc lib/libwx_$(TOOLCHAIN_NAME).5.r
+ rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
$(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
fi ; \
done
-@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).5.r:
-@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).5.rsrc
-@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).5.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).5.r
+@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r:
+@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
+@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r
@COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
-@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).5.r $(libdir)
-@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).5.rsrc $(libdir)
+@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
+@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir)
wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c
$(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c
wxzlib_crc32.o: $(srcdir)/src/zlib/crc32.c
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/crc32.c
-wxzlib_gzio.o: $(srcdir)/src/zlib/gzio.c
- $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/gzio.c
-
-wxzlib_uncompr.o: $(srcdir)/src/zlib/uncompr.c
- $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/uncompr.c
-
wxzlib_deflate.o: $(srcdir)/src/zlib/deflate.c
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/deflate.c
-wxzlib_trees.o: $(srcdir)/src/zlib/trees.c
- $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/trees.c
+wxzlib_gzclose.o: $(srcdir)/src/zlib/gzclose.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/gzclose.c
-wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c
- $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/zutil.c
+wxzlib_gzlib.o: $(srcdir)/src/zlib/gzlib.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/gzlib.c
-wxzlib_inflate.o: $(srcdir)/src/zlib/inflate.c
- $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/inflate.c
+wxzlib_gzread.o: $(srcdir)/src/zlib/gzread.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/gzread.c
+
+wxzlib_gzwrite.o: $(srcdir)/src/zlib/gzwrite.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/gzwrite.c
wxzlib_infback.o: $(srcdir)/src/zlib/infback.c
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/infback.c
+wxzlib_inffast.o: $(srcdir)/src/zlib/inffast.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/inffast.c
+
+wxzlib_inflate.o: $(srcdir)/src/zlib/inflate.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/inflate.c
+
wxzlib_inftrees.o: $(srcdir)/src/zlib/inftrees.c
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/inftrees.c
-wxzlib_inffast.o: $(srcdir)/src/zlib/inffast.c
- $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/inffast.c
+wxzlib_trees.o: $(srcdir)/src/zlib/trees.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/trees.c
+
+wxzlib_uncompr.o: $(srcdir)/src/zlib/uncompr.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/uncompr.c
+
+wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c
+ $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $(srcdir)/src/zlib/zutil.c
wxpng_png.o: $(srcdir)/src/png/png.c
$(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/png.c
monodll_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
+monodll_threadinfo.o: $(srcdir)/src/common/threadinfo.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/threadinfo.cpp
+
monodll_common_time.o: $(srcdir)/src/common/time.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/time.cpp
monodll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
-monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-
monodll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
monolib_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
+monolib_threadinfo.o: $(srcdir)/src/common/threadinfo.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/threadinfo.cpp
+
monolib_common_time.o: $(srcdir)/src/common/time.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/time.cpp
monolib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
-monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-
monolib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
+basedll_threadinfo.o: $(srcdir)/src/common/threadinfo.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/threadinfo.cpp
+
basedll_common_time.o: $(srcdir)/src/common/time.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/time.cpp
baselib_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
+baselib_threadinfo.o: $(srcdir)/src/common/threadinfo.cpp $(BASELIB_ODEP)
+ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/threadinfo.cpp
+
baselib_common_time.o: $(srcdir)/src/common/time.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/time.cpp
coredll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-
coredll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
corelib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
-
corelib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
@COND_TOOLKIT_WINCE@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_X11_WXUNIV_1@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_X11_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
@COND_TOOLKIT_OSX_CARBON@advdll_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
@COND_TOOLKIT_WINCE@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_X11_WXUNIV_1@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_X11_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
@COND_TOOLKIT_OSX_CARBON@advlib_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
$(CP_P) $(WXDIR)/setup.h_vms $(DISTDIR)
$(CP_P) $(WXDIR)/descrip.mms $(DISTDIR)
$(CP_P) $(WXDIR)/Makefile.in $(DISTDIR)
- $(CP_P) $(WXDIR)/wxBase.spec $(DISTDIR)
$(CP_P) $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
$(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
$(CP_P) $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
mv $(DISTDIR) $(BASEDISTDIR)
GTK_DIST: UNIV_DIST
- $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
$(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk
$(CP_P) $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
X11_DIST: UNIV_DIST
- $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
mkdir $(DISTDIR)/include/wx/x11/private
$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
MOTIF_DIST: ALL_GUI_DIST
- $(CP_P) $(WXDIR)/wxMotif.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
$(CP_P) $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
$(CP_P) $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico
@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp
-@IF_GNU_MAKE@debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
-@IF_GNU_MAKE@debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
-@IF_GNU_MAKE@ mkdir $(DISTDIR)/debian
-@IF_GNU_MAKE@ -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
-@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
-@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
-@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
-@IF_GNU_MAKE@ rm -f $(DISTDIR)/*.spec
-@IF_GNU_MAKE@
-@IF_GNU_MAKE@ @# now prune away a lot of the crap included by using cp -R
-@IF_GNU_MAKE@ @# in other dist targets. Ugly and hardly portable but it
-@IF_GNU_MAKE@ @# will run on any Debian box and that's enough for now.
-@IF_GNU_MAKE@
-@IF_GNU_MAKE@ find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \
-@IF_GNU_MAKE@ -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
-@IF_GNU_MAKE@ -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
-@IF_GNU_MAKE@ -o -name "*.pro" \
-@IF_GNU_MAKE@ -o -name "*.vpj" \
-@IF_GNU_MAKE@ -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
-@IF_GNU_MAKE@ \) -print0 | xargs -0 rm -rf
-@IF_GNU_MAKE@
-@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/SWIG
-@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distrib
-@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distutils
-@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/samples
-@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/contrib/iewin
-@IF_GNU_MAKE@ find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-@IF_GNU_MAKE@
-@IF_GNU_MAKE@ rm -rf $(DEBIAN_SOURCE_DIR)
-@IF_GNU_MAKE@ mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
-
-
-@IF_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
-
-@IF_GNU_MAKE@debian-msw-dirs:
-@IF_GNU_MAKE@ mkdir $(DISTDIR)/include/wx/msw
-@IF_GNU_MAKE@ mkdir $(DISTDIR)/src/msw
-
-
-RPMTOP=_dist_dir/_rpm_top
-
-rpm: bzip-dist
- @echo "*** Building RPMs ***"
- -mkdir $(RPMTOP)
- -mkdir $(RPMTOP)/SOURCES
- -mkdir $(RPMTOP)/SPECS
- -mkdir $(RPMTOP)/BUILD
- -mkdir $(RPMTOP)/RPMS
- -mkdir $(RPMTOP)/SRPMS
- cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
- rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
- mv -f `find $(RPMTOP) -name "wx-*.rpm"` .
-
# Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d