Compile fixes

3 files changed, 9 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index f21e524..64db374 100644
--- a/Makefile
+++ b/Makefile
@@ -1,169 +1,169 @@
 #############################################################################
-# Makefile for building: kopi-desktop
-# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 18:50:00 2004
-# Project:  kopi-desktop.pro
+# Makefile for building: kdepim-desktop
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Aug 30 11:47:23 2004
+# Project:  kdepim-desktop.pro
 # Template: subdirs
-# Command: $(QMAKE) -o Makefile kopi-desktop.pro
+# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
 #############################################################################
 
         MAKEFILE =Makefile
         QMAKE    =qmake
 DEL_FILE =    rm -f
 CHK_DIR_EXISTS= test -d
 MKDIR    = mkdir -p
         SUBTARGETS = \
                 sub-gammu-emb-common \
                 sub-gammu-emb-gammu \
                 sub-libical \
                 sub-libkcal \
                 sub-microkde \
                 sub-libkdepim \
                 sub-kabc \
                 sub-korganizer \
                 sub-kaddressbook \
                 sub-kabc-plugins-file \
                 sub-kabc-plugins-dir
 
 first: all
 
 all: Makefile $(SUBTARGETS)
 
 gammu/emb/common/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
         cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
 sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
         cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
 
 gammu/emb/gammu/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
         cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
 sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
         cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
 
 libical/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
         cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
 sub-libical: libical/$(MAKEFILE) FORCE
         cd libical && $(MAKE) -f $(MAKEFILE)
 
 libkcal/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
         cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
 sub-libkcal: libkcal/$(MAKEFILE) FORCE
         cd libkcal && $(MAKE) -f $(MAKEFILE)
 
 microkde/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
         cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
 sub-microkde: microkde/$(MAKEFILE) FORCE
         cd microkde && $(MAKE) -f $(MAKEFILE)
 
 libkdepim/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
         cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
 sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
         cd libkdepim && $(MAKE) -f $(MAKEFILE)
 
 kabc/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
         cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
 sub-kabc: kabc/$(MAKEFILE) FORCE
         cd kabc && $(MAKE) -f $(MAKEFILE)
 
 korganizer/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
         cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
 sub-korganizer: korganizer/$(MAKEFILE) FORCE
         cd korganizer && $(MAKE) -f $(MAKEFILE)
 
 kaddressbook/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
         cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
 sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
         cd kaddressbook && $(MAKE) -f $(MAKEFILE)
 
 kabc/plugins/file/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
         cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
 sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
         cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
 
 kabc/plugins/dir/$(MAKEFILE): 
         @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
         cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
 sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
         cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
 
-Makefile: kopi-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-        $(QMAKE) -o Makefile kopi-desktop.pro
+Makefile: kdepim-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
+        $(QMAKE) -o Makefile kdepim-desktop.pro
 qmake: qmake_all
