$OpenBSD: patch-contrib_src_fl_Makefile_in,v 1.6 2010/11/04 12:05:25 dcoppa Exp $ --- contrib/src/fl/Makefile.in.orig Thu Apr 15 11:03:43 2010 +++ contrib/src/fl/Makefile.in Thu Nov 4 10:39:23 2010 @@ -117,21 +117,21 @@ FLLIB_ODEP = $(_____pch_wxprec_fllib_wx_wxprec_h_gch_ @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___fldll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(__fldll___targetsuf3).$(LIBwx_gtk2_fl_VERSION) @COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @@ -238,10 +238,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@__fldll___win32rc = fldll_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___fllib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @@ -263,12 +263,11 @@ COND_SHARED_0___fllib___depname = \ all: $(__fldll___depname) $(__fllib___depname) install: $(__install_fldll___depname) $(__install_fllib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.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_fldll___depname) $(__uninstall_fllib___depname) @@ -290,15 +289,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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) $(__fldll___win32rc) -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3).$(LIBwx_gtk2_fl_VERSION): $(FLDLL_OBJECTS) $(__fldll___win32rc) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___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@ $(__fldll___so_symlinks_cmd) @COND_SHARED_1@install_fldll: $(__fldll___depname) @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_fl_VERSION) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd)) @COND_SHARED_1@uninstall_fldll: