summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile7
-rw-r--r--Makefile.Embedded7
-rw-r--r--kabc/kabcE.pro2
-rw-r--r--kaddressbook.control5
-rw-r--r--kmicromail/libetpan/libetpanE.pro2
-rw-r--r--kmicromail/libmailwrapper/libmailwrapperE.pro2
-rw-r--r--kopiemail.control6
-rw-r--r--ksharpPIM-DTMaccess.control (renamed from ksharpPIM_DTMaccess.control)0
8 files changed, 18 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index b677087..467710f 100644
--- a/Makefile
+++ b/Makefile
@@ -232,32 +232,35 @@ install:
dist:
@echo Dont forget to do "make install" before "make dist"
rm -f *arm.ipk
rm -f *~
cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).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
+ ifndef BUILD_NO_SHARP_PLUGIN
+ mkipks ksharpPIM-DTMaccess.control
+ endif
mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- mkipks phoneaccess.control
+ mkipks kmobilephoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
mkipks pwmanager.control
endif
- mkipks pim_TAB_icon.control
+ mkipks pimTABicon.control
tmake: objects \
qtcompat/Makefile$(PLATFORM) \
microkde/Makefile$(PLATFORM) \
libkcal/Makefile$(PLATFORM) \
libkdepim/Makefile$(PLATFORM) \
korganizer/Makefile$(PLATFORM) \
kalarmd/Makefile$(PLATFORM) \
libical/src/libical/Makefile$(PLATFORM) \
libical/src/libicalss/Makefile$(PLATFORM) \
kabc/Makefile$(PLATFORM) \
kabc/formats/binary/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b677087..467710f 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -232,32 +232,35 @@ install:
dist:
@echo Dont forget to do "make install" before "make dist"
rm -f *arm.ipk
rm -f *~
cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).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
+ ifndef BUILD_NO_SHARP_PLUGIN
+ mkipks ksharpPIM-DTMaccess.control
+ endif
mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- mkipks phoneaccess.control
+ mkipks kmobilephoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
mkipks pwmanager.control
endif
- mkipks pim_TAB_icon.control
+ mkipks pimTABicon.control
tmake: objects \
qtcompat/Makefile$(PLATFORM) \
microkde/Makefile$(PLATFORM) \
libkcal/Makefile$(PLATFORM) \
libkdepim/Makefile$(PLATFORM) \
korganizer/Makefile$(PLATFORM) \
kalarmd/Makefile$(PLATFORM) \
libical/src/libical/Makefile$(PLATFORM) \
libical/src/libicalss/Makefile$(PLATFORM) \
kabc/Makefile$(PLATFORM) \
kabc/formats/binary/Makefile$(PLATFORM) \
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 96fe39e..1d28a4d 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,15 +1,15 @@
TEMPLATE = lib
CONFIG += qt warn_on
-TARGET = kamicrokabc
+TARGET = microkabc
INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
LIBS += -lmicrokdepim
#LIBS += -lldap
LIBS += -L$(QPEDIR)/lib
DEFINES += KAB_EMBEDDED
diff --git a/kaddressbook.control b/kaddressbook.control
index 6a9855f..a7f87dc 100644
--- a/kaddressbook.control
+++ b/kaddressbook.control
@@ -1,14 +1,13 @@
-Files: bin/kapi apps/Pim/kaddressbook.desktop pics/kdepim/kaddressbook/* lib/libkamicro*
-
+Files: bin/kapi apps/Pim/kaddressbook.desktop pics/kdepim/kaddressbook/* lib/libmicrokabc_q* lib/libmicrokabc_f* lib/libmicrokabc_d* lib/libmicrokabc.*
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
-Depends:
+Depends: libmicrokde
Description: KOrganizer/Pi and Kaddressbook/Pi
The embedded version of KOrganizer/Platform-independend,
the KDE calendar and scheduling program
optimized for 640x480 and 320x240 resolution
on Zaurus PDA
diff --git a/kmicromail/libetpan/libetpanE.pro b/kmicromail/libetpan/libetpanE.pro
index b7a9a16..7f37948 100644
--- a/kmicromail/libetpan/libetpanE.pro
+++ b/kmicromail/libetpan/libetpanE.pro
@@ -1,18 +1,18 @@
######################################################################
# Automatically generated by qmake (1.07a) Thu Jul 1 00:54:03 2004
######################################################################
TEMPLATE = lib
-TARGET = kmicrolibetpan
+TARGET = microlibetpan
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR=$(QPEDIR)/lib
DEPENDPATH += generic \
imap \
imf \
maildir \
mbox \
mh \
mime \
diff --git a/kmicromail/libmailwrapper/libmailwrapperE.pro b/kmicromail/libmailwrapper/libmailwrapperE.pro
index a53b022..7cc7a90 100644
--- a/kmicromail/libmailwrapper/libmailwrapperE.pro
+++ b/kmicromail/libmailwrapper/libmailwrapperE.pro
@@ -37,13 +37,13 @@ SOURCES = imapwrapper.cpp \
INTERFACES = logindialogui.ui \
sendmailprogressui.ui
INCLUDEPATH += ../../microkde ../../microkde/kdecore ../libetpan/include $(QPEDIR)/include
LIBS += -lssl -lcrypto
#-lqpe -letpan
DESTDIR = $(QPEDIR)/lib
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
-TARGET = kmicromailwrapper
+TARGET = micromailwrapper
diff --git a/kopiemail.control b/kopiemail.control
index 58c6d19..58d4bfa 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,12 +1,12 @@
-Files: bin/ompi apps/Pim/kopiemail.desktop pics/kdepim/kopiemail/* lib/libkmicro*
+Files: bin/ompi apps/Pim/kopiemail.desktop pics/kdepim/kopiemail/* lib/libmicromail* lib/libmicrolibetpan*
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
-Depends:
+Depends: libmicrokde openssl
Description: KOPieMail/Pi
- The embedded version of KOPioeMail/Platform-independend,
+ The embedded version of KOPieMail/Platform-independend (OM/Pi),
for 640x480 and 320x240 resolution on Zaurus PDA
diff --git a/ksharpPIM_DTMaccess.control b/ksharpPIM-DTMaccess.control
index f735462..f735462 100644
--- a/ksharpPIM_DTMaccess.control
+++ b/ksharpPIM-DTMaccess.control