X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3255f5fbab93ad229178ec1610a180afa35133a..209f3e1453dd576919bf1cc8f696218dae23c34b:/contrib/src/ogl/Makefile.in

diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index 607a81e155..94a280b2c9 100644
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,9 +11,12 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 SHARED_LD_CXX = @SHARED_LD_CXX@
+LIBEXT = @LIBEXT@
 LIBPREFIX = @LIBPREFIX@
 SO_SUFFIX = @SO_SUFFIX@
+DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
 LN_S = @LN_S@
+RESCOMP = @RESCOMP@
 PIC_FLAG = @PIC_FLAG@
 SONAME_FLAG = @SONAME_FLAG@
 STRIP = @STRIP@
@@ -33,6 +36,8 @@ CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 VENDOR = @VENDOR@
+WX_FLAVOUR = @WX_FLAVOUR@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
@@ -43,12 +48,16 @@ HOST_SUFFIX = @HOST_SUFFIX@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_RELEASE = 2.6
+WX_RELEASE_NODOT = 26
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \
 	$(CPPFLAGS) $(CXXFLAGS)
 OGLDLL_OBJECTS =  \
+	$(__ogldll___win32rc) \
 	ogldll_basic2.o \
 	ogldll_canvas.o \
 	ogldll_divided.o \
@@ -63,6 +72,7 @@ OGLDLL_OBJECTS =  \
 	ogldll_ogldiag.o
 OGLDLL_ODEP =  $(___pch_wxprec_ogldll_wx_wxprec_h_gch___depname)
 OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
 OGLLIB_OBJECTS =  \
 	ogllib_basic2.o \
@@ -81,8 +91,6 @@ OGLLIB_ODEP =  $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname)
 
 ### Conditionally set variables: ###
 
-@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
-@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
@@ -96,221 +104,242 @@ OGLLIB_ODEP =  $(___pch_wxprec_ogllib_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_0@WXDLLVERSIONTAG = -2.5
+@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_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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
 @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
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
 @COND_SHARED_1@__install_ogldll___depname = install_ogldll
 COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
+	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd)
+COND_PLATFORM_OS2_1___ogldll___importlib = -import \
+	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__ogldll___importlib = $(COND_PLATFORM_OS2_1___ogldll___importlib)
 COND_PLATFORM_WIN32_1___ogldll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_WIN32_1@__ogldll___importlib = $(COND_PLATFORM_WIN32_1___ogldll___importlib)
 @COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll
 @COND_GCC_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@	= .pch/wxprec_ogldll/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).1
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .1.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).1.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .1.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
 COND_USE_SOVERLINUX_1___ogldll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
+	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
 @COND_USE_SOVERLINUX_1@__ogldll___soname_flags = $(COND_USE_SOVERLINUX_1___ogldll___soname_flags)
 COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___ogldll___soname_flags)
 COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
 	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
 	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT))
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
 @COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd)
 COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
 	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
 	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__ogldll___macver = \
 @COND_PLATFORM_MACOSX_1@	-compatibility_version $(WX_VERSION) \
 @COND_PLATFORM_MACOSX_1@	-current_version $(WX_VERSION)
+@COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 COND_SHARED_0___ogllib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a
+	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
 @COND_SHARED_0@__install_ogllib___depname = install_ogllib
 @COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib
 @COND_GCC_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@	= .pch/wxprec_ogllib/wx/wxprec.h.gch
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
 
 ### Targets: ###
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 
 install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+	$(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)/`dirname $$f` ; then \
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
+	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
 	fi; \
-	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
+	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
 	done
 
 uninstall: 
 
 install-strip: install
-	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
 
 clean: 
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a
+	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
+@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__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)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(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@	(cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
 
 @COND_GCC_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS)
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(OGLLIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(OGLLIB_OBJECTS)
 @COND_SHARED_0@	rm -f $@
 @COND_SHARED_0@	$(AR) rcu $@ $(OGLLIB_OBJECTS)
 @COND_SHARED_0@	$(RANLIB) $@
 
 @COND_SHARED_0@install_ogllib: 
 @COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
+@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
 @COND_GCC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
 
+ogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP)
+	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
+
 ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic2.cpp
 
 ogldll_canvas.o: $(srcdir)/canvas.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/canvas.cpp
 
 ogldll_divided.o: $(srcdir)/divided.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/divided.cpp
 
 ogldll_mfutils.o: $(srcdir)/mfutils.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/mfutils.cpp
 
 ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/oglmisc.cpp
 
 ogldll_basic.o: $(srcdir)/basic.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic.cpp
 
 ogldll_composit.o: $(srcdir)/composit.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/composit.cpp
 
 ogldll_drawn.o: $(srcdir)/drawn.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/drawn.cpp
 
 ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/bmpshape.cpp
 
 ogldll_constrnt.o: $(srcdir)/constrnt.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/constrnt.cpp
 
 ogldll_lines.o: $(srcdir)/lines.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/lines.cpp
 
 ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/ogldiag.cpp
 
 ogllib_basic2.o: $(srcdir)/basic2.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic2.cpp
 
 ogllib_canvas.o: $(srcdir)/canvas.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/canvas.cpp
 
 ogllib_divided.o: $(srcdir)/divided.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/divided.cpp
 
 ogllib_mfutils.o: $(srcdir)/mfutils.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/mfutils.cpp
 
 ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/oglmisc.cpp
 
 ogllib_basic.o: $(srcdir)/basic.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic.cpp
 
 ogllib_composit.o: $(srcdir)/composit.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/composit.cpp
 
 ogllib_drawn.o: $(srcdir)/drawn.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/drawn.cpp
 
 ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/bmpshape.cpp
 
 ogllib_constrnt.o: $(srcdir)/constrnt.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/constrnt.cpp
 
 ogllib_lines.o: $(srcdir)/lines.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/lines.cpp
 
 ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/ogldiag.cpp
 
 
 # Include dependency info, if present: