diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-03-22 22:38:41 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-03-22 22:38:41 (GMT) |
| commit | 523a9405e8c20fad2da35de9163fc5fd80601012 (patch) | |
| tree | 57afb9f90837a6785d3d416138aabcd07f8b89e2 | |
| parent | 553050b42c438fd6a30c8620dcb727b70c8dacf1 (diff) | |
Fixed bad compilation directive sqlite_ldflags replaced by
sqlite_ldadd (Thanks to Slava Dubrovskiy)
Added a warning in the INSTALL file to warn make -j does not work.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | INSTALL | 3 | ||||
| -rw-r--r-- | src/gcompris/Makefile.am | 7 |
3 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,14 @@ 2006-03-22 Bruno coudoin <bruno.coudoin@free.fr> + Fixed bad compilation directive sqlite_ldflags replaced by + sqlite_ldadd (Thanks to Slava Dubrovskiy) + Added a warning in the INSTALL file to warn make -j does not work. + + * INSTALL: + * src/gcompris/Makefile.am: + +2006-03-22 Bruno coudoin <bruno.coudoin@free.fr> + * boards/gcompris/animals/donkey.jpg: By Anne and Erwan. Released under GPL. * boards/gcompris/animals/readme.txt: * boards/images/README: @@ -6,8 +6,11 @@ Gcompris can be installed anywhere on your hard drive. for example, you can use: sh configure --prefix=/home/bruno/gcompris +make +make install Warning: You cannot use ~ in the prefix, it must be a full path. +Warning: It has been reported that make -j 2 (or more) break the compilation This will install gcompris and all its data files under /home/bruno/gcompris diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am index 1bb9a32..37ca958 100644 --- a/src/gcompris/Makefile.am +++ b/src/gcompris/Makefile.am @@ -8,10 +8,10 @@ python_ldflags = endif if USE_SQLITE -sqlite_ldflags = $(SQLITE3_LIBS) +sqlite_ldadd = $(SQLITE3_LIBS) sqlite_cflags = $(SQLITE3_CFLAGS) else -sqlite_ldflags = +sqlite_ldadd = sqlite_cflags = endif @@ -59,7 +59,7 @@ gcompris_SOURCES = \ main.c gcompris_LDFLAGS = \ - -export-dynamic $(python_ldflags) $(SDL_LIBS) $(sqlite_ldflags) $(cairo_ldflags) + -export-dynamic $(python_ldflags) $(SDL_LIBS) $(cairo_ldflags) gcompris_LDADD = \ @@ -67,6 +67,7 @@ gcompris_LDADD = \ $(INTLLIBS) \ $(python_ldadd) \ $(top_builddir)/src/gcompris/libgcompris-1.la \ + $(sqlite_ldadd) \ $(LIBPOPT) |