Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2006-04-03 23:16:08 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2006-04-03 23:16:08 (GMT)
commitc6caddb3089a0f77e8e25b939a975674ecf67211 (patch)
treea4d7fcb648c04bc9ba05cf1acaca1a4e022d820f
parent5c33f79fdf3bcace40be626bbf8353328f844c6d (diff)
Fix by Slava. Set the sqlite library to the linking of libgcompris instead of the
binary.
-rw-r--r--ChangeLog7
-rw-r--r--src/gcompris/Makefile.am3
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 86ea711..ec06c6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-04-04 Bruno coudoin <bruno.coudoin@free.fr>
+ Fix by Slava. Set the sqlite library to the linking of libgcompris instead of the
+ binary.
+
+ * src/gcompris/Makefile.am:
+
+2006-04-04 Bruno coudoin <bruno.coudoin@free.fr>
+
Fixed several small memory leaks.
* src/boards/awele.c: (awele_next_level):
diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am
index 37ca958..acba80b 100644
--- a/src/gcompris/Makefile.am
+++ b/src/gcompris/Makefile.am
@@ -67,7 +67,6 @@ gcompris_LDADD = \
$(INTLLIBS) \
$(python_ldadd) \
$(top_builddir)/src/gcompris/libgcompris-1.la \
- $(sqlite_ldadd) \
$(LIBPOPT)
@@ -77,7 +76,7 @@ gcompris_LDADD = \
lib_LTLIBRARIES = libgcompris-1.la
libgcompris_1_la_LIBADD = \
- $(GCOMPRIS_LIBS) $(XML_LIBS)
+ $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS)
libgcompris_1_la_LDFLAGS = $(no_undefined) \
-version-info $(LIBGCOMPRIS_CURRENT):$(LIBGCOMPRIS_REVISION):$(LIBGCOMPRIS_AGE)