X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b328fad3715dd4a46ce1879e35f7466747503b2d..d1a6e2b7a103d761fbc15e0e9c1c20ab53a849d9:/contrib/src/ogl/Makefile.in?ds=inline

diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index d90004f76e..0fc9f946ed 100644
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -42,10 +42,11 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-	-DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) $(PIC_FLAG)
+OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \
+	$(CPPFLAGS) $(CXXFLAGS)
 OGLDLL_OBJECTS =  \
 	ogldll_basic2.o \
 	ogldll_canvas.o \
@@ -59,9 +60,9 @@ OGLDLL_OBJECTS =  \
 	ogldll_constrnt.o \
 	ogldll_lines.o \
 	ogldll_ogldiag.o
-OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-	$(CXXFLAGS)
+OGLDLL_ODEP =  $(___pch_wxprec_ogldll_wx_wxprec_h_gch___depname)
+OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
 OGLLIB_OBJECTS =  \
 	ogllib_basic2.o \
 	ogllib_canvas.o \
@@ -75,7 +76,8 @@ OGLLIB_OBJECTS =  \
 	ogllib_constrnt.o \
 	ogllib_lines.o \
 	ogllib_ogldiag.o
-WX_VERSION = 2.5.0
+OGLLIB_ODEP =  $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname)
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -92,7 +94,7 @@ WX_VERSION = 2.5.0
 @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251
 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 @COND_UNICODE_1@WXUNICODEFLAG = u
@@ -123,9 +125,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_GCC_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@	= .pch/wxprec_ogldll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@	= .pch/wxprec_ogllib/wx/wxprec.h.gch
 @COND_SHARED_1@__install_ogldll___depname = install_ogldll
 @COND_SHARED_0@__install_ogllib___depname = install_ogllib
-@COND_GCC_PCH_1@__ogldll_PCH_DEP = .pch/wxprec_ogldll/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll
 COND_SHARED_1___ogldll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
@@ -166,16 +171,15 @@ COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___ogldll___soname_flags)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).1
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .1.$(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).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).1.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .1.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
-@COND_GCC_PCH_1@__ogllib_PCH_DEP = .pch/wxprec_ogllib/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib
 COND_SHARED_0___ogllib___depname = \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a
@@ -203,106 +207,107 @@ distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
-	$(INSTALL_DIR) $(includedir)
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)
 	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 $(includedir)/`dirname $$f` ; then \
-	$(INSTALL_DIR) $(includedir)/`dirname $$f`; \
+	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
 	fi; \
-	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \
+	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
 	done
 
 install-strip: install
-	$(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
 
 @COND_SHARED_1@install_ogldll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(libdir)
-@COND_SHARED_1@	(cd $(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
+@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@	(cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
 
 @COND_SHARED_0@install_ogllib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir)
+@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_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(__ogldll_PCH_DEP)  $(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)_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@	
 @COND_SHARED_1@	$(__ogldll___so_symlinks_cmd)
 
-ogldll_basic.o: $(srcdir)/basic.cpp
+ogldll_basic.o: $(srcdir)/basic.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_basic2.o: $(srcdir)/basic2.cpp
+ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp
+ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_canvas.o: $(srcdir)/canvas.cpp
+ogldll_canvas.o: $(srcdir)/canvas.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_composit.o: $(srcdir)/composit.cpp
+ogldll_composit.o: $(srcdir)/composit.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_constrnt.o: $(srcdir)/constrnt.cpp
+ogldll_constrnt.o: $(srcdir)/constrnt.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_divided.o: $(srcdir)/divided.cpp
+ogldll_divided.o: $(srcdir)/divided.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_drawn.o: $(srcdir)/drawn.cpp
+ogldll_drawn.o: $(srcdir)/drawn.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_lines.o: $(srcdir)/lines.cpp
+ogldll_lines.o: $(srcdir)/lines.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_mfutils.o: $(srcdir)/mfutils.cpp
+ogldll_mfutils.o: $(srcdir)/mfutils.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp
+ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp
+ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLDLL_ODEP)
 	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(__ogllib_PCH_DEP)  $(OGLLIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(OGLLIB_OBJECTS)
 @COND_SHARED_0@	rm -f $@
 @COND_SHARED_0@	$(AR) rcu $@ $(OGLLIB_OBJECTS)
 @COND_SHARED_0@	$(RANLIB) $@
 
-ogllib_basic.o: $(srcdir)/basic.cpp
+ogllib_basic.o: $(srcdir)/basic.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_basic2.o: $(srcdir)/basic2.cpp
+ogllib_basic2.o: $(srcdir)/basic2.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp
+ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_canvas.o: $(srcdir)/canvas.cpp
+ogllib_canvas.o: $(srcdir)/canvas.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_composit.o: $(srcdir)/composit.cpp
+ogllib_composit.o: $(srcdir)/composit.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_constrnt.o: $(srcdir)/constrnt.cpp
+ogllib_constrnt.o: $(srcdir)/constrnt.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_divided.o: $(srcdir)/divided.cpp
+ogllib_divided.o: $(srcdir)/divided.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_drawn.o: $(srcdir)/drawn.cpp
+ogllib_drawn.o: $(srcdir)/drawn.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_lines.o: $(srcdir)/lines.cpp
+ogllib_lines.o: $(srcdir)/lines.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_mfutils.o: $(srcdir)/mfutils.cpp
+ogllib_mfutils.o: $(srcdir)/mfutils.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp
+ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp
+ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLLIB_ODEP)
 	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
 uninstall: