summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile11
-rw-r--r--Makefile.Embedded2
-rw-r--r--bin/kdepim/korganizer/howtoSYNC.txt2
-rw-r--r--gammu/emb/gammu/gammu.c2
-rw-r--r--phoneaccess.control (renamed from kammu.control)0
5 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 1adfb2c..0b8997e 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,7 @@ SUBDIRS = \
$(SUBDIRS_GAMMU) \
$(SUBDIRS_PWMANAGER)
+
all: build_microkde \
build_qtopia_plugin \
build_opie_plugin \
@@ -201,8 +202,9 @@ clean:
for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
done
+
install:
-
+
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
cp db2file/db2file $(QPEDIR)/bin/db2file
@@ -211,7 +213,7 @@ install:
cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
-dist:
+dist:
@echo Dont forget to do "make install" before "make dist"
rm -f *arm.ipk
rm -f *~
@@ -224,7 +226,7 @@ dist:
endif
./mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- ./mkipks kammu.control
+ ./mkipks phoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
./mkipks pwmanager.control
@@ -256,8 +258,6 @@ tmake: objects \
gammu/emb/gammu/Makefile$(PLATFORM) \
pwmanager/pwmanager/Makefile$(PLATFORM) \
-
-
qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
@@ -327,3 +327,4 @@ gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
+
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 2e1651c..0b8997e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -226,7 +226,7 @@ dist:
endif
./mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- ./mkipks kammu.control
+ ./mkipks phoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
./mkipks pwmanager.control
diff --git a/bin/kdepim/korganizer/howtoSYNC.txt b/bin/kdepim/korganizer/howtoSYNC.txt
index c4e80f5..3cab446 100644
--- a/bin/kdepim/korganizer/howtoSYNC.txt
+++ b/bin/kdepim/korganizer/howtoSYNC.txt
@@ -308,7 +308,7 @@ c) Remote file
file name of the temp file in the corresponding fields.
d) Mobile device (cell phone)
- Note: On the Zaurus you have to install the kammu_xxx_arm.ipk package
+ Note: On the Zaurus you have to install the phoneaccess_xxx_arm.ipk package
to be able to access mobile phones.
We mention here only KO/Pi, but the same is valid for KA/Pi.
Note:
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index c436b90..8db9afb 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -4051,7 +4051,7 @@ static void Backup(int argc, char *argv[])
MemStatus.MemoryType = MEM_ME;
error=Phone->GetMemoryStatus(&s, &MemStatus);
if (error==ERR_NONE && MemStatus.MemoryUsed != 0) {
- if (answer_yes(" Backup phone phonebook")) DoBackup = true;
+ /*LRif (answer_yes(" Backup phone phonebook")) */DoBackup = true;
}
}
if (DoBackup) {
diff --git a/kammu.control b/phoneaccess.control
index 07559e7..07559e7 100644
--- a/kammu.control
+++ b/phoneaccess.control