Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\net\Makefile.in
Last modified2005-08-13 02:23:42.000 +0200
Size16.7 Kb (279 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\net\Makefile.in
Last modified2006-03-16 14:01:14.001 +0100
Size17.1 Kb (286 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13265
Inserted23
Deleted00
Ignored00
Changed1032



   Comparison Details  

1U1U# =========================================================================
2U2U#     This makefile was generated by
3C#     Bakefile 0.1.9 (http://bakefile.sourceforge.net) 3C#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
4U4U#     Do not modify, all changes will be overwritten!
5U5U# =========================================================================
6U6U 
9 skipped lines
16U16USO_SUFFIX = @SO_SUFFIX@
17U17UDLLIMP_SUFFIX = @DLLIMP_SUFFIX@
18U18ULN_S = @LN_S@
19CRESCOMP = @RESCOMP@ 19CWINDRES = @WINDRES@
20U20UPIC_FLAG = @PIC_FLAG@
21U21USONAME_FLAG = @SONAME_FLAG@
22U22USTRIP = @STRIP@
18 skipped lines
41U41UTOOLKIT = @TOOLKIT@
42U42UTOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
43U43UTOOLKIT_VERSION = @TOOLKIT_VERSION@
  44ATOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
44U45UEXTRALIBS = @EXTRALIBS@
45U46UEXTRALIBS_GUI = @EXTRALIBS_GUI@
46U47UHOST_SUFFIX = @HOST_SUFFIX@
28 skipped lines
75U76U@COND_DEPS_TRACKING_0@CXXC = $(CXX)
76U77U@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
77U78U@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
78C@COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 79C@COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
79U80U@COND_USE_GUI_0@PORTNAME = base
80U81U@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
81U82U@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
113U114U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
114U115U@COND_WINDOWS_IMPLIB_1@__netutilsdll___importlib = $(COND_WINDOWS_IMPLIB_1___netutilsdll___importlib)
115U116U@COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll
  117C@COND_ICC_PCH_1@__netutilsdll_PCH_INC = -use_pch \
  118C@COND_ICC_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch
116C@COND_GCC_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \ 119C@COND_USE_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \
117C@COND_GCC_PCH_1@= .pch/wxprec_netutilsdll/wx/wxprec.h.gch 120C@COND_USE_PCH_1@= .pch/wxprec_netutilsdll/wx/wxprec.h.gch
118U121U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
119U122U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
120U123U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
1 skipped line
122U125U@COND_USE_SOVERSION_0@__netutilsdll___targetsuf2 = .$(SO_SUFFIX)
123U126U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
124U127U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
125C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 128C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
126U129U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
127C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 130C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
128U131U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
129U132U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
130U133U@COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX)
24 skipped lines
155U158U    $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
156U159U    $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
157U160U@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd)
  161A@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  162A@COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
158U163U@COND_PLATFORM_WIN32_1@__netutilsdll___win32rc = netutilsdll_version_rc.o
159U164UCOND_MONOLITHIC_1___WXLIB_MONO_p = \
160U165U    -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
188U193U@COND_SHARED_0@__netutilslib___depname = $(COND_SHARED_0___netutilslib___depname)
189U194U@COND_SHARED_0@__install_netutilslib___depname = install_netutilslib
190U195U@COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib
  196C@COND_ICC_PCH_1@__netutilslib_PCH_INC = -use_pch \
  197C@COND_ICC_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch
191C@COND_GCC_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \ 198C@COND_USE_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \
192C@COND_GCC_PCH_1@= .pch/wxprec_netutilslib/wx/wxprec.h.gch 199C@COND_USE_PCH_1@= .pch/wxprec_netutilslib/wx/wxprec.h.gch
193U200U@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
194U201U@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
195U202U@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
235U242U@COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(DESTDIR)$(libdir)
236U243U@COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd))
237U244U 
238C@COND_GCC_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch:  245C@COND_USE_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch: 
239C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS) 246C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS)
240U247U 
241U248U@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETUTILSLIB_OBJECTS)
242U249U@COND_SHARED_0@   rm -f $@
4 skipped lines
247U254U@COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
248U255U@COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
249U256U 
250C@COND_GCC_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch:  257C@COND_USE_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch: 
251C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS) 258C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS)
252U259U 
253U260Unetutilsdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(NETUTILSDLL_ODEP)
254C    $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 261C    $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
255U262U 
256U263Unetutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP)
257U264U    $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(srcdir)/email.cpp
22 skipped lines

   Text comparison Options  

Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:26.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.