r14761 - gnucash/branches/2.0 - Drop gtktreedatalist (and gnctreemodelsort) from the build because it can

[Derek Atkins]

Author: warlord
Date: 2006-08-28 23:28:15 -0400 (Mon, 28 Aug 2006)
New Revision: 14761
Trac: http://svn.gnucash.org/trac/changeset/14761

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/po/POTFILES.skip
   gnucash/branches/2.0/src/gnome-utils/Makefile.am
Log:
   Drop gtktreedatalist (and gnctreemodelsort) from the build because it can
   conflict with the real gtk+ version of the same file, depending on the
   linking order of libgncmod-gnome-utils.so and the gtk+ libraries.

Merge from r14709.



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13188
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13189

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-08-29 03:28:04 UTC (rev 14760)
+++ gnucash/branches/2.0/ChangeLog	2006-08-29 03:28:15 UTC (rev 14761)
@@ -1,3 +1,10 @@
+2006-08-22  Chris Shoemaker <chris.shoemaker at cox.net>
+
+   Drop gtktreedatalist (and gnctreemodelsort) from the build because it can
+   conflict with the real gtk+ version of the same file, depending on the
+   linking order of libgncmod-gnome-utils.so and the gtk+ libraries.
+
+
 2006-08-20  David Hampton  <hampton at employees.org>
 
 	* src/gnome/gnc-plugin-page-account-tree.c: Maintain the account

Modified: gnucash/branches/2.0/po/POTFILES.skip
===================================================================
--- gnucash/branches/2.0/po/POTFILES.skip	2006-08-29 03:28:04 UTC (rev 14760)
+++ gnucash/branches/2.0/po/POTFILES.skip	2006-08-29 03:28:15 UTC (rev 14761)
@@ -4,6 +4,8 @@
 src/import-export/csv/gnc-csv2glist.c
 src/business/business-core/gncBusPeriod.c
 src/backend/dwi/qofmap.c
+src/gnome-utils/gnctreemodelsort.c
+src/gnome-utils/gtktreedatalist.c
 src/gnome-utils/gnc-tree-model-selection.c
 src/backend/file/gncmod-backend-file.c
 src/backend/file/io-gncbin-r.c

Modified: gnucash/branches/2.0/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/Makefile.am	2006-08-29 03:28:04 UTC (rev 14760)
+++ gnucash/branches/2.0/src/gnome-utils/Makefile.am	2006-08-29 03:28:15 UTC (rev 14761)
@@ -30,8 +30,6 @@
   ${GSF_CFLAGS}
 
 libgncmod_gnome_utils_la_SOURCES = \
-  gtktreedatalist.c \
-  gnctreemodelsort.c \
   QuickFill.c \
   account-quickfill.c \
   cursors.c \
@@ -101,8 +99,6 @@
 
 gncincludedir = ${GNC_INCLUDE_DIR}
 gncinclude_HEADERS = \
-  gtktreedatalist.h \
-  gnctreemodelsort.h \
   QuickFill.h \
   account-quickfill.h \
   dialog-account.h \