diff -up gnucash-2.4.5/src/pixmaps/Makefile.in.foo gnucash-2.4.5/src/pixmaps/Makefile.in --- gnucash-2.4.5/src/pixmaps/Makefile.in.foo 2011-05-20 16:37:58.421519215 -0400 +++ gnucash-2.4.5/src/pixmaps/Makefile.in 2011-05-20 16:38:43.862519220 -0400 @@ -875,51 +875,51 @@ uninstall-am: uninstall-gncextrasmallico uninstall-gncsmalltwtwoiconDATA uninstall-hook -@BUILDING_FROM_SVN_TRUE@256x256/gnucash-icon.png: gnucash-icon-256x256.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 256x256 -@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@128x128/gnucash-icon.png: gnucash-icon-128x128.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 128x128 -@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-128x128.png 128x128/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@96x96/gnucash-icon.png: gnucash-icon-96x96.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 96x96 -@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-96x96.png 96x96/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@64x64/gnucash-icon.png: gnucash-icon-64x64.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 64x64 -@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-64x64.png 64x64/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@48x48/gnucash-icon.png: gnucash-icon-48x48.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 48x48 -@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 32x32 -@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 24x24 -@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 22x22 -@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png -@BUILDING_FROM_SVN_TRUE@ -mkdir -p 16x16 -@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png - -@BUILDING_FROM_SVN_TRUE@scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg -@BUILDING_FROM_SVN_TRUE@ -mkdir -p scalable -@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg +#256x256/gnucash-icon.png: gnucash-icon-256x256.png +# -mkdir -p 256x256 +# cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png + +#128x128/gnucash-icon.png: gnucash-icon-128x128.png +# -mkdir -p 128x128 +# cp ${srcdir}/gnucash-icon-128x128.png 128x128/gnucash-icon.png + +#96x96/gnucash-icon.png: gnucash-icon-96x96.png +# -mkdir -p 96x96 +# cp ${srcdir}/gnucash-icon-96x96.png 96x96/gnucash-icon.png + +#64x64/gnucash-icon.png: gnucash-icon-64x64.png +# -mkdir -p 64x64 +# cp ${srcdir}/gnucash-icon-64x64.png 64x64/gnucash-icon.png + +#48x48/gnucash-icon.png: gnucash-icon-48x48.png +# -mkdir -p 48x48 +# cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png + +#32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png +# -mkdir -p 32x32 +# cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png + +#24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png +# -mkdir -p 24x24 +# cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png + +#22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png +# -mkdir -p 22x22 +# cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png + +#16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png +# -mkdir -p 16x16 +# cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png + +#scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg +# -mkdir -p scalable +# cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg -@BUILDING_FROM_SVN_TRUE@gnucash-icon-16x16.png: -@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/16x16/gnucash.png gnucash-icon-16x16.png +#gnucash-icon-16x16.png: +# cp ${top_srcdir}/art/tango/16x16/gnucash.png gnucash-icon-16x16.png -@BUILDING_FROM_SVN_TRUE@gnucash-icon-32x32.png: -@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/32x32/gnucash.png gnucash-icon-32x32.png +#gnucash-icon-32x32.png: +# cp ${top_srcdir}/art/tango/32x32/gnucash.png gnucash-icon-32x32.png @OS_WIN32_FALSE@install-data-hook: update-icon-cache @OS_WIN32_FALSE@uninstall-hook: update-icon-cache @OS_WIN32_FALSE@update-icon-cache: @@ -932,8 +932,8 @@ uninstall-am: uninstall-gncextrasmallico @OS_WIN32_FALSE@ fi # Only clean up if we're building from SVN -@BUILDING_FROM_SVN_TRUE@clean-local: -@BUILDING_FROM_SVN_TRUE@ -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable +#clean-local: +# -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable # Create gnucash-icon.ico .PHONY: ico diff -up gnucash-2.4.5/src/pixmaps/Makefile.am.foo gnucash-2.4.5/src/pixmaps/Makefile.am --- gnucash-2.4.5/src/pixmaps/Makefile.am.foo 2011-05-20 16:44:05.920519268 -0400 +++ gnucash-2.4.5/src/pixmaps/Makefile.am 2011-05-20 16:44:33.625519271 -0400 @@ -76,54 +76,6 @@ gncextrasmallicon_DATA = 16x16/gnucash-i gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps gncscalableicon_DATA = scalable/gnucash-icon.svg -if BUILDING_FROM_SVN -256x256/gnucash-icon.png: gnucash-icon-256x256.png - -mkdir -p 256x256 - cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png - -128x128/gnucash-icon.png: gnucash-icon-128x128.png - -mkdir -p 128x128 - cp ${srcdir}/gnucash-icon-128x128.png 128x128/gnucash-icon.png - -96x96/gnucash-icon.png: gnucash-icon-96x96.png - -mkdir -p 96x96 - cp ${srcdir}/gnucash-icon-96x96.png 96x96/gnucash-icon.png - -64x64/gnucash-icon.png: gnucash-icon-64x64.png - -mkdir -p 64x64 - cp ${srcdir}/gnucash-icon-64x64.png 64x64/gnucash-icon.png - -48x48/gnucash-icon.png: gnucash-icon-48x48.png - -mkdir -p 48x48 - cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png - -32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png - -mkdir -p 32x32 - cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png - -24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png - -mkdir -p 24x24 - cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png - -22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png - -mkdir -p 22x22 - cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png - -16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png - -mkdir -p 16x16 - cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png - -scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg - -mkdir -p scalable - cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg - -gnucash-icon-16x16.png: - cp ${top_srcdir}/art/tango/16x16/gnucash.png gnucash-icon-16x16.png - -gnucash-icon-32x32.png: - cp ${top_srcdir}/art/tango/32x32/gnucash.png gnucash-icon-32x32.png -endif - # As suggested by if !OS_WIN32 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor @@ -158,12 +110,6 @@ EXTRA_DIST = \ ${ico_files_lr} \ ${gncscalableicon_DATA} -# Only clean up if we're building from SVN -if BUILDING_FROM_SVN -clean-local: - -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable -endif - # Create gnucash-icon.ico .PHONY: ico ico: ${ico_files_hr} ${ico_files_lr} diff -up gnucash-2.4.5/src/optional/python-bindings/Makefile.am.foo gnucash-2.4.5/src/optional/python-bindings/Makefile.am --- gnucash-2.4.5/src/optional/python-bindings/Makefile.am.foo 2011-06-13 15:06:35.555912025 -0400 +++ gnucash-2.4.5/src/optional/python-bindings/Makefile.am 2011-06-13 15:07:14.096912030 -0400 @@ -41,48 +41,6 @@ _gnucash_core_c_la_LIBADD = \ ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/engine/libgncmod-engine.la -if BUILDING_FROM_SVN -_gnucash_core_c_includes= \ - ${top_builddir}/config.h \ - ${top_srcdir}/src/libqof/qof/qofsession.h \ - ${top_srcdir}/src/libqof/qof/qofbook.h \ - ${top_srcdir}/src/libqof/qof/qofbackend.h \ - ${top_srcdir}/src/libqof/qof/qoflog.h \ - ${top_srcdir}/src/libqof/qof/qofutil.h \ - ${top_srcdir}/src/libqof/qof/qofid.h \ - ${top_srcdir}/src/libqof/qof/guid.h \ - ${top_srcdir}/src/gnc-module/gnc-module.h \ - ${top_srcdir}/src/engine/gnc-engine.h \ - ${top_srcdir}/src/engine/Transaction.h \ - ${top_srcdir}/src/gnc/Transaction.hpp \ - ${top_srcdir}/src/engine/Split.h \ - ${top_srcdir}/src/engine/Account.h \ - ${top_srcdir}/src/engine/gnc-commodity.h \ - ${top_srcdir}/src/engine/gnc-lot.h \ - ${top_srcdir}/src/libqof/qof/gnc-numeric.h \ - ${top_srcdir}/src/engine/gncCustomer.h \ - ${top_srcdir}/src/engine/gncEmployee.h \ - ${top_srcdir}/src/engine/gncVendor.h \ - ${top_srcdir}/src/engine/gncAddress.h \ - ${top_srcdir}/src/engine/gncBillTerm.h \ - ${top_srcdir}/src/engine/gncOwner.h \ - ${top_srcdir}/src/engine/gncInvoice.h \ - ${top_srcdir}/src/engine/gncJob.h \ - ${top_srcdir}/src/engine/gncEntry.h \ - ${top_srcdir}/src/engine/gncTaxTable.h \ - ${top_srcdir}/src/engine/gncIDSearch.h \ - ${top_srcdir}/src/engine/gnc-pricedb.h - - -gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes) - swig -python -Wall -Werror \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/engine \ - -I$(top_srcdir)/src/business/business-core \ - -I${top_srcdir}/src/libqof/qof \ - -o $@ $< - -gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) -endif EXTRA_DIST = \ $(SWIG_FILES) \ diff -up gnucash-2.4.5/src/optional/python-bindings/Makefile.in.foo gnucash-2.4.5/src/optional/python-bindings/Makefile.in --- gnucash-2.4.5/src/optional/python-bindings/Makefile.in.foo 2011-06-13 15:06:41.207912044 -0400 +++ gnucash-2.4.5/src/optional/python-bindings/Makefile.in 2011-06-13 15:07:42.033912035 -0400 @@ -452,36 +452,36 @@ _gnucash_core_c_la_LIBADD = \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/engine/libgncmod-engine.la -@BUILDING_FROM_SVN_TRUE@_gnucash_core_c_includes = \ -@BUILDING_FROM_SVN_TRUE@ ${top_builddir}/config.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofsession.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofbook.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofbackend.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qoflog.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofutil.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofid.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/guid.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/gnc-module/gnc-module.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-engine.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/Transaction.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/gnc/Transaction.hpp \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/Split.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/Account.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-commodity.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-lot.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/gnc-numeric.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncCustomer.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncEmployee.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncVendor.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncAddress.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncBillTerm.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncOwner.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncInvoice.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncJob.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncEntry.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncTaxTable.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncIDSearch.h \ -@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-pricedb.h +#_gnucash_core_c_includes = \ +# ${top_builddir}/config.h \ +# ${top_srcdir}/src/libqof/qof/qofsession.h \ +# ${top_srcdir}/src/libqof/qof/qofbook.h \ +# ${top_srcdir}/src/libqof/qof/qofbackend.h \ +# ${top_srcdir}/src/libqof/qof/qoflog.h \ +# ${top_srcdir}/src/libqof/qof/qofutil.h \ +# ${top_srcdir}/src/libqof/qof/qofid.h \ +# ${top_srcdir}/src/libqof/qof/guid.h \ +# ${top_srcdir}/src/gnc-module/gnc-module.h \ +# ${top_srcdir}/src/engine/gnc-engine.h \ +# ${top_srcdir}/src/engine/Transaction.h \ +# ${top_srcdir}/src/gnc/Transaction.hpp \ +# ${top_srcdir}/src/engine/Split.h \ +# ${top_srcdir}/src/engine/Account.h \ +# ${top_srcdir}/src/engine/gnc-commodity.h \ +# ${top_srcdir}/src/engine/gnc-lot.h \ +# ${top_srcdir}/src/libqof/qof/gnc-numeric.h \ +# ${top_srcdir}/src/engine/gncCustomer.h \ +# ${top_srcdir}/src/engine/gncEmployee.h \ +# ${top_srcdir}/src/engine/gncVendor.h \ +# ${top_srcdir}/src/engine/gncAddress.h \ +# ${top_srcdir}/src/engine/gncBillTerm.h \ +# ${top_srcdir}/src/engine/gncOwner.h \ +# ${top_srcdir}/src/engine/gncInvoice.h \ +# ${top_srcdir}/src/engine/gncJob.h \ +# ${top_srcdir}/src/engine/gncEntry.h \ +# ${top_srcdir}/src/engine/gncTaxTable.h \ +# ${top_srcdir}/src/engine/gncIDSearch.h \ +# ${top_srcdir}/src/engine/gnc-pricedb.h EXTRA_DIST = \ $(SWIG_FILES) \ @@ -995,14 +995,14 @@ uninstall-am: uninstall-pkgpyexecLTLIBRA uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpythonPYTHON -@BUILDING_FROM_SVN_TRUE@gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes) -@BUILDING_FROM_SVN_TRUE@ swig -python -Wall -Werror \ -@BUILDING_FROM_SVN_TRUE@ -I$(top_srcdir)/src -I$(top_srcdir)/src/engine \ -@BUILDING_FROM_SVN_TRUE@ -I$(top_srcdir)/src/business/business-core \ -@BUILDING_FROM_SVN_TRUE@ -I${top_srcdir}/src/libqof/qof \ -@BUILDING_FROM_SVN_TRUE@ -o $@ $< +#gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes) +# swig -python -Wall -Werror \ +# -I$(top_srcdir)/src -I$(top_srcdir)/src/engine \ +# -I$(top_srcdir)/src/business/business-core \ +# -I${top_srcdir}/src/libqof/qof \ +# -o $@ $< -@BUILDING_FROM_SVN_TRUE@gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) +#gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.