make install, make uninstall and wx-coonfig work again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 5e5ec605ede3bfa38c2ce840906f6df9c50b40ee..646e62592ca7f68cbc8a085bb89e887f0a9c34a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1534,6 +1534,9 @@ TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
 dnl the symbol which allows conditional compilation for the given toolkit
 TOOLKIT_DEF="-D__WX${TOOLKIT}__"
 
+dnl the name of the (libtool) library
+WX_LIBRARY="wx_${TOOLKIT_DIR}"
+
 dnl the name of the (libtool) library
 WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la"
 
@@ -1543,9 +1546,6 @@ WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a"
 dnl the name of the shared library
 WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
 
-dnl the name of the library we actually want to build
-WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
-
 dnl the name of the links to the shared library
 WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}"
 WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so"
@@ -1556,6 +1556,10 @@ SHARED_LD=
 PIC_FLAG=
 WX_CREATE_LINKS=
 
+if test "$wxUSE_SHARED" = "yes"; then
+    dnl set target to shared
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+
 case "${host}" in
   *-hp-hpux* )
     WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
@@ -1565,40 +1569,48 @@ case "${host}" in
   *-*-linux* )
     SHARED_LD="${CC} -shared -o"
     PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-irix5* | *-*-irix6* )
     SHARED_LD="${CXX} -shared -o"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-solaris2* )
     SHARED_LD="${CXX} -G -o"
     PIC_FLAG="PIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-sunos4* )
     SHARED_LD="${CXX} -shared -o"
     PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-freebsd* | *-*-netbsd*)
     SHARED_LD="${CXX} -shared -o"
     PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-osf* )
     SHARED_LD="${CXX} -shared -o"
     PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-dgux5* )
     SHARED_LD="${CXX} -shared -o"
     PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-sysv5* )
     SHARED_LD="${CXX} -shared -o"
     PIC_FLAG="-fPIC"
+    WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
     WX_CREATE_LINKS="CREATE_LINKS"
   ;;
   *-*-aix* )
@@ -1614,6 +1626,11 @@ case "${host}" in
     AC_MSG_ERROR(unknown system type ${host}.)
 esac
 
+else
+    dnl set target to static
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+fi
+
 dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
@@ -2606,6 +2623,7 @@ AC_SUBST(WX_LIBRARY_LINK3)
 
 dnl are we supposed to create the links?
 AC_SUBST(WX_CREATE_LINKS)
+AC_SUBST(WX_CREATE_INSTALLED_LINKS)
 
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 144a18b9d989ac592f3b44b67a6d652f97873f4c..6dbb2ff1c229218d4fde868dd923b657bd65f10f 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -514,6 +514,7 @@ scrolwin.h  W
 serbase.h      W
 settings.h     W
 setup.h        W
+sizer.h        W
 slider.h       W
 socket.h       W
 spinbutt.h     W
@@ -600,7 +601,6 @@ listbox.h   K
 mdi.h  K
 menu.h K
 menuitem.h     K
-msgdlg.h       K
 minifram.h     K
 notebook.h     K
 palette.h      K

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 2ce723ad7f05c65a6e1a93420ad864007e5728b1..c2ed5fe31b2a6c940779a46af43d25d82d9937eb 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -358,7 +358,7 @@ $(REQUIRED_DIRS):   $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDI
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
        
-CREATE_LINKS:  $(OBJECTS)
+CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
        @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi
        @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi
        @if test -e ./lib/@WX_LIBRARY_LINK3@; then rm -f ./lib/@WX_LIBRARY_LINK3@; fi
@@ -366,6 +366,14 @@ CREATE_LINKS:  $(OBJECTS)
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
        
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
+       @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi
+       @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi
+       @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then rm -f $(libdir)/@WX_LIBRARY_LINK3@; fi
+       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
+       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
+       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
+       
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
 parser.o:    parser.c lexer.c
@@ -394,7 +402,10 @@ samples: $(OBJECTS)
            then cp -f -r $(WXDIR)/samples .;  \
        fi
 
-install: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+       @echo " "
+       @echo " Installing wxWindows..."
+       @echo " "
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -403,7 +414,7 @@ install: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top
        @if test ! -d $(libdir)/wx/include; then mkdir $(libdir)/wx/include; fi
        @if test ! -d $(libdir)/wx/include/wx; then mkdir $(libdir)/wx/include/wx; fi
        @if test ! -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then mkdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
-       $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@
+       $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
        @if test ! -d $(includedir)/wx; then mkdir $(includedir)/wx; fi
        @if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi
@@ -413,15 +424,52 @@ install: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top
        @if test ! -d $(includedir)/wx/unix; then mkdir $(includedir)/wx/unix; fi
        @if test ! -d $(includedir)/wx/generic; then mkdir $(includedir)/wx/generic; fi
        @list='$(HEADERS)'; for p in $$list; do \
-         echo '$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p;' \
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
-       @done
+         echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
+       done
+       
+write_message:
+       @echo " "
+       @echo " The installation of wxWindows is finished.  On certain"
+       @echo " platforms (e.g. Linux, Solaris) you'll now have to run"
+       @echo " ldconfig if you installed a shared library."
+       @echo " "
+       @echo " wxWindows comes with  no guarantees  and doesn't claim"
+       @echo " to be suitable for any purpose."
+       @echo " "
+       @echo " Read the wxWindows Licence on licencing conditions."
+       @echo " "
+
+install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message
 
 uninstall:
-       rm -f $(bindir)/wx-config
-       rm -f $(libdir)/@WX_TARGET_LIBRARY@
-       rm -f -r -d $(libdir)/wx
-       rm -f -r -d $(includedir)/wx
+       @echo " "
+       @echo " Uninstalling wxWindows..."
+       @echo " "
+       @echo " Removing library..."
+       @rm -f $(libdir)/@WX_TARGET_LIBRARY@
+       @rm -f $(libdir)/@WX_LIBRARY_LINK1@
+       @rm -f $(libdir)/@WX_LIBRARY_LINK2@
+       @rm -f $(libdir)/@WX_LIBRARY_LINK3@
+       @echo " Removing helper files..."
+       @rm -f $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+       @rm -f $(bindir)/wx-config
+       @echo " Removing headers..."
+       @list='$(HEADERS)'; for p in $$list; do \
+         rm -f $(includedir)/wx/$$p; \
+       done
+       @echo " Removing directories..."
+       @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
+       @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
+       @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
+       @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
+       @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
+       @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
+       @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
+       @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
+       @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
+       @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
+       @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 
 clean:
        rm -f ./src/msw/*.o
@@ -431,6 +479,9 @@ clean:
        rm -f ./src/common/*.o
        rm -f ./src/unix/*.o
        rm -f ./src/generic/*.o
+       rm -f ./src/png/*.o
+       rm -f ./src/jpeg/*.o
+       rm -f ./src/zlib/*.o
        rm -f *.o
        rm -f parser.c
        rm -f lexer.c