X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fd9c29882a1562a45d77c6722f5ca9a53e430c1..4b7ded8bad3a45ea4838e6d3f5d1957a134050ec:/contrib/src/plot/Makefile.in diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index c68a0f254c..a309fa9ae3 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/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 PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ @@ -74,7 +74,7 @@ PLOTLIB_ODEP = $(___pch_wxprec_plotlib_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___plotdll___depname = \ @@ -94,14 +94,14 @@ COND_PLATFORM_WIN32_1___plotdll___importlib = \ @COND_GCC_PCH_1@___pch_wxprec_plotdll_wx_wxprec_h_gch___depname \ @COND_GCC_PCH_1@ = .pch/wxprec_plotdll/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___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@__plotdll___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@__plotdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___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@__plotdll___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@__plotdll___targetsuf3 = .$(SO_SUFFIX) COND_USE_SOVERLINUX_1___plotdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) @@ -171,12 +171,12 @@ COND_SHARED_0___plotlib___depname = \ all: $(__plotdll___depname) $(__plotlib___depname) install: all $(__install_plotdll___depname) $(__install_plotlib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; 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: