Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\gizmos\Makefile.in
Last modified2005-08-13 02:23:42.000 +0200
Size27.8 Kb (415 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\gizmos\Makefile.in
Last modified2006-03-16 14:01:14.001 +0100
Size28.4 Kb (426 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged17392
Inserted23
Deleted00
Ignored00
Changed1454



   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_XML = @EXTRALIBS_XML@
46U47UEXTRALIBS_GUI = @EXTRALIBS_GUI@
51 skipped lines
98U99U@COND_DEPS_TRACKING_0@CXXC = $(CXX)
99U100U@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
100U101U@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
101C@COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 102C@COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
102U103U@COND_USE_GUI_0@PORTNAME = base
103U104U@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
104U105U@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
27 skipped lines
132U133U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
133U134U@COND_WINDOWS_IMPLIB_1@__gizmosdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmosdll___importlib)
134U135U@COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll
  136C@COND_ICC_PCH_1@__gizmosdll_PCH_INC = -use_pch \
  137C@COND_ICC_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch
135C@COND_GCC_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \ 138C@COND_USE_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \
136C@COND_GCC_PCH_1@= .pch/wxprec_gizmosdll/wx/wxprec.h.gch 139C@COND_USE_PCH_1@= .pch/wxprec_gizmosdll/wx/wxprec.h.gch
137U140UCOND_USE_SOVERLINUX_1___gizmosdll___soname_flags = \
138U141U    $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
139U142U@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmosdll___soname_flags)
36 skipped lines
176U179U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
177U180U@COND_WINDOWS_IMPLIB_1@__gizmos_xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib)
178U181U@COND_GCC_PCH_1@__gizmos_xrcdll_PCH_INC = -I.pch/wxprec_gizmos_xrcdll
  182C@COND_ICC_PCH_1@__gizmos_xrcdll_PCH_INC = -use_pch \
  183C@COND_ICC_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
179C@COND_GCC_PCH_1@___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname \ 184C@COND_USE_PCH_1@___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname \
180C@COND_GCC_PCH_1@= .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch 185C@COND_USE_PCH_1@= .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
181U186UCOND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags = \
182U187U    $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
183U188U@COND_USE_SOVERLINUX_1@__gizmos_xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags)
34 skipped lines
218U223U@COND_SHARED_0@__gizmoslib___depname = $(COND_SHARED_0___gizmoslib___depname)
219U224U@COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib
220U225U@COND_GCC_PCH_1@__gizmoslib_PCH_INC = -I.pch/wxprec_gizmoslib
  226C@COND_ICC_PCH_1@__gizmoslib_PCH_INC = -use_pch \
  227C@COND_ICC_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch
221C@COND_GCC_PCH_1@___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname \ 228C@COND_USE_PCH_1@___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname \
222C@COND_GCC_PCH_1@= .pch/wxprec_gizmoslib/wx/wxprec.h.gch 229C@COND_USE_PCH_1@= .pch/wxprec_gizmoslib/wx/wxprec.h.gch
223U230UCOND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \
224U231U    $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
225U232U@COND_SHARED_0_USE_XRC_1@__gizmos_xrclib___depname = $(COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname)
226U233U@COND_SHARED_0_USE_XRC_1@__install_gizmos_xrclib___depname \
227U234U@COND_SHARED_0_USE_XRC_1@ = install_gizmos_xrclib
228U235U@COND_GCC_PCH_1@__gizmos_xrclib_PCH_INC = -I.pch/wxprec_gizmos_xrclib
  236C@COND_ICC_PCH_1@__gizmos_xrclib_PCH_INC = -use_pch \
  237C@COND_ICC_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
229C@COND_GCC_PCH_1@___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname \ 238C@COND_USE_PCH_1@___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname \
230C@COND_GCC_PCH_1@= .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch 239C@COND_USE_PCH_1@= .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
231U240U@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
232U241U@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
233U242U@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI
3 skipped lines
237U246U@COND_USE_SOVERSION_0@__gizmos = .$(SO_SUFFIX)
238U247U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__gizmos_0 \
239U248U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
240C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 249C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
241C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.2.0.$(SO_SUFFIX) 250C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.3.1.$(SO_SUFFIX)
242U251U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__gizmos_0 = -0.$(SO_SUFFIX)
243U252U@COND_USE_SOVERSION_0@__gizmos_0 = .$(SO_SUFFIX)
  253A@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  254A@COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
244U255UCOND_MONOLITHIC_1___WXLIB_MONO_p = \
245U256U    -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
246U257U@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
71 skipped lines
318U329U@COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
319U330U@COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
320U331U 
321C@COND_GCC_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch:  332C@COND_USE_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch: 
322C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS) 333C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
323U334U 
324U335U@COND_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOS_XRCDLL_OBJECTS) $(__gizmos_xrcdll___win32rc) $(__gizmosdll___depname)
325U336U@COND_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD)  $(__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_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
6 skipped lines
332U343U@COND_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
333U344U@COND_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_inst_cmd))
334U345U 
335C@COND_GCC_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch:  346C@COND_USE_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch: 
336C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS) 347C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS)
337U348U 
338U349U@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOSLIB_OBJECTS)
339U350U@COND_SHARED_0@   rm -f $@
4 skipped lines
344U355U@COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
345U356U@COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
346U357U 
347C@COND_GCC_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch:  358C@COND_USE_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch: 
348C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS) 359C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS)
349U360U 
350U361U@COND_SHARED_0_USE_XRC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOS_XRCLIB_OBJECTS)
351U362U@COND_SHARED_0_USE_XRC_1@ rm -f $@
4 skipped lines
356U367U@COND_SHARED_0_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
357U368U@COND_SHARED_0_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
358U369U 
359C@COND_GCC_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch:  370C@COND_USE_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch: 
360C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS) 371C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS)
361U372U 
362U373Ugizmosdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOSDLL_ODEP)
363C    $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 374C    $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
364U375U 
365U376Ugizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSDLL_ODEP)
366U377U    $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/dynamicsash.cpp
14 skipped lines
381U392U    $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/statpict.cpp
382U393U 
383U394Ugizmos_xrcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOS_XRCDLL_ODEP)
384C    $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 395C    $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
385U396U 
386U397Ugizmos_xrcdll_xh_statpict.o: $(srcdir)/xh_statpict.cpp $(GIZMOS_XRCDLL_ODEP)
387U398U    $(CXXC) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(srcdir)/xh_statpict.cpp
28 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:24.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.