-        @$(QMAKE) -o Makefile kopi-desktop.pro
+        @$(QMAKE) -o Makefile kdepim-desktop.pro
 
 all: $(SUBTARGETS)
 qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
          ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
          ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
 clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
          ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
          ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
 uninstall_subdirs: qmake_all FORCE
          ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
          ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
 install_subdirs: qmake_all FORCE
          ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
          ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
 distclean: qmake_all FORCE
          ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
          ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
 
 install:  install_subdirs
 
 uninstall:  uninstall_subdirs
 
 FORCE:
 
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro
index 0c68000..d27dbeb 100644
--- a/gammu/emb/common/common.pro
+++ b/gammu/emb/common/common.pro
@@ -1,185 +1,186 @@
 ######################################################################
 # Automatically generated by qmake (1.07a) Fri Jul 30 22:13:34 2004
 ######################################################################
 
 TEMPLATE = lib
 DEPENDPATH += device \
               misc \
               phone \
               protocol \
               service \
               device/bluetoth \
               device/irda \
               device/serial \
               misc/coding \
               phone/alcatel \
               phone/at \
               phone/nokia \
               phone/obex \
               phone/symbian \
               protocol/alcatel \
               protocol/at \
               protocol/nokia \
               protocol/obex \
               protocol/symbian \
               service/backup \
               service/sms \
               phone/nokia/dct3 \
               phone/nokia/dct4
 INCLUDEPATH += . \
                misc/coding \
                misc \
                device \
                phone/nokia/dct4 \
                phone/nokia/dct3 \
                phone/at \
                phone/alcatel \
                phone/obex \
                phone/symbian \
                protocol \
                protocol/nokia \
                protocol/at \
                protocol/alcatel \
                protocol/obex \
                protocol/symbian \
                device/serial \
                device/irda \
                device/bluetoth \
                service \
                service/sms \
                service/backup \
                phone/nokia \
                phone
 
 # Input
 HEADERS += config.h \
            gammu.h \
            gsmcomon.h \
            gsmstate.h \
            device/devfunc.h \
            misc/cfg.h \
            misc/misc.h \
            phone/pfunc.h \
            protocol/protocol.h \
            service/gsmcal.h \
            service/gsmcall.h \
            service/gsmdata.h \
            service/gsmlogo.h \
            service/gsmmisc.h \
            service/gsmnet.h \
            service/gsmpbk.h \
            service/gsmprof.h \
            service/gsmring.h \
            device/bluetoth/affix.h \
            device/bluetoth/blue_w32.h \
            device/bluetoth/bluetoth.h \
            device/bluetoth/bluez.h \
            device/irda/irda.h \
            device/irda/irda_unx.h \
            device/irda/irda_w32.h \
            device/serial/ser_djg.h \
            device/serial/ser_unx.h \
            device/serial/ser_w32.h \
            misc/coding/coding.h \
            misc/coding/md5.h \
            phone/alcatel/alcatel.h \
            phone/at/atgen.h \
            phone/nokia/ncommon.h \
            phone/nokia/nfunc.h \
            phone/nokia/nfuncold.h \
            phone/obex/obexgen.h \
            phone/symbian/mroutgen.h \
            protocol/alcatel/alcabus.h \
            protocol/at/at.h \
            protocol/nokia/fbus2.h \
            protocol/nokia/mbus2.h \
            protocol/nokia/phonet.h \
            protocol/obex/obex.h \
            protocol/symbian/mrouter.h \
            service/backup/backgen.h \
            service/backup/backics.h \
            service/backup/backldif.h \
            service/backup/backlmb.h \
            service/backup/backtext.h \
            service/backup/backvcf.h \
            service/backup/backvcs.h \
            service/backup/gsmback.h \
            service/sms/gsmems.h \
            service/sms/gsmmulti.h \
            service/sms/gsmsms.h \
            phone/nokia/dct3/dct3comm.h \
            phone/nokia/dct3/dct3func.h \
            phone/nokia/dct3/n6110.h \
            phone/nokia/dct3/n7110.h \
            phone/nokia/dct3/n9210.h \
            phone/nokia/dct4/dct4func.h \
            phone/nokia/dct4/n3320.h \
            phone/nokia/dct4/n3650.h \
            phone/nokia/dct4/n6510.h
 SOURCES +=gsmcomon.c \
 gsmstate.c \
 misc/misc.c \
 misc/cfg.c \
 misc/coding/coding.c \
 misc/coding/md5.c \
 service/sms/gsmsms.c \
 service/sms/gsmems.c \
 service/sms/gsmmulti.c \
 service/gsmcal.c \
 service/gsmdata.c \
 service/gsmpbk.c \
 service/gsmring.c \
 service/gsmlogo.c \
 service/gsmmisc.c \
 service/gsmnet.c \
 service/backup/gsmback.c \
 service/backup/backldif.c \
 service/backup/backlmb.c \
 service/backup/backtext.c \
 service/backup/backvcs.c \
 service/backup/backvcf.c \
 service/backup/backics.c \
 device/bluetoth/affix.c \
 device/bluetoth/bluez.c \
 device/bluetoth/blue_w32.c \
 device/bluetoth/bluetoth.c \
 device/serial/ser_djg.c \
 device/irda/irda.c \
 device/devfunc.c \
 protocol/at/at.c \
 protocol/alcatel/alcabus.c \
 protocol/nokia/mbus2.c \
 protocol/nokia/fbus2.c \
 protocol/nokia/phonet.c \
 protocol/obex/obex.c \
 protocol/symbian/mrouter.c \
 phone/pfunc.c \
 phone/at/atgen.c \
 phone/at/siemens.c \
 phone/at/sonyeric.c \
 phone/alcatel/alcatel.c \
 phone/nokia/dct3/n6110.c \
 phone/nokia/dct3/n7110.c \
 phone/nokia/dct3/n9210.c \
 phone/nokia/dct3/dct3func.c \
 phone/nokia/dct4/n3320.c \
 phone/nokia/dct4/n3650.c \
 phone/nokia/dct4/n6510.c \
 phone/nokia/dct4/dct4func.c \
 phone/nokia/nauto.c \
 phone/nokia/nfunc.c \
 phone/nokia/nfuncold.c \
 phone/obex/obexgen.c \
 phone/symbian/mroutgen.c 
 
 TARGET = microgammu
+CONFIG += console
 DESTDIR = ../../../bin
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 
 unix: {
 SOURCES += device/serial/ser_unx.c 
 }
 win32:{
 SOURCES += device/serial/ser_w32.c 
 }
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index bd683c4..6efc8e7 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -1,52 +1,53 @@
 ######################################################################
 # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004
 ######################################################################
 
 TEMPLATE = app
+CONFIG += console
 DEPENDPATH += msvc06.mak \
               msvc2003.mak \
               smsd \
               depend/nokia \
               depend/siemens \
               depend/nokia/dct3trac
 INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
         CONFIG          = qt warn_off release
 # Input
 
 HEADERS += gammu.h \
            sniff.h \
            smsd/s_files.h \
            smsd/s_mysql.h \
            smsd/smsdcore.h \
            depend/nokia/dct3.h \
            depend/nokia/dct4.h \
            depend/siemens/chiffre.h \
            depend/siemens/dsiemens.h \
            depend/nokia/dct3trac/type-cc.h \
            depend/nokia/dct3trac/type-mm.h \
            depend/nokia/dct3trac/type-rr.h \
            depend/nokia/dct3trac/type-sms.h \
            depend/nokia/dct3trac/type-ss.h \
            depend/nokia/dct3trac/wmx-gsm.h \
            depend/nokia/dct3trac/wmx-list.h \
            depend/nokia/dct3trac/wmx-sim.h \
            depend/nokia/dct3trac/wmx-util.h \
            depend/nokia/dct3trac/wmx.h
 SOURCES += gammu.c \
            sniff.c \
            smsd/s_files.c \
            smsd/smsdcore.c \
            depend/nokia/dct3.c \
            depend/nokia/dct4.c \
            depend/siemens/chiffre.c \
            depend/siemens/dsiemens.c \
            depend/nokia/dct3trac/wmx-gsm.c \
            depend/nokia/dct3trac/wmx-list.c \
            depend/nokia/dct3trac/wmx-sim.c \
            depend/nokia/dct3trac/wmx-util.c \
            depend/nokia/dct3trac/wmx.c
 
 LIBS +=      ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so  /usr/lib/libsdp.so  /usr/lib/libpthread.so
 DESTDIR = ../../../bin
 OBJECTS_DIR = obj/unix
 TARGET = kammu
\ No newline at end of file