Moved boot script from init.d to upstart. Fixed some problems in call listener.

[jenirok] / src / daemon / Makefile

diff --git a/src/daemon/Makefile b/src/daemon/Makefile
index 7cf83fb..6ad019f 100644 (file)
--- a/src/daemon/Makefile
+++ b/src/daemon/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: jenirokd
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Apr 14 21:02:47 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri May 28 18:25:43 2010
 # Project:  daemon.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile daemon.pro
@@ -50,7 +50,8 @@ SOURCES       = main.cpp \
                ../common/contactmanager.cpp \
                ../common/db.cpp \
                ../common/settings.cpp \
-               ../common/connectionmanager.cpp moc_calllistener.cpp \
+               ../common/connectionmanager.cpp \
+               ../common/cache.cpp moc_calllistener.cpp \
                moc_informationbox.cpp \
                moc_eniro.cpp \
                moc_connectionmanager.cpp \
@@ -63,6 +64,7 @@ OBJECTS       = main.o \
                db.o \
                settings.o \
                connectionmanager.o \
+               cache.o \
                moc_calllistener.o \
                moc_informationbox.o \
                moc_eniro.o \
@@ -189,7 +191,7 @@ qmake:  FORCE
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/jenirokd1.0.0 || $(MKDIR) .tmp/jenirokd1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents calllistener.h informationbox.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents ../common/translations.grc .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents main.cpp calllistener.cpp informationbox.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents ../common/translations/fi_FI.ts .tmp/jenirokd1.0.0/ && (cd `dirname .tmp/jenirokd1.0.0` && $(TAR) jenirokd1.0.0.tar jenirokd1.0.0 && $(COMPRESS) jenirokd1.0.0.tar) && $(MOVE) `dirname .tmp/jenirokd1.0.0`/jenirokd1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/jenirokd1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents calllistener.h informationbox.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h ../common/cache.h .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents ../common/translations.grc .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents main.cpp calllistener.cpp informationbox.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp ../common/cache.cpp .tmp/jenirokd1.0.0/ && $(COPY_FILE) --parents ../common/translations/fi_FI.ts .tmp/jenirokd1.0.0/ && (cd `dirname .tmp/jenirokd1.0.0` && $(TAR) jenirokd1.0.0.tar jenirokd1.0.0 && $(COMPRESS) jenirokd1.0.0.tar) && $(MOVE) `dirname .tmp/jenirokd1.0.0`/jenirokd1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/jenirokd1.0.0
 
 
 clean:compiler_clean 
@@ -287,6 +289,12 @@ settings.o: ../common/settings.cpp ../common/settings.h \
 connectionmanager.o: ../common/connectionmanager.cpp ../common/connectionmanager.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o connectionmanager.o ../common/connectionmanager.cpp
 
+cache.o: ../common/cache.cpp ../common/cache.h \
+               ../common/eniro.h \
+               ../common/db.h \
+               ../common/settings.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cache.o ../common/cache.cpp
+
 moc_calllistener.o: moc_calllistener.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_calllistener.o moc_calllistener.cpp
 
@@ -316,7 +324,7 @@ uninstall_target:  FORCE
 
 install_init: first FORCE
        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/etc/init.d/ || $(MKDIR) $(INSTALL_ROOT)/etc/init.d/ 
-       -$(INSTALL_PROGRAM) /home/maemo/workspace/jenirok/src/daemon/data/jenirokd $(INSTALL_ROOT)/etc/init.d/
+       -$(INSTALL_PROGRAM) /home/maemo/workspace/jenirok/src/daemon/data/init.d/jenirokd $(INSTALL_ROOT)/etc/init.d/
        -strip $(INSTALL_ROOT)/etc/init.d/jenirokd
 
 
@@ -325,9 +333,19 @@ uninstall_init:  FORCE
        -$(DEL_DIR) $(INSTALL_ROOT)/etc/init.d/ 
 
 
-install:  install_target install_init  FORCE
+install_event: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/etc/event.d/ || $(MKDIR) $(INSTALL_ROOT)/etc/event.d/ 
+       -$(INSTALL_FILE) /home/maemo/workspace/jenirok/src/daemon/data/event.d/jenirokd $(INSTALL_ROOT)/etc/event.d/
+
+
+uninstall_event:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/etc/event.d/jenirokd
+       -$(DEL_DIR) $(INSTALL_ROOT)/etc/event.d/ 
+
+
+install:  install_target install_init install_event  FORCE
 
-uninstall: uninstall_target uninstall_init   FORCE
+uninstall: uninstall_target uninstall_init uninstall_event   FORCE
 
 FORCE: