79 lines
6.1 KiB
Plaintext
79 lines
6.1 KiB
Plaintext
$OpenBSD: patch-contrib_src_plot_Makefile_in,v 1.6 2010/11/04 12:05:25 dcoppa Exp $
|
|
--- contrib/src/plot/Makefile.in.orig Thu Apr 15 11:03:43 2010
|
|
+++ contrib/src/plot/Makefile.in Thu Nov 4 10:46:41 2010
|
|
@@ -86,21 +86,21 @@ PLOTLIB_ODEP = $(_____pch_wxprec_plotlib_wx_wxprec_h_
|
|
@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
|
|
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
|
|
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
|
|
-@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
|
|
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
|
-@COND_UNICODE_1@WXUNICODEFLAG = u
|
|
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG =
|
|
+@COND_DEBUG_FLAG_1@WXDEBUGFLAG =
|
|
+@COND_UNICODE_1@WXUNICODEFLAG =
|
|
@COND_WXUNIV_1@WXUNIVNAME = univ
|
|
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
|
|
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
|
|
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
|
|
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
|
|
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
|
|
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
|
|
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
|
|
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
|
|
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
|
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
|
COND_SHARED_1___plotdll___depname = \
|
|
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
|
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3).$(LIBwx_gtk2_plot_VERSION)
|
|
@COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
|
|
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
|
|
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
|
|
@@ -208,10 +208,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
|
|
@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
@COND_PLATFORM_WIN32_1@__plotdll___win32rc = plotdll_version_rc.o
|
|
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
|
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
|
|
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
|
COND_MONOLITHIC_0___WXLIB_BASE_p = \
|
|
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
|
|
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
|
|
COND_SHARED_0___plotlib___depname = \
|
|
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
|
|
@@ -233,12 +233,11 @@ COND_SHARED_0___plotlib___depname = \
|
|
all: $(__plotdll___depname) $(__plotlib___depname)
|
|
|
|
install: $(__install_plotdll___depname) $(__install_plotlib___depname)
|
|
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
|
|
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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
|
|
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
|
|
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
|
|
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
|
|
fi; \
|
|
- $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
|
|
+ $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/$$f; \
|
|
done
|
|
|
|
uninstall: $(__uninstall_plotdll___depname) $(__uninstall_plotlib___depname)
|
|
@@ -260,15 +259,14 @@ clean:
|
|
distclean: clean
|
|
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
|
|
|
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) $(__plotdll___win32rc)
|
|
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(LIBS)
|
|
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3).$(LIBwx_gtk2_plot_VERSION): $(PLOTDLL_OBJECTS) $(__plotdll___win32rc)
|
|
+@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(WXMACVERSION_CMD) $(LDFLAGS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(LIBS)
|
|
@COND_SHARED_1@
|
|
@COND_SHARED_1@ $(__plotdll___so_symlinks_cmd)
|
|
|
|
@COND_SHARED_1@install_plotdll: $(__plotdll___depname)
|
|
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
|
|
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
|
|
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(DESTDIR)$(libdir)
|
|
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_plot_VERSION) $(DESTDIR)$(libdir)
|
|
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__plotdll___so_symlinks_inst_cmd))
|
|
|
|
@COND_SHARED_1@uninstall_plotdll:
|