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  

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_XML = @EXTRALIBS_XML@
46 47 EXTRALIBS_GUI = @EXTRALIBS_GUI@
51 skipped lines
98 99 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
99 100 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
100 101 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
101 @COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 102 @COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
102 103 @COND_USE_GUI_0@PORTNAME = base
103 104 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
104 105 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
27 skipped lines
132 133     -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
133 134 @COND_WINDOWS_IMPLIB_1@__gizmosdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmosdll___importlib)
134 135 @COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll
  136 @COND_ICC_PCH_1@__gizmosdll_PCH_INC = -use_pch \
  137 @COND_ICC_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch
135 @COND_GCC_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \ 138 @COND_USE_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \
136 @COND_GCC_PCH_1@= .pch/wxprec_gizmosdll/wx/wxprec.h.gch 139 @COND_USE_PCH_1@= .pch/wxprec_gizmosdll/wx/wxprec.h.gch
137 140 COND_USE_SOVERLINUX_1___gizmosdll___soname_flags = \
138 141     $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
139 142 @COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmosdll___soname_flags)
36 skipped lines
176 179     -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
177 180 @COND_WINDOWS_IMPLIB_1@__gizmos_xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib)
178 181 @COND_GCC_PCH_1@__gizmos_xrcdll_PCH_INC = -I.pch/wxprec_gizmos_xrcdll
  182 @COND_ICC_PCH_1@__gizmos_xrcdll_PCH_INC = -use_pch \
  183 @COND_ICC_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
179 @COND_GCC_PCH_1@___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname \ 184 @COND_USE_PCH_1@___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname \
180 @COND_GCC_PCH_1@= .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch 185 @COND_USE_PCH_1@= .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
181 186 COND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags = \
182 187     $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
183 188 @COND_USE_SOVERLINUX_1@__gizmos_xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags)
34 skipped lines
218 223 @COND_SHARED_0@__gizmoslib___depname = $(COND_SHARED_0___gizmoslib___depname)
219 224 @COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib
220 225 @COND_GCC_PCH_1@__gizmoslib_PCH_INC = -I.pch/wxprec_gizmoslib
  226 @COND_ICC_PCH_1@__gizmoslib_PCH_INC = -use_pch \
  227 @COND_ICC_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch
221 @COND_GCC_PCH_1@___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname \ 228 @COND_USE_PCH_1@___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname \
222 @COND_GCC_PCH_1@= .pch/wxprec_gizmoslib/wx/wxprec.h.gch 229 @COND_USE_PCH_1@= .pch/wxprec_gizmoslib/wx/wxprec.h.gch
223 230 COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \
224 231     $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
225 232 @COND_SHARED_0_USE_XRC_1@__gizmos_xrclib___depname = $(COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname)
226 233 @COND_SHARED_0_USE_XRC_1@__install_gizmos_xrclib___depname \
227 234 @COND_SHARED_0_USE_XRC_1@ = install_gizmos_xrclib
228 235 @COND_GCC_PCH_1@__gizmos_xrclib_PCH_INC = -I.pch/wxprec_gizmos_xrclib
  236 @COND_ICC_PCH_1@__gizmos_xrclib_PCH_INC = -use_pch \
  237 @COND_ICC_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
229 @COND_GCC_PCH_1@___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname \ 238 @COND_USE_PCH_1@___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname \
230 @COND_GCC_PCH_1@= .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch 239 @COND_USE_PCH_1@= .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
231 240 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
232 241 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
233 242 @COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI
3 skipped lines
237 246 @COND_USE_SOVERSION_0@__gizmos = .$(SO_SUFFIX)
238 247 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__gizmos_0 \
239 248 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
240 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 249 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
241 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.2.0.$(SO_SUFFIX) 250 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.3.1.$(SO_SUFFIX)
242 251 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__gizmos_0 = -0.$(SO_SUFFIX)
243 252 @COND_USE_SOVERSION_0@__gizmos_0 = .$(SO_SUFFIX)
  253 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  254 @COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
244 255 COND_MONOLITHIC_1___WXLIB_MONO_p = \
245 256     -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
246 257 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
71 skipped lines
318 329 @COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
319 330 @COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
320 331  
321 @COND_GCC_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch:  332 @COND_USE_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch: 
322 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS) 333 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
323 334  
324 335 @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)
325 336 @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
332 343 @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)
333 344 @COND_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_inst_cmd))
334 345  
335 @COND_GCC_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch:  346 @COND_USE_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch: 
336 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS) 347 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS)
337 348  
338 349 @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOSLIB_OBJECTS)
339 350 @COND_SHARED_0@   rm -f $@
4 skipped lines
344 355 @COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
345 356 @COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
346 357  
347 @COND_GCC_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch:  358 @COND_USE_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch: 
348 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS) 359 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS)
349 360  
350 361 @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)
351 362 @COND_SHARED_0_USE_XRC_1@ rm -f $@
4 skipped lines
356 367 @COND_SHARED_0_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
357 368 @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)
358 369  
359 @COND_GCC_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch:  370 @COND_USE_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch: 
360 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS) 371 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS)
361 372  
362 373 gizmosdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOSDLL_ODEP)
363     $(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 374     $(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
364 375  
365 376 gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSDLL_ODEP)
366 377     $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/dynamicsash.cpp
14 skipped lines
381 392     $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/statpict.cpp
382 393  
383 394 gizmos_xrcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOS_XRCDLL_ODEP)
384     $(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 395     $(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
385 396  
386 397 gizmos_xrcdll_xh_statpict.o: $(srcdir)/xh_statpict.cpp $(GIZMOS_XRCDLL_ODEP)
387 398     $(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  

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:06.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.