Compared files  

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


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13248
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@
24 skipped lines
71U72U@COND_DEPS_TRACKING_0@CXXC = $(CXX)
72U73U@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
73U74U@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
74C@COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 75C@COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
75U76U@COND_USE_GUI_0@PORTNAME = base
76U77U@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
77U78U@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
109U110U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
110U111U@COND_WINDOWS_IMPLIB_1@__plotdll___importlib = $(COND_WINDOWS_IMPLIB_1___plotdll___importlib)
111U112U@COND_GCC_PCH_1@__plotdll_PCH_INC = -I.pch/wxprec_plotdll
  113C@COND_ICC_PCH_1@__plotdll_PCH_INC = -use_pch \
  114C@COND_ICC_PCH_1@.pch/wxprec_plotdll/wx/wxprec.h.gch
112C@COND_GCC_PCH_1@___pch_wxprec_plotdll_wx_wxprec_h_gch___depname \ 115C@COND_USE_PCH_1@___pch_wxprec_plotdll_wx_wxprec_h_gch___depname \
113C@COND_GCC_PCH_1@= .pch/wxprec_plotdll/wx/wxprec.h.gch 116C@COND_USE_PCH_1@= .pch/wxprec_plotdll/wx/wxprec.h.gch
114U117U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___targetsuf2 \
115U118U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
116U119U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf2 \
1 skipped line
118U121U@COND_USE_SOVERSION_0@__plotdll___targetsuf2 = .$(SO_SUFFIX)
119U122U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__plotdll___targetsuf3 \
120U123U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
121C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 124C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
122U125U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
123C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 126C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
124U127U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
125U128U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
126U129U@COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
150U153U    $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
151U154U    $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
152U155U@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd)
  156A@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  157A@COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
153U158U@COND_PLATFORM_WIN32_1@__plotdll___win32rc = plotdll_version_rc.o
154U159UCOND_MONOLITHIC_1___WXLIB_MONO_p = \
155U160U    -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
183U188U@COND_SHARED_0@__plotlib___depname = $(COND_SHARED_0___plotlib___depname)
184U189U@COND_SHARED_0@__install_plotlib___depname = install_plotlib
185U190U@COND_GCC_PCH_1@__plotlib_PCH_INC = -I.pch/wxprec_plotlib
  191C@COND_ICC_PCH_1@__plotlib_PCH_INC = -use_pch \
  192C@COND_ICC_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch
186C@COND_GCC_PCH_1@___pch_wxprec_plotlib_wx_wxprec_h_gch___depname \ 193C@COND_USE_PCH_1@___pch_wxprec_plotlib_wx_wxprec_h_gch___depname \
187C@COND_GCC_PCH_1@= .pch/wxprec_plotlib/wx/wxprec.h.gch 194C@COND_USE_PCH_1@= .pch/wxprec_plotlib/wx/wxprec.h.gch
188U195U@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
189U196U@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
190U197U@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
230U237U@COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(DESTDIR)$(libdir)
231U238U@COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__plotdll___so_symlinks_inst_cmd))
232U239U 
233C@COND_GCC_PCH_1@.pch/wxprec_plotdll/wx/wxprec.h.gch:  240C@COND_USE_PCH_1@.pch/wxprec_plotdll/wx/wxprec.h.gch: 
234C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_plotdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTDLL_CXXFLAGS) 241C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_plotdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTDLL_CXXFLAGS)
235U242U 
236U243U@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(PLOTLIB_OBJECTS)
237U244U@COND_SHARED_0@   rm -f $@
4 skipped lines
242U249U@COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
243U250U@COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
244U251U 
245C@COND_GCC_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch:  252C@COND_USE_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch: 
246C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_plotlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTLIB_CXXFLAGS) 253C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_plotlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTLIB_CXXFLAGS)
247U254U 
248U255Uplotdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(PLOTDLL_ODEP)
249C    $(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)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 256C    $(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)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
250U257U 
251U258Uplotdll_plot.o: $(srcdir)/plot.cpp $(PLOTDLL_ODEP)
252U259U    $(CXXC) -c -o $@ $(PLOTDLL_CXXFLAGS) $(srcdir)/plot.cpp
10 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:27.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.