need to AdjustScrollbars() after changing the virtual size in CalcDimensions()

[wxWidgets.git] / tests / benchmarks / Makefile.in

diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 92058a3b53daf9c4243e3d8397133b97ce11b496..3d72d817f8e0b104c42f25271523682be49f0720 100644 (file)
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -44,6 +44,8 @@ BENCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(CXXFLAGS)
 BENCH_OBJECTS =  \
        bench_bench.o \
        $(CXXFLAGS)
 BENCH_OBJECTS =  \
        bench_bench.o \

+       bench_htmlpars.o \
+       bench_htmltag.o \

        bench_strings.o \
        bench_tls.o
 
        bench_strings.o \
        bench_tls.o
 


@@ -84,7 +86,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: bench$(EXEEXT)
+all: bench$(EXEEXT) data

 
 install: all
 
 
 install: all
 


@@ -101,14 +103,32 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 bench$(EXEEXT): $(BENCH_OBJECTS)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 bench$(EXEEXT): $(BENCH_OBJECTS)

-       $(CXX) -o $@ $(BENCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(BENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)

        
        $(__bench___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        
        $(__bench___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 

+data: 
+       @mkdir -p .
+       @for f in htmltest.html; do \
+       if test ! -f ./$$f -a ! -d ./$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+       fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/$$f . ;; \
+       esac; \
+       done
+

 bench_bench.o: $(srcdir)/bench.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/bench.cpp
 
 bench_bench.o: $(srcdir)/bench.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/bench.cpp
 

+bench_htmlpars.o: $(srcdir)/htmlparser/htmlpars.cpp
+       $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/htmlparser/htmlpars.cpp
+
+bench_htmltag.o: $(srcdir)/htmlparser/htmltag.cpp
+       $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/htmlparser/htmltag.cpp
+

 bench_strings.o: $(srcdir)/strings.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/strings.cpp
 
 bench_strings.o: $(srcdir)/strings.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/strings.cpp
 


@@ -126,6 +146,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:

-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d

 
 

-.PHONY: all install uninstall clean distclean
+.PHONY: all install uninstall clean distclean data