Elliptic arc fix for getting bounds

[wxWidgets.git] / contrib / samples / ogl / studio / Makefile.in

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index a1c729f1932f92fc11ca40d7e0873e2bde257c6e..7f009f94c0572316108b3e1aab6fab5ddbf48a06 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.7 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -39,7 +39,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(top_builddir)lib
 STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -70,6 +70,10 @@ STUDIO_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
+@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_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C studio$(EXEEXT)
 @COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -127,7 +131,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -147,16 +151,16 @@ clean:
        rm -rf studio.app
 
 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
 
 studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
-       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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)
+       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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)
        $(__studio___mac_rezcmd)
        $(__studio___mac_setfilecmd)
        $(__studio___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p studio.app/Contents
        mkdir -p studio.app/Contents/MacOS
        mkdir -p studio.app/Contents/Resources
@@ -174,7 +178,7 @@ studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
        ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc studio.app/Contents/Resources/studio.rsrc
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc studio.app/Contents/Resources/studio.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns studio.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@studio_bundle: $(____studio_BUNDLE_TGT_REF_DEP)
@@ -182,43 +186,47 @@ studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
 data: 
        @mkdir -p .
        @for f in studio_resources.wxr; do \
-       if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
-       cp -pRf $(srcdir)/$$f . ; \
+       if test ! -e ./$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
        fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/$$f . ;; \
+       esac; \
        done
 
 studio_studio.o: $(srcdir)/studio.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/studio.cpp
 
 studio_doc.o: $(srcdir)/doc.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/doc.cpp
 
 studio_shapes.o: $(srcdir)/shapes.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/shapes.cpp
 
 studio_symbols.o: $(srcdir)/symbols.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/symbols.cpp
 
 studio_view.o: $(srcdir)/view.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/view.cpp
 
 studio_cspalette.o: $(srcdir)/cspalette.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/cspalette.cpp
 
 studio_mainfrm.o: $(srcdir)/mainfrm.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/mainfrm.cpp
 
 studio_project.o: $(srcdir)/project.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/project.cpp
 
 studio_dialogs.o: $(srcdir)/dialogs.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/dialogs.cpp
 
 studio_csprint.o: $(srcdir)/csprint.cpp
-       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/csprint.cpp
 
 studio_studio_rc.o: $(srcdir)/studio.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
 
 
 # Include dependency info, if present: