remove wxNewEventFunctor() overload which allowed calls to "Bind(evt, &WrongClass...

[wxWidgets.git] / samples / opengl / penguin / Makefile.in

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 614e2e1821469cab0b215bc660a060a4998031fd..ea0c71dd52614ad5fdc3d5beb42b62d37b4e6d92 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -37,7 +37,6 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -164,7 +163,6 @@ distclean: clean
 @COND_USE_OPENGL_1@    
 @COND_USE_OPENGL_1@    $(__penguin___mac_setfilecmd)
 @COND_USE_OPENGL_1@    $(__penguin___os2_emxbindcmd)
-@COND_USE_OPENGL_1@    $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  mkdir -p penguin.app/Contents
@@ -181,7 +179,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  echo -n "APPL????" >penguin.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  mv penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
@@ -213,14 +211,14 @@ penguin_penguin_rc.o: $(srcdir)/penguin.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
 
-$(srcdir)/include/wx/stc/stc.h: \
-$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
-$(srcdir)/src/stc/stc.cpp.in \
-$(srcdir)/src/stc/stc.h.in \
-$(srcdir)/src/stc/gen_iface.py
-       cd $(srcdir)/src/stc && ./gen_iface.py
-monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
-$(srcdir)/include/wx/stc/stc.h
+@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
+@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
+@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
+@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
+@COND_USE_STC_1@       cd $(srcdir)/src/stc && ./gen_iface.py
+@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+@COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d