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  

1 1 # =========================================================================
2 2 #     This makefile was generated by
3 #     Bakefile 0.1.9 (http://bakefile.sourceforge.net) 3 #     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
4 4 #     Do not modify, all changes will be overwritten!
5 5 # =========================================================================
6 6  
9 skipped lines
16 16 SO_SUFFIX = @SO_SUFFIX@
17 17 DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
18 18 LN_S = @LN_S@
19 RESCOMP = @RESCOMP@ 19 WINDRES = @WINDRES@
20 20 PIC_FLAG = @PIC_FLAG@
21 21 SONAME_FLAG = @SONAME_FLAG@
22 22 STRIP = @STRIP@
18 skipped lines
41 41 TOOLKIT = @TOOLKIT@
42 42 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
43 43 TOOLKIT_VERSION = @TOOLKIT_VERSION@
  44 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
44 45 EXTRALIBS = @EXTRALIBS@
45 46 EXTRALIBS_GUI = @EXTRALIBS_GUI@
46 47 HOST_SUFFIX = @HOST_SUFFIX@
28 skipped lines
75 76 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
76 77 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
77 78 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
78 @COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 79 @COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
79 80 @COND_USE_GUI_0@PORTNAME = base
80 81 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
81 82 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
113 114     -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
114 115 @COND_WINDOWS_IMPLIB_1@__netutilsdll___importlib = $(COND_WINDOWS_IMPLIB_1___netutilsdll___importlib)
115 116 @COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll
  117 @COND_ICC_PCH_1@__netutilsdll_PCH_INC = -use_pch \
  118 @COND_ICC_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch
116 @COND_GCC_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \ 119 @COND_USE_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \
117 @COND_GCC_PCH_1@= .pch/wxprec_netutilsdll/wx/wxprec.h.gch 120 @COND_USE_PCH_1@= .pch/wxprec_netutilsdll/wx/wxprec.h.gch
118 121 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
119 122 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
120 123 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
1 skipped line
122 125 @COND_USE_SOVERSION_0@__netutilsdll___targetsuf2 = .$(SO_SUFFIX)
123 126 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
124 127 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
125 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 128 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
126 129 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
127 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 130 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
128 131 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
129 132 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
130 133 @COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX)
24 skipped lines
155 158     $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
156 159     $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
157 160 @COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd)
  161 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  162 @COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
158 163 @COND_PLATFORM_WIN32_1@__netutilsdll___win32rc = netutilsdll_version_rc.o
159 164 COND_MONOLITHIC_1___WXLIB_MONO_p = \
160 165     -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
188 193 @COND_SHARED_0@__netutilslib___depname = $(COND_SHARED_0___netutilslib___depname)
189 194 @COND_SHARED_0@__install_netutilslib___depname = install_netutilslib
190 195 @COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib
  196 @COND_ICC_PCH_1@__netutilslib_PCH_INC = -use_pch \
  197 @COND_ICC_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch
191 @COND_GCC_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \ 198 @COND_USE_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \
192 @COND_GCC_PCH_1@= .pch/wxprec_netutilslib/wx/wxprec.h.gch 199 @COND_USE_PCH_1@= .pch/wxprec_netutilslib/wx/wxprec.h.gch
193 200 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
194 201 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
195 202 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
235 242 @COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(DESTDIR)$(libdir)
236 243 @COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd))
237 244  
238 @COND_GCC_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch:  245 @COND_USE_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch: 
239 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS) 246 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS)
240 247  
241 248 @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETUTILSLIB_OBJECTS)
242 249 @COND_SHARED_0@   rm -f $@
4 skipped lines
247 254 @COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
248 255 @COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
249 256  
250 @COND_GCC_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch:  257 @COND_USE_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch: 
251 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS) 258 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS)
252 259  
253 260 netutilsdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(NETUTILSDLL_ODEP)
254     $(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 261     $(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
255 262  
256 263 netutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP)
257 264     $(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  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

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