mention that calling SetFaceName() with an invalid facename will invalidate the font...

[wxWidgets.git] / samples / combo / Makefile.in

diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 60feb2e691aebde531372806500233e8e7b7f822..2d50ee29c075d8fca6682426cbbf610ea41e0478 100644 (file)
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 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: ###
@@ -156,7 +155,6 @@ combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
        
        $(__combo___mac_setfilecmd)
        $(__combo___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p combo.app/Contents
@@ -199,14 +197,14 @@ combo_combo.o: $(srcdir)/combo.cpp
        $(CXXC) -c -o $@ $(COMBO_CXXFLAGS) $(srcdir)/combo.cpp
 
 
-$(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