added wx/platform.h to the list of files and regenerated the makefiles

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3f2f819f1d1783a79149a6bcb81d571fbecf68ee..acf0b343911a6e984fbbbdf0e0954d66f752f86f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -411,6 +411,11 @@ 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@
        $(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@

+       @if test "@WX_LIBRARY_NAME_STATIC@" = "@WX_TARGET_LIBRARY@"; then $(RANLIB) $(libdir)/@WX_TARGET_LIBRARY@; fi
+       @# this installs the import library for a MSW DLL
+       @# remember: for wxMSW DLL WX_LIBRARY_NAME_STATIC is the
+       @# import library 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

 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include


@@ -424,6 +429,8 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi

+       @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
+

        $(INSTALL) -d $(includedir)/wx/protocol
        $(INSTALL) -d $(includedir)/wx/unix
        @list='$(HEADERS)'; for p in $$list; do \
        $(INSTALL) -d $(includedir)/wx/protocol
        $(INSTALL) -d $(includedir)/wx/unix
        @list='$(HEADERS)'; for p in $$list; do \


@@ -544,6 +551,7 @@ ALL_DIST: distclean
        cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
        mkdir $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
        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
        cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
        cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex


@@ -681,7 +689,7 @@ MOTIF_DIST: ALL_GUI_DIST
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
 MACX_DIST: ALL_GUI_DIST
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
 MACX_DIST: ALL_GUI_DIST

-       cp $(INCDIR)/wx/*.* $(DISTDIR)/include/wx
+       cp $(INCDIR)/*.* $(DISTDIR)/include

        cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
        cp $(SRCDIR)/*.mcp $(DISTDIR)/src
        cp $(MACDIR)/files.lst $(DISTDIR)/src/mac
        cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
        cp $(SRCDIR)/*.mcp $(DISTDIR)/src
        cp $(MACDIR)/files.lst $(DISTDIR)/src/mac