optimalization of wxHtmlWindow painting (used to repaint areas invalidated when scrol...

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 56203155fab8f12358379af06b6b17d8883470ba..7130a49d717061ef26aae648765ab7af65d24757 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,13 +17,13 @@ include ./src/make.env
 ############## override make.env for PIC ##########################
 
 %.o : %.c
-       $(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
 %.o : %.cpp
-       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 %.o : %.cxx
-       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 %.r : %.rsrc
        $(DEREZ) $^ Carbon.r -useDF > $@
@@ -315,11 +315,13 @@ all: @WX_ALL@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
+       @$(RM) $@
        $(AR) $(AROPTIONS) $@ $(OBJECTS)
        $(RANLIB) $@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
        @$(INSTALL) -d $(build_libdir)
+       @$(RM) $@
        $(AR) $(AROPTIONS) $@ glcanvas.o
        $(RANLIB) $@
 
@@ -411,10 +413,8 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
        $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
        cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
        $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-       @# this installs the import library for a MSW DLL
-       @# remember: for wxMSW DLL WX_LIBRARY_NAME_STATIC is the
-       @# import livraru name
-       @if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi
+       @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
+               $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
@@ -524,6 +524,7 @@ uninstall:
 ALL_DIST: distclean
        mkdir _dist_dir
        mkdir $(DISTDIR)
+       cp $(WXDIR)/aclocal.m4 $(DISTDIR)
        cp $(WXDIR)/configure.in $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
@@ -550,6 +551,7 @@ ALL_DIST: distclean
        cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
        mkdir $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
        cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
@@ -1309,6 +1311,7 @@ PYTHON_DIST:
        mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
        mkdir $(DISTDIR)/wxPython/contrib/ogl
        mkdir $(DISTDIR)/wxPython/contrib/stc
+       mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
        mkdir $(DISTDIR)/wxPython/contrib/xrc
        mkdir $(DISTDIR)/wxPython/demo
        mkdir $(DISTDIR)/wxPython/demo/bitmaps
@@ -1328,6 +1331,7 @@ PYTHON_DIST:
        cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
        -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
        -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+       -cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
        -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
        -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
        -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps