X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83a9be3427d830e767a5bcec2bc40a06d2d463a8..fbd11d30c8499ef25989974ef6ec16fb5b759668:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 08f9cd64cf..76515f9a6c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,7 @@ HOST_SUFFIX = @HOST_SUFFIX@ DESTDIR = WX_VERSION = 2.5.2 LIBDIRNAME = $(top_builddir)lib -WXREGEX_CFLAGS = $(____SHARED) $(CPPFLAGS) $(CFLAGS) +WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(____SHARED) $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ wxregex_regcomp.o \ wxregex_regexec.o \ @@ -751,10 +751,6 @@ BASELIB_OBJECTS = \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3) BASELIB_ODEP = $(___pch_wxprec_baselib_wx_wxprec_h_gch___depname) -NETDLL_CFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ @@ -772,10 +768,6 @@ NETDLL_OBJECTS = \ netdll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_2) NETDLL_ODEP = $(___pch_wxprec_netdll_wx_wxprec_h_gch___depname) -NETLIB_CFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ - $(CFLAGS) NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ @@ -1055,10 +1047,10 @@ COND_WXUSE_REGEX_BUILTIN___wxregex___depname = \ @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = 2.5.2 @COND_PLATFORM_UNIX_0@PLUGVERDELIM = @COND_PLATFORM_UNIX_1@PLUGVERDELIM = - -@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = _d -@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = _ud +@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = d +@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud @COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX = -@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = _u +@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = u @COND_TOOLKIT_WINCE@BASE_WINCE_SRC = src/msw/wince/time.cpp @COND_TOOLKIT_WINCE@BASE_WINCE_HDR = wx/msw/wince/time.h @COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp @@ -1549,7 +1541,6 @@ COND_TOOLKIT_MOTIF_GUI_HDR = \ wx/motif/private.h \ wx/motif/radiobox.h \ wx/motif/radiobut.h \ - wx/motif/region.h \ wx/motif/scrolbar.h \ wx/motif/slider.h \ wx/motif/spinbutt.h \ @@ -2039,6 +2030,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/statbox.h \ wx/stattext.h \ wx/statusbr.h \ + wx/stockitem.h \ wx/textctrl.h \ wx/textdlg.h \ wx/toolbar.h \ @@ -2348,6 +2340,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ + monodll_buttoncmn.o \ monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ @@ -2406,6 +2399,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_settcmn.o \ monodll_sizer.o \ monodll_statbar.o \ + monodll_stockitem.o \ monodll_tbarbase.o \ monodll_textcmn.o \ monodll_timercmn.o \ @@ -2494,6 +2488,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ + monodll_buttoncmn.o \ monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ @@ -2552,6 +2547,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_settcmn.o \ monodll_sizer.o \ monodll_statbar.o \ + monodll_stockitem.o \ monodll_tbarbase.o \ monodll_textcmn.o \ monodll_timercmn.o \ @@ -2680,6 +2676,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ monodll_statusbr.o \ monodll_tabg.o \ monodll_fontdlgg.o \ + monodll_artgtk.o \ monodll_bmpbuttn.o \ monodll_button.o \ monodll_checkbox.o \ @@ -3222,6 +3219,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ + monolib_buttoncmn.o \ monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ @@ -3280,6 +3278,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_settcmn.o \ monolib_sizer.o \ monolib_statbar.o \ + monolib_stockitem.o \ monolib_tbarbase.o \ monolib_textcmn.o \ monolib_timercmn.o \ @@ -3368,6 +3367,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ + monolib_buttoncmn.o \ monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ @@ -3426,6 +3426,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_settcmn.o \ monolib_sizer.o \ monolib_statbar.o \ + monolib_stockitem.o \ monolib_tbarbase.o \ monolib_textcmn.o \ monolib_timercmn.o \ @@ -3554,6 +3555,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ monolib_statusbr.o \ monolib_tabg.o \ monolib_fontdlgg.o \ + monolib_artgtk.o \ monolib_bmpbuttn.o \ monolib_button.o \ monolib_checkbox.o \ @@ -4282,6 +4284,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ + coredll_buttoncmn.o \ coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ @@ -4340,6 +4343,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_settcmn.o \ coredll_sizer.o \ coredll_statbar.o \ + coredll_stockitem.o \ coredll_tbarbase.o \ coredll_textcmn.o \ coredll_timercmn.o \ @@ -4428,6 +4432,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ + coredll_buttoncmn.o \ coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ @@ -4486,6 +4491,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_settcmn.o \ coredll_sizer.o \ coredll_statbar.o \ + coredll_stockitem.o \ coredll_tbarbase.o \ coredll_textcmn.o \ coredll_timercmn.o \ @@ -4614,6 +4620,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ coredll_statusbr.o \ coredll_tabg.o \ coredll_fontdlgg.o \ + coredll_artgtk.o \ coredll_bmpbuttn.o \ coredll_button.o \ coredll_checkbox.o \ @@ -5009,6 +5016,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ + corelib_buttoncmn.o \ corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ @@ -5067,6 +5075,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_settcmn.o \ corelib_sizer.o \ corelib_statbar.o \ + corelib_stockitem.o \ corelib_tbarbase.o \ corelib_textcmn.o \ corelib_timercmn.o \ @@ -5155,6 +5164,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ + corelib_buttoncmn.o \ corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ @@ -5213,6 +5223,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_settcmn.o \ corelib_sizer.o \ corelib_statbar.o \ + corelib_stockitem.o \ corelib_tbarbase.o \ corelib_textcmn.o \ corelib_timercmn.o \ @@ -5341,6 +5352,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ corelib_statusbr.o \ corelib_tabg.o \ corelib_fontdlgg.o \ + corelib_artgtk.o \ corelib_bmpbuttn.o \ corelib_button.o \ corelib_checkbox.o \ @@ -7470,7 +7482,8 @@ install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config $(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(libdir)/wx/config (cd $(DESTDIR)$(libdir)/wx/config && rm -f $(TOOLCHAIN_NAME) && $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME)) - $(INSTALL_PROGRAM) wx-config $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) wx-config-2.5 $(DESTDIR)$(bindir) + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx-config-2.5 wx-config) (cd $(DESTDIR)$(bindir) && rm -f wx$(TOOLCHAIN_NAME)-config && $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config) locale_install: @@ -8141,6 +8154,9 @@ monodll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONODLL_ODEP) monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -8246,8 +8262,8 @@ monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONODLL_ODEP) monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(MONODLL_ODEP) - $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -8576,12 +8592,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/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) $< @@ -10532,6 +10548,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1@monodll_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -10706,6 +10725,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1@monodll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11120,6 +11142,9 @@ monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP) monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -11225,8 +11250,8 @@ monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONOLIB_ODEP) monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(MONOLIB_ODEP) - $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -11555,12 +11580,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/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) $< @@ -13511,6 +13536,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1@monolib_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -13685,6 +13713,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1@monolib_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14570,12 +14601,12 @@ netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP) @COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< -@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/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) $< @@ -14618,12 +14649,12 @@ netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP) @COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< -@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/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) $< @@ -14645,6 +14676,9 @@ coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP) coredll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -14756,8 +14790,8 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp $(COREDLL_ODEP) coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(COREDLL_ODEP) - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -16790,6 +16824,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1@coredll_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -16964,6 +17001,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1@coredll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -17078,6 +17118,9 @@ corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP) corelib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -17189,8 +17232,8 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp $(CORELIB_ODEP) corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(CORELIB_ODEP) - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -19223,6 +19266,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1@corelib_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -19397,6 +19443,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1@corelib_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -20762,6 +20811,13 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound cp $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound + mkdir $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/makefile.unx $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.h $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash + mkdir $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter