X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fd9c29882a1562a45d77c6722f5ca9a53e430c1..68b47b2f09b55d2c563add1e90873f441271a468:/contrib/src/gizmos/Makefile.in?ds=sidebyside diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index c56eebad21..0dbcbca1e5 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -45,7 +45,7 @@ HOST_SUFFIX = @HOST_SUFFIX@ ### Variables: ### DESTDIR = -WX_VERSION = 2.5.1 +WX_VERSION = 2.5.2 LIBDIRNAME = $(top_builddir)lib GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ @@ -84,7 +84,7 @@ GIZMOSLIB_ODEP = $(___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname) @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) -@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251 +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)252 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = COND_SHARED_1___gizmosdll___depname = \ @@ -104,14 +104,14 @@ COND_PLATFORM_WIN32_1___gizmosdll___importlib = \ @COND_GCC_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \ @COND_GCC_PCH_1@ = .pch/wxprec_gizmosdll/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf2 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).1 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).2 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf2 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmosdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).1.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).2.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX) COND_USE_SOVERLINUX_1___gizmosdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) @@ -181,12 +181,12 @@ COND_SHARED_0___gizmoslib___depname = \ all: $(__gizmosdll___depname) $(__gizmoslib___depname) install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: