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
@@ -56,12 +56,13 @@ SUBDIRS = \
$(SUBDIRS_SHARP_PLUGIN) \
$(SUBDIRS_LDAP_PLUGIN) \
$(SUBDIRS_MICROMAIL) \
$(SUBDIRS_GAMMU) \
$(SUBDIRS_PWMANAGER)
+
all: build_microkde \
build_qtopia_plugin \
build_opie_plugin \
build_sharp_plugin \
build_ldap_plugin \
build_micromail \
@@ -198,36 +199,37 @@ objects:
clean:
rm -rf libical/lib/$(PLATFORM)/*;
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
cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
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 *~
cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
./mkipks kmicrokdelibs.control
./mkipks korganizer.control
./mkipks kaddressbook.control
ifndef BUILD_NO_MICROMAIL
./mkipks kopiemail.control
endif
./mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- ./mkipks kammu.control
+ ./mkipks phoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
./mkipks pwmanager.control
endif
./mkipks pim_TAB_icon.control
@@ -253,14 +255,12 @@ tmake: objects \
kmicromail/libetpan/Makefile$(PLATFORM) \
kmicromail/libmailwrapper/Makefile$(PLATFORM) \
gammu/emb/common/Makefile$(PLATFORM) \
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)
microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
@@ -324,6 +324,7 @@ gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
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
@@ -223,13 +223,13 @@ dist:
./mkipks kaddressbook.control
ifndef BUILD_NO_MICROMAIL
./mkipks kopiemail.control
endif
./mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- ./mkipks kammu.control
+ ./mkipks phoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
./mkipks pwmanager.control
endif
./mkipks pim_TAB_icon.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
@@ -305,13 +305,13 @@ c) Remote file
The down-/uploading if i) and iii) is done via a command line command.
Please specify the download/upload command ( like scp, ftp, ...) and the
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:
It is only possible to sync a mobile phone with one particular device
running KO/Pi. If you want to be able to write data of more than one device
to the mobile phone (e.g. from your Zaurus and from your Windows Laptop)
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
@@ -4048,13 +4048,13 @@ static void Backup(int argc, char *argv[])
DoBackup = false;
if (Info.PhonePhonebook) {
printmsg("Checking phone phonebook\n");
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) {
Pbk.MemoryType = MEM_ME;
i = 1;
used = 0;
diff --git a/kammu.control b/phoneaccess.control
index 07559e7..07559e7 100644
--- a/kammu.control
+++ b/phoneaccess.control