renamed src/modules/storage to src/modules/storageClient

livesupport/bin/gen_coverage_data.sh

@@ -46,7 +46,7 @@ coverage_report_dir=$docdir/coverage
 core_coverage_file=$modules_dir/core/tmp/coverage.info
 authentication_coverage_file=$modules_dir/authentication/tmp/coverage.info
 db_coverage_file=$modules_dir/db/tmp/coverage.info
-storage_coverage_file=$modules_dir/storage/tmp/coverage.info
+storageClient_coverage_file=$modules_dir/storageClient/tmp/coverage.info
 eventScheduler_coverage_file=$modules_dir/eventScheduler/tmp/coverage.info
 schedulerClient_coverage_file=$modules_dir/schedulerClient/tmp/coverage.info
 playlistExecutor_coverage_file=$modules_dir/playlistExecutor/tmp/coverage.info
@@ -64,7 +64,7 @@ genhtml=$usrdir/bin/genhtml
 $modules_dir/core/bin/gen_coverage_data.sh
 $modules_dir/authentication/bin/gen_coverage_data.sh
 $modules_dir/db/bin/gen_coverage_data.sh
-$modules_dir/storage/bin/gen_coverage_data.sh
+$modules_dir/storageClient/bin/gen_coverage_data.sh
 $modules_dir/eventScheduler/bin/gen_coverage_data.sh
 $modules_dir/schedulerClient/bin/gen_coverage_data.sh
 $modules_dir/playlistExecutor/bin/gen_coverage_data.sh
@@ -80,7 +80,7 @@ echo "" > $coverage_file
 cat $core_coverage_file | sed -e "s/core\/tmp\//core\//g" >> $coverage_file
 cat $authentication_coverage_file | sed -e "s/authentication\/tmp\//authentication\//g" >> $coverage_file
 cat $db_coverage_file | sed -e "s/db\/tmp\//db\//g" >> $coverage_file
-cat $storage_coverage_file | sed -e "s/storage\/tmp\//storage\//g" >> $coverage_file
+cat $storageClient_coverage_file | sed -e "s/storageClient\/tmp\//storageClient\//g" >> $coverage_file
 cat $eventScheduler_coverage_file | sed -e "s/eventScheduler\/tmp\//eventScheduler\//g" >> $coverage_file
 cat $schedulerClient_coverage_file | sed -e "s/schedulerClient\/tmp\//schedulerClient\//g" >> $coverage_file
 cat $playlistExecutor_coverage_file | sed -e "s/playlistExecutor\/tmp\//playlistExecutor\//g" >> $coverage_file

livesupport/bin/user_setup.sh

@@ -290,11 +290,11 @@ cat $modules_dir/schedulerClient/etc/schedulerDaemonXmlRpcClient.xml.template \
     | sed -e "$replace_sed_string" \
     > $configdir/schedulerDaemonXmlRpcClient.xml
 
-cat $modules_dir/storage/etc/webAuthenticationClient.xml.template \
+cat $modules_dir/storageClient/etc/webAuthenticationClient.xml.template \
     | sed -e "$replace_sed_string" \
     > $configdir/webAuthenticationClient.xml
 
-cat $modules_dir/storage/etc/webStorage.xml.template \
+cat $modules_dir/storageClient/etc/webStorage.xml.template \
     | sed -e "$replace_sed_string" \
     > $configdir/webStorage.xml
 

livesupport/etc/Makefile.in

@@ -128,7 +128,7 @@ MODULES_DIR            = ${SRC_DIR}/modules
 CORE_DIR               = ${MODULES_DIR}/core
 AUTHENTICATION_DIR     = ${MODULES_DIR}/authentication
 DB_DIR                 = ${MODULES_DIR}/db
-STORAGE_DIR            = ${MODULES_DIR}/storage
+STORAGE_CLIENT_DIR     = ${MODULES_DIR}/storageClient
 GSTREAMER_ELEMENTS_DIR = ${MODULES_DIR}/gstreamerElements
 PLAYLIST_EXECUTOR_DIR  = ${MODULES_DIR}/playlistExecutor
 EVENT_SCHEDULER_DIR    = ${MODULES_DIR}/eventScheduler
@@ -186,7 +186,7 @@ flawfinder:
                   ${CORE_DIR}/include ${CORE_DIR}/src \
                   ${AUTHENTICATION_DIR}/include ${AUTHENTICATION_DIR}/src \
                   ${DB_DIR}/include ${DB_DIR}/src \
-                  ${STORAGE_DIR}/include ${STORAGE_DIR}/src \
+                  ${STORAGE_CLIENT_DIR}/include ${STORAGE_CLIENT_DIR}/src \
                   ${GSTREAMER_ELEMENTS_DIR}/include \
                   ${GSTREAMER_ELEMENTS_DIR}/src \
                   ${PLAYLIST_EXECUTOR_DIR}/include \
@@ -329,7 +329,7 @@ ${TMP_DIR}/modules_setup.stamp:
 	cd ${CORE_DIR} && ./configure --prefix=${prefix}
 	cd ${AUTHENTICATION_DIR} && ./configure --prefix=${prefix}
 	cd ${DB_DIR} && ./configure --prefix=${prefix}
-	cd ${STORAGE_DIR} && ./configure --prefix=${prefix}
+	cd ${STORAGE_CLIENT_DIR} && ./configure --prefix=${prefix}
 	cd ${GSTREAMER_ELEMENTS_DIR} && ./configure --prefix=${prefix}
 	cd ${PLAYLIST_EXECUTOR_DIR} && ./configure --prefix=${prefix}
 	cd ${EVENT_SCHEDULER_DIR} && ./configure --prefix=${prefix}
@@ -370,7 +370,7 @@ modprod_distclean:
 	${MAKE} -C ${CORE_DIR} distclean
 	${MAKE} -C ${AUTHENTICATION_DIR} distclean
 	${MAKE} -C ${DB_DIR} distclean
-	${MAKE} -C ${STORAGE_DIR} distclean
+	${MAKE} -C ${STORAGE_CLIENT_DIR} distclean
 	${MAKE} -C ${GSTREAMER_ELEMENTS_DIR} distclean
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} distclean
 	${MAKE} -C ${EVENT_SCHEDULER_DIR} distclean
@@ -386,7 +386,7 @@ depclean:
 	${MAKE} -C ${CORE_DIR} depclean
 	${MAKE} -C ${AUTHENTICATION_DIR} depclean
 	${MAKE} -C ${DB_DIR} depclean
-	${MAKE} -C ${STORAGE_DIR} depclean
+	${MAKE} -C ${STORAGE_CLIENT_DIR} depclean
 	${MAKE} -C ${GSTREAMER_ELEMENTS_DIR} depclean
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} depclean
 	${MAKE} -C ${EVENT_SCHEDULER_DIR} depclean
@@ -402,7 +402,7 @@ ${TMP_DIR}/compile.stamp:
 	${MAKE} -C ${CORE_DIR} all
 	${MAKE} -C ${AUTHENTICATION_DIR} all
 	${MAKE} -C ${DB_DIR} all
-	${MAKE} -C ${STORAGE_DIR} all
+	${MAKE} -C ${STORAGE_CLIENT_DIR} all
 	${MAKE} -C ${GSTREAMER_ELEMENTS_DIR} all
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} all
 	${MAKE} -C ${EVENT_SCHEDULER_DIR} all
@@ -416,7 +416,7 @@ check:
 	-${MAKE} -C ${CORE_DIR} check
 	-${MAKE} -C ${AUTHENTICATION_DIR} check
 	-${MAKE} -C ${DB_DIR} check
-	-${MAKE} -C ${STORAGE_DIR} check
+	-${MAKE} -C ${STORAGE_CLIENT_DIR} check
 	-${MAKE} -C ${GSTREAMER_ELEMENTS_DIR} check
 	-${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} check
 	-${MAKE} -C ${EVENT_SCHEDULER_DIR} check
@@ -467,7 +467,7 @@ install_modules:
 	${MAKE} -C ${CORE_DIR} install
 	${MAKE} -C ${AUTHENTICATION_DIR} install
 	${MAKE} -C ${DB_DIR} install
-	${MAKE} -C ${STORAGE_DIR} install
+	${MAKE} -C ${STORAGE_CLIENT_DIR} install
 	${MAKE} -C ${GSTREAMER_ELEMENTS_DIR} install
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install
 	${MAKE} -C ${EVENT_SCHEDULER_DIR} install

livesupport/etc/configure.ac

@@ -452,9 +452,9 @@ dnl set up the db module
 AC_CONFIG_COMMANDS([../src/modules/db/tmp/configure],
                    [../src/modules/db/bin/autogen.sh])
 
-dnl set up the storage module
+dnl set up the storage client module
-AC_CONFIG_COMMANDS([../src/modules/storage/tmp/configure],
+AC_CONFIG_COMMANDS([../src/modules/storageClient/tmp/configure],
-                   [../src/modules/storage/bin/autogen.sh])
+                   [../src/modules/storageClient/bin/autogen.sh])
 
 dnl set up the gstreamer elements module
 AC_CONFIG_COMMANDS([../src/modules/gstreamerElements/tmp/configure],

livesupport/src/modules/storageClient/etc/Makefile.in

@@ -90,8 +90,8 @@ TEST_RESULTS = ${DOC_DIR}/testResults.xml
 # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR
 TEST_XSLT    = ../etc/testResultToHtml.xsl
 
-STORAGE_LIB      = livesupport_storage
+STORAGE_CLIENT_LIB      = livesupport_storage_client
-STORAGE_LIB_FILE = ${LIB_DIR}/lib${STORAGE_LIB}.a
+STORAGE_CLIENT_LIB_FILE = ${LIB_DIR}/lib${STORAGE_CLIENT_LIB}.a
 TEST_RUNNER      = ${TMP_DIR}/testRunner
 
 DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
@@ -125,7 +125,7 @@ LDFLAGS  = @LDFLAGS@ -pthread \
 #-------------------------------------------------------------------------------
 #	Dependencies
 #-------------------------------------------------------------------------------
-STORAGE_LIB_OBJS = ${TMP_DIR}/StorageClientFactory.o \
+STORAGE_CLIENT_LIB_OBJS = ${TMP_DIR}/StorageClientFactory.o \
                           ${TMP_DIR}/TestStorageClient.o \
                           ${TMP_DIR}/WebStorageClient.o
 
@@ -134,7 +134,8 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
                    ${TMP_DIR}/TestStorageClientTest.o \
                    ${TMP_DIR}/WebStorageClientTest.o                   
 
-TEST_RUNNER_LIBS = -l${STORAGE_LIB} -l${CORE_LIB} -l${AUTHENTICATION_LIB} \
+TEST_RUNNER_LIBS = -l${STORAGE_CLIENT_LIB} -l${CORE_LIB} \
+                   -l${AUTHENTICATION_LIB} \
                    -lcppunit -ldl -lxmlrpc++ -lssl
 
 
@@ -143,7 +144,7 @@ TEST_RUNNER_LIBS = -l${STORAGE_LIB} -l${CORE_LIB} -l${AUTHENTICATION_LIB} \
 #-------------------------------------------------------------------------------
 .PHONY: all dir_setup doc clean docclean depclean distclean check install
 
-all: dir_setup ${STORAGE_LIB_FILE}
+all: dir_setup ${STORAGE_CLIENT_LIB_FILE}
 
 dir_setup: ${TMP_DIR} ${DOXYGEN_DIR}
 
@@ -151,7 +152,7 @@ doc:
 	${DOXYGEN} ${DOXYGEN_CONFIG}
 
 clean:
-	${RM} ${STORAGE_LIB_OBJS} ${STORAGE_LIB_FILE}
+	${RM} ${STORAGE_CLIENT_LIB_OBJS} ${STORAGE_CLIENT_LIB_FILE}
 	${RM} ${TEST_RUNNER_OBJS} ${TEST_RUNNER}
 	${RM} ${TMP_DIR}/*.bb ${TMP_DIR}/*.bbg ${TMP_DIR}/*.da ${TMP_DIR}/*.info
 
@@ -172,13 +173,13 @@ install: all
 	${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Storage
 	${CP} ${INCLUDE_DIR}/LiveSupport/Storage/*.h \
           ${USR_INCLUDE_DIR}/LiveSupport/Storage
-	${CP} ${STORAGE_LIB_FILE} ${USR_LIB_DIR}
+	${CP} ${STORAGE_CLIENT_LIB_FILE} ${USR_LIB_DIR}
 
 
 #-------------------------------------------------------------------------------
 #   Specific targets
 #-------------------------------------------------------------------------------
-${STORAGE_LIB_FILE}: ${STORAGE_LIB_OBJS}
+${STORAGE_CLIENT_LIB_FILE}: ${STORAGE_CLIENT_LIB_OBJS}
 	${AR} crus $@ $^
 
 ${TMP_DIR}:
@@ -188,7 +189,7 @@ ${DOXYGEN_DIR}:
 	${MKDIR} ${DOXYGEN_DIR}
 
 ${TEST_RUNNER}: ${CORE_LIB_FILE} ${AUTHENTICATION_LIB_FILE} \
-                ${TEST_RUNNER_OBJS} ${STORAGE_LIB_FILE}
+                ${TEST_RUNNER_OBJS} ${STORAGE_CLIENT_LIB_FILE}
 	${CXX} ${LDFLAGS} -o $@ ${TEST_RUNNER_OBJS} ${TEST_RUNNER_LIBS}
 
 ${CORE_LIB_FILE}:

livesupport/src/modules/storageClient/etc/configure.ac

@@ -32,7 +32,7 @@ dnl This is due to the fact that configure spreads a lot of trash around,
 dnl like atom4te cache directories, config.* files, etc. into the directory
 dnl it is being run from. We clearly don't want these in our base directory.
 dnl-----------------------------------------------------------------------------
-AC_INIT(Storage, 1.0, bugs@campware.org)
+AC_INIT(StorageClient, 1.0, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
 AC_REVISION($Revision$)

livesupport/src/products/gLiveSupport/etc/Makefile.in

@@ -133,11 +133,11 @@ AUTHENTICATION_LIB_DIR     = ${AUTHENTICATION_DIR}/lib
 AUTHENTICATION_LIB         = livesupport_authentication
 AUTHENTICATION_LIB_FILE   = ${AUTHENTICATION_LIB_DIR}/lib${AUTHENTICATION_LIB}.a
 
-STORAGE_DIR         = ${MODULES_DIR}/storage
+STORAGE_CLIENT_DIR         = ${MODULES_DIR}/storageClient
-STORAGE_INCLUDE_DIR = ${STORAGE_DIR}/include
+STORAGE_CLIENT_INCLUDE_DIR = ${STORAGE_CLIENT_DIR}/include
-STORAGE_LIB_DIR     = ${STORAGE_DIR}/lib
+STORAGE_CLIENT_LIB_DIR     = ${STORAGE_CLIENT_DIR}/lib
-STORAGE_LIB         = livesupport_storage
+STORAGE_CLIENT_LIB         = livesupport_storage_client
-STORAGE_LIB_FILE    = ${STORAGE_LIB_DIR}/lib${STORAGE_LIB}.a
+STORAGE_CLIENT_LIB_FILE    = ${STORAGE_CLIENT_LIB_DIR}/lib${STORAGE_CLIENT_LIB}.a
 
 SCHEDULER_CLIENT_DIR         = ${MODULES_DIR}/schedulerClient
 SCHEDULER_CLIENT_INCLUDE_DIR = ${SCHEDULER_CLIENT_DIR}/include
@@ -215,7 +215,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
                              -I${BOOST_INCLUDE_DIR} \
                              -I${CORE_INCLUDE_DIR} \
                              -I${AUTHENTICATION_INCLUDE_DIR} \
-                             -I${STORAGE_INCLUDE_DIR} \
+                             -I${STORAGE_CLIENT_INCLUDE_DIR} \
                              -I${WIDGETS_INCLUDE_DIR} \
                              -I${SCHEDULER_CLIENT_INCLUDE_DIR} \
                              -I${GSTREAMER_ELEMENTS_INCLUDE_DIR} \
@@ -231,7 +231,7 @@ LDFLAGS  = @LDFLAGS@ -pthread \
                      -L${USR_LIB_DIR} \
                      -L${CORE_LIB_DIR} \
                      -L${AUTHENTICATION_LIB_DIR} \
-                     -L${STORAGE_LIB_DIR} \
+                     -L${STORAGE_CLIENT_LIB_DIR} \
                      -L${WIDGETS_LIB_DIR} \
                      -L${SCHEDULER_CLIENT_LIB_DIR} \
                      -L${GSTREAMER_ELEMENTS_LIB_DIR} \
@@ -275,7 +275,7 @@ FSDF = ${G_LIVESUPPORT_OBJS} \
 G_LIVESUPPORT_EXE_LIBS = -l${PLAYLIST_EXECUTOR_LIB} \
                          -l${GSTREAMER_ELEMENTS_LIB} \
                          -l${AUTHENTICATION_LIB} \
-                         -l${STORAGE_LIB} \
+                         -l${STORAGE_CLIENT_LIB} \
                          -l${WIDGETS_LIB} \
                          -l${SCHEDULER_CLIENT_LIB} \
                          -l${CORE_LIB} \
@@ -316,7 +316,7 @@ depclean: clean
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} clean
 	${MAKE} -C ${SCHEDULER_CLIENT_DIR} clean
 	${MAKE} -C ${WIDGETS_DIR} clean
-	${MAKE} -C ${STORAGE_DIR} clean
+	${MAKE} -C ${STORAGE_CLIENT_DIR} clean
 	${MAKE} -C ${AUTHENTICATION_DIR} clean
 	${MAKE} -C ${CORE_DIR} clean
 
@@ -328,7 +328,7 @@ check: all ${TEST_RUNNER} storage_server_init run_tests
 install: all
 	${MAKE} -C ${CORE_DIR} install
 	${MAKE} -C ${AUTHENTICATION_DIR} install
-	${MAKE} -C ${STORAGE_DIR} install
+	${MAKE} -C ${STORAGE_CLIENT_DIR} install
 	${MAKE} -C ${WIDGETS_DIR} install
 	${MAKE} -C ${SCHEDULER_CLIENT_DIR} install
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install
@@ -377,7 +377,7 @@ storage_server_init:
 #-------------------------------------------------------------------------------
 ${G_LIVESUPPORT_EXE}: ${CORE_LIB_FILE} \
                       ${AUTHENTICATION_LIB_FILE} \
-                      ${STORAGE_LIB_FILE} \
+                      ${STORAGE_CLIENT_LIB_FILE} \
                       ${WIDGETS_LIB_FILE} \
                       ${SCHEDULER_CLIENT_LIB_FILE} \
                       ${PLAYLIST_EXECUTOR_LIB_FILE} \
@@ -392,7 +392,7 @@ ${DOXYGEN_DIR}:
 
 ${TEST_RUNNER}: ${CORE_LIB_FILE} \
                 ${AUTHENTICATION_LIB_FILE} \
-                ${STORAGE_LIB_FILE} \
+                ${STORAGE_CLIENT_LIB_FILE} \
                 ${WIDGETS_LIB_FILE} \
                 ${SCHEDULER_CLIENT_LIB_FILE} \
                 ${TEST_RUNNER_OBJS}
@@ -404,8 +404,8 @@ ${CORE_LIB_FILE}:
 ${AUTHENTICATION_LIB_FILE}:
 	${MAKE} -C ${AUTHENTICATION_DIR}
 
-${STORAGE_LIB_FILE}:
+${STORAGE_CLIENT_LIB_FILE}:
-	${MAKE} -C ${STORAGE_DIR}
+	${MAKE} -C ${STORAGE_CLIENT_DIR}
 
 ${WIDGETS_LIB_FILE}:
 	${MAKE} -C ${WIDGETS_DIR}

livesupport/src/products/scheduler/etc/Makefile.in

@@ -145,11 +145,11 @@ DB_LIB_DIR     = ${DB_DIR}/lib
 DB_LIB         = livesupport_db
 DB_LIB_FILE    = ${DB_LIB_DIR}/lib${DB_LIB}.a
 
-STORAGE_DIR         = ${MODULES_DIR}/storage
+STORAGE_CLIENT_DIR         = ${MODULES_DIR}/storageClient
-STORAGE_INCLUDE_DIR = ${STORAGE_DIR}/include
+STORAGE_CLIENT_INCLUDE_DIR = ${STORAGE_CLIENT_DIR}/include
-STORAGE_LIB_DIR     = ${STORAGE_DIR}/lib
+STORAGE_CLIENT_LIB_DIR     = ${STORAGE_CLIENT_DIR}/lib
-STORAGE_LIB         = livesupport_storage
+STORAGE_CLIENT_LIB         = livesupport_storage_client
-STORAGE_LIB_FILE    = ${STORAGE_LIB_DIR}/lib${STORAGE_LIB}.a
+STORAGE_CLIENT_LIB_FILE    = ${STORAGE_CLIENT_LIB_DIR}/lib${STORAGE_CLIENT_LIB}.a
 
 STORAGE_SERVER_DIR    = ${MODULES_DIR}/storageServer
 
@@ -204,7 +204,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
                              -I${CORE_INCLUDE_DIR} \
                              -I${AUTHENTICATION_INCLUDE_DIR} \
                              -I${DB_INCLUDE_DIR} \
-                             -I${STORAGE_INCLUDE_DIR} \
+                             -I${STORAGE_CLIENT_INCLUDE_DIR} \
                              -I${GSTREAMER_ELEMENTS_INCLUDE_DIR} \
                              -I${PLAYLIST_EXECUTOR_INCLUDE_DIR} \
                              -I${EVENT_SCHEDULER_INCLUDE_DIR} \
@@ -220,7 +220,7 @@ LDFLAGS  = @LDFLAGS@ -pthread \
                      -L${CORE_LIB_DIR} \
                      -L${AUTHENTICATION_LIB_DIR} \
                      -L${DB_LIB_DIR} \
-                     -L${STORAGE_LIB_DIR} \
+                     -L${STORAGE_CLIENT_LIB_DIR} \
                      -L${GSTREAMER_ELEMENTS_LIB_DIR} \
                      -L${PLAYLIST_EXECUTOR_LIB_DIR} \
                      -L${EVENT_SCHEDULER_LIB_DIR}
@@ -266,7 +266,8 @@ SCHEDULER_EXE_OBJS = ${SCHEDULER_OBJS} \
                      ${TMP_DIR}/main.o
 SCHEDULER_EXE_LIBS = -l${EVENT_SCHEDULER_LIB} -l${PLAYLIST_EXECUTOR_LIB} \
                      -l${GSTREAMER_ELEMENTS_LIB} \
-                     -l${STORAGE_LIB} -l${DB_LIB} -l${AUTHENTICATION_LIB} \
+                     -l${STORAGE_CLIENT_LIB} -l${DB_LIB} \
+					 -l${AUTHENTICATION_LIB} \
                      -l${CORE_LIB} \
                      -l${BOOST_DATE_TIME_LIB} \
                      -lxmlrpc++ -lssl
@@ -350,7 +351,7 @@ docclean:
 depclean: clean
 	${MAKE} -C ${EVENT_SCHEDULER_DIR} clean
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} clean
-	${MAKE} -C ${STORAGE_DIR} clean
+	${MAKE} -C ${STORAGE_CLIENT_DIR} clean
 	${MAKE} -C ${DB_DIR} clean
 	${MAKE} -C ${AUTHENTICATION_DIR} clean
 	${MAKE} -C ${CORE_DIR} clean
@@ -366,7 +367,7 @@ copy_files:
 	${MAKE} -C ${CORE_DIR} install
 	${MAKE} -C ${AUTHENTICATION_DIR} install
 	${MAKE} -C ${DB_DIR} install
-	${MAKE} -C ${STORAGE_DIR} install
+	${MAKE} -C ${STORAGE_CLIENT_DIR} install
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install
 	${MAKE} -C ${EVENT_SCHEDULER_DIR} install
 	${MKDIR} ${USR_BIN_DIR}
@@ -459,7 +460,7 @@ kill:
 #   Specific targets
 #-------------------------------------------------------------------------------
 ${SCHEDULER_EXE}: ${CORE_LIB_FILE} ${AUTHENTICATION_LIB_FILE} ${DB_LIB_FILE} \
-                  ${STORAGE_LIB_FILE} \
+                  ${STORAGE_CLIENT_LIB_FILE} \
                   ${PLAYLIST_EXECUTOR_LIB_FILE} ${EVENT_SCHEDULER_LIB_FILE} \
                   ${SCHEDULER_EXE_OBJS}
 	${CXX} ${LDFLAGS} -o $@ $^ ${SCHEDULER_EXE_LIBS}
@@ -471,7 +472,7 @@ ${DOXYGEN_DIR}:
 	${MKDIR} ${DOXYGEN_DIR}
 
 ${TEST_RUNNER}: ${CORE_LIB_FILE} ${AUTHENTICATION_LIB_FILE} ${DB_LIB_FILE} \
-                ${STORAGE_LIB_FILE} \
+                ${STORAGE_CLIENT_LIB_FILE} \
                 ${PLAYLIST_EXECUTOR_LIB_FILE} ${EVENT_SCHEDULER_LIB_FILE} \
                 ${TEST_RUNNER_OBJS}
 	${CXX} ${LDFLAGS} -o $@ ${TEST_RUNNER_OBJS} ${TEST_RUNNER_LIBS}
@@ -485,8 +486,8 @@ ${AUTHENTICATION_LIB_FILE} :
 ${DB_LIB_FILE}:
 	${MAKE} -C ${DB_DIR}
 
-${STORAGE_LIB_FILE}:
+${STORAGE_CLIENT_LIB_FILE}:
-	${MAKE} -C ${STORAGE_DIR}
+	${MAKE} -C ${STORAGE_CLIENT_DIR}
 
 ${GSTREAMER_ELEMENTS_LIB_FILE}:
 	${MAKE} -C ${GSTREAMER_ELEMENTS_DIR}