Conditional compilation of the manager and a minor fix in GUI compilation

git-svn-id: file:///svnroot/mdictionary/trunk@62 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/Makefile b/Makefile
index c5039d7..80285b2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,17 @@ STARDICT_PLUGIN = ${PLUGINS}/stardict
 GUI = ${SOURCE}/gui
 MANAGER = ${SOURCE}/manager
 DBUS = ${SOURCE}/dbus_wrapper
-BOOKMARKS=sql
+BOOKMARKS:=sql
 BOOKMARKS_DIR = ${SOURCE}/bookmarks/${BOOKMARKS}
 
+ifeq (${BOOKMARKS}, sql)
+       SQLITE:=-DSQLITE=0
+endif
+
+ifeq (${BOOKMARKS}, sql3)
+       SQLITE:=-DSQLITE=3
+endif
+
 PACKAGES = packages
 
 #probably trash
@@ -150,8 +158,7 @@ ${BINARIES}/WhiteStorkManager:
 # update-version
                @echo -e -n "**--> Compiling Manager...\n"
                @echo -e -n "**--> Compiling Manager...\n" >> ${LOG_BUILD}
-#              @cd ${MANAGER} && make >> ../../${LOG_BUILD}
-               @make -C ${MANAGER} >> ${LOG_BUILD}
+               @make SQLITE=${SQLITE} -C ${MANAGER} >> ${LOG_BUILD}
 
 ${BINARIES}/ws_dbus.o:
                @echo -e -n "**--> Compiling D-BUS Wrapper... \n"
@@ -164,7 +171,7 @@ ${BINARIES}/WhiteStork:
                @echo -e -n "**--> Compiling User Interface...\n"
                @echo -e -n "**--> Compiling User Interface...\n" >> ${LOG_BUILD}
 #              @cd ${GUI} && make APP_VER=${APP_VER} >> ../../${LOG_BUILD}
-               @make -C ${GUI} >> ${LOG_BUILD}
+               @make APP_VER=${APP_VER} -C ${GUI} >> ${LOG_BUILD}
 
 ${BINARIES}/engine_xdxf.so: 
 # update-version
@@ -184,7 +191,7 @@ ${BINARIES}/ws_bookmark.so:
 # update-version
                @echo -e -n "**--> Compiling Bookmarks...\n"
                @echo -e -n "**--> Compiling Bookmarks...\n" >> ${LOG_BUILD}
-               @cd ${BOOKMARKS_DIR} && make >> ../../../${LOG_BUILD}
+               @make -C ${BOOKMARKS_DIR} >> ${LOG_BUILD}
                
 clean-logs:     
                @echo -e -n "Cleaning all logs\n"
@@ -463,3 +470,7 @@ repo:       release-package meta-package
 
        @rm -rf ${DEB_REP_DIR}
        @./generate_repo ${DEB_REP_DIR}
+       
+test:  
+       @echo ${SQLITE}
+       

diff --git a/src/bookmarks/xdxf/Makefile b/src/bookmarks/xdxf/Makefile
index eaffc2d..aeb665e 100644 (file)
--- a/src/bookmarks/xdxf/Makefile
+++ b/src/bookmarks/xdxf/Makefile
@@ -3,7 +3,7 @@ DEBUG = -Wall -g
 SOURCES = ./src
 INCLUDE = include
 INCLUDE_ENGINE = ../../../include
-LIBS = `pkg-config --libs glib-2.0 gmodule-2.0 gnome-vfs-2.0` -lsqlite
+LIBS = `pkg-config --libs glib-2.0 gmodule-2.0 gnome-vfs-2.0`
 FLAGS = `pkg-config --cflags glib-2.0 gmodule-2.0 gnome-vfs-2.0` -I${INCLUDE} -I${INCLUDE_ENGINE} ${DEBUG}
 BINARIES = bin
 FINAL = ../../../bin/ws_bookmark.so