68 lines
5.3 KiB
Plaintext
68 lines
5.3 KiB
Plaintext
$OpenBSD: patch-contrib_src_ogl_Makefile_in,v 1.2 2007/10/23 11:28:10 steven Exp $
|
|
--- contrib/src/ogl/Makefile.in.orig Tue Sep 25 10:52:05 2007
|
|
+++ contrib/src/ogl/Makefile.in Sat Oct 6 13:10:45 2007
|
|
@@ -112,14 +112,14 @@ OGLLIB_ODEP = $(___pch_wxprec_ogllib_wx_wxprec_h_gch_
|
|
@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___ogldll___depname = \
|
|
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
|
|
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(__ogldll___targetsuf3).$(LIBwx_gtk2_ogl_VERSION)
|
|
@COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
|
|
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
|
|
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
|
|
@@ -209,10 +209,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@__ogldll___win32rc = ogldll_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___ogllib___depname = \
|
|
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
|
|
@@ -234,12 +234,11 @@ COND_SHARED_0___ogllib___depname = \
|
|
all: $(__ogldll___depname) $(__ogllib___depname)
|
|
|
|
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
|
|
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
|
|
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; 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_ogldll___depname) $(__uninstall_ogllib___depname)
|
|
@@ -261,15 +260,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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
|
|
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3).$(LIBwx_gtk2_ogl_VERSION): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
|
|
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__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)
|
|
@COND_SHARED_1@
|
|
@COND_SHARED_1@ $(__ogldll___so_symlinks_cmd)
|
|
|
|
@COND_SHARED_1@install_ogldll:
|
|
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
|
|
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
|
|
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(DESTDIR)$(libdir)
|
|
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_ogl_VERSION) $(DESTDIR)$(libdir)
|
|
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
|
|
|
|
@COND_SHARED_1@uninstall_ogldll:
|