Typos fixed and further clarification of the Python situation on Panther

[wxWidgets.git] / contrib / src / net / Makefile.in

diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in
index 3b348d30bd577ec7c7bf1a67dc47fb5c9c5efcb6..856f65a6029ecab1978a976e77b9c1b7fbfe59e5 100644 (file)
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -42,21 +42,23 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS $(CXXFLAGS) $(PIC_FLAG)
+NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
+       -DWXMAKINGDLL_NETUTILS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 NETUTILSDLL_OBJECTS =  \
        netutilsdll_email.o \
        netutilsdll_smapi.o \
        netutilsdll_web.o
-NETUTILSLIB_CXXFLAGS = $(__netutilslib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       $(CXXFLAGS)
+NETUTILSDLL_ODEP =  $(___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname)
+NETUTILSLIB_CXXFLAGS = $(__netutilslib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
 NETUTILSLIB_OBJECTS =  \
        netutilslib_email.o \
        netutilslib_smapi.o \
        netutilslib_web.o
+NETUTILSLIB_ODEP =  $(___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname)
 WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
@@ -105,10 +107,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_GCC_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_netutilsdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_netutilslib/wx/wxprec.h.gch
 @COND_SHARED_1@__install_netutilsdll___depname = install_netutilsdll
 @COND_SHARED_0@__install_netutilslib___depname = install_netutilslib
-@COND_GCC_PCH_1@__netutilsdll_PCH_DEP = \
-@COND_GCC_PCH_1@       .pch/wxprec_netutilsdll/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll
 COND_SHARED_1___netutilsdll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
@@ -159,8 +163,6 @@ COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags = \
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX)
-@COND_GCC_PCH_1@__netutilslib_PCH_DEP = \
-@COND_GCC_PCH_1@       .pch/wxprec_netutilslib/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib
 COND_SHARED_0___netutilslib___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a
@@ -188,53 +190,53 @@ distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depname)
-       $(INSTALL_DIR) $(includedir)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; do \
-       if test ! -d $(includedir)/`dirname $$f` ; then \
-       $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
+       if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
        fi; \
-       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \
+       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
        done
 
 install-strip: install
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
 
 @COND_SHARED_1@install_netutilsdll: 
-@COND_SHARED_1@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(libdir)
-@COND_SHARED_1@        (cd $(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd))
+@COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd))
 
 @COND_SHARED_0@install_netutilslib: 
-@COND_SHARED_0@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(__netutilsdll_PCH_DEP)  $(NETUTILSDLL_OBJECTS)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS)
 @COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(__netutilsdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 @COND_SHARED_1@        
 @COND_SHARED_1@        $(__netutilsdll___so_symlinks_cmd)
 
-netutilsdll_email.o: $(srcdir)/email.cpp
+netutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP)
        $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
-netutilsdll_smapi.o: $(srcdir)/smapi.cpp
+netutilsdll_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSDLL_ODEP)
        $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
-netutilsdll_web.o: $(srcdir)/web.cpp
+netutilsdll_web.o: $(srcdir)/web.cpp $(NETUTILSDLL_ODEP)
        $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(__netutilslib_PCH_DEP)  $(NETUTILSLIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(NETUTILSLIB_OBJECTS)
 @COND_SHARED_0@        rm -f $@
 @COND_SHARED_0@        $(AR) rcu $@ $(NETUTILSLIB_OBJECTS)
 @COND_SHARED_0@        $(RANLIB) $@
 
-netutilslib_email.o: $(srcdir)/email.cpp
+netutilslib_email.o: $(srcdir)/email.cpp $(NETUTILSLIB_ODEP)
        $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
-netutilslib_smapi.o: $(srcdir)/smapi.cpp
+netutilslib_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSLIB_ODEP)
        $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
-netutilslib_web.o: $(srcdir)/web.cpp
+netutilslib_web.o: $(srcdir)/web.cpp $(NETUTILSLIB_ODEP)
        $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
 uninstall: