summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--Makefile.Embedded2
-rw-r--r--libical/src/libical/libicalE.pro2
-rw-r--r--libical/src/libicalss/libicalssE.pro2
-rw-r--r--libkcal/libkcalE.pro6
-rw-r--r--microkde/microkdeE.pro2
-rwxr-xr-xsetQtopia3
-rw-r--r--setZaurus9
-rwxr-xr-xsetZaurus35
9 files changed, 22 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index b2ef295..d24c8b8 100644
--- a/Makefile
+++ b/Makefile
@@ -190,48 +190,50 @@ variable_test: variable_info
ifdef BUILD_NO_MICROMAIL
@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
endif
ifdef BUILD_NO_SHARP_PLUGIN
@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
else
ifndef SHARPDTMSDK
@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
$(error SHARPDTMSDK is not defined)
endif
endif
ifdef BUILD_NO_GAMMU
@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
endif
ifdef BUILD_NO_PWMANAGER
@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
endif
@echo --------------------------------------
objects:
for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
mkdir -p libical/lib/$(PLATFORM)
+ mkdir -p dest
+ mkdir -p dest$(LIBICAL_PATH)
mkdir -p pwmanager/libcrypt/$(PLATFORM)
clean:
rm -rf libical/lib/$(PLATFORM)/*;
rm -rf pwmanager/libcrypt/$(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
pac:
rm -f $(QPEDIR)/lib/libmicro*
rm -f $(QPEDIR)/plugins/applets/libkopi*
make
make install
make dist
install:
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
cp db2file/db2file $(QPEDIR)/bin/db2file
chmod ugo+x $(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
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b2ef295..d24c8b8 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -190,48 +190,50 @@ variable_test: variable_info
ifdef BUILD_NO_MICROMAIL
@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
endif
ifdef BUILD_NO_SHARP_PLUGIN
@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
else
ifndef SHARPDTMSDK
@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
$(error SHARPDTMSDK is not defined)
endif
endif
ifdef BUILD_NO_GAMMU
@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
endif
ifdef BUILD_NO_PWMANAGER
@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
endif
@echo --------------------------------------
objects:
for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
mkdir -p libical/lib/$(PLATFORM)
+ mkdir -p dest
+ mkdir -p dest$(LIBICAL_PATH)
mkdir -p pwmanager/libcrypt/$(PLATFORM)
clean:
rm -rf libical/lib/$(PLATFORM)/*;
rm -rf pwmanager/libcrypt/$(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
pac:
rm -f $(QPEDIR)/lib/libmicro*
rm -f $(QPEDIR)/plugins/applets/libkopi*
make
make install
make dist
install:
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
cp db2file/db2file $(QPEDIR)/bin/db2file
chmod ugo+x $(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
diff --git a/libical/src/libical/libicalE.pro b/libical/src/libical/libicalE.pro
index 1c79e18..5e9f44c 100644
--- a/libical/src/libical/libicalE.pro
+++ b/libical/src/libical/libicalE.pro
@@ -1,34 +1,34 @@
######################################################################
# Automatically generated by qmake (1.07a) Sun Jun 27 22:44:35 2004
######################################################################
TEMPLATE = lib
INCLUDEPATH += .
CONFIG += staticlib
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
-DESTDIR=../../lib/$(PLATFORM)
+DESTDIR=../../../dest$(LIBICAL_PATH)
TARGET = ical
# Input
HEADERS += astime.h \
ical.h \
icalarray.h \
icalattach.h \
icalattachimpl.h \
icalcomponent.h \
icalderivedparameter.h \
icalderivedproperty.h \
icalderivedvalue.h \
icalduration.h \
icalenums.h \
icalerror.h \
icallangbind.h \
icalmemory.h \
icalmime.h \
icalparameter.h \
icalparameterimpl.h \
icalparser.h \
icalperiod.h \
icalproperty.h \
icalrecur.h \
icalrestriction.h \
diff --git a/libical/src/libicalss/libicalssE.pro b/libical/src/libicalss/libicalssE.pro
index 84ccf47..5f96609 100644
--- a/libical/src/libicalss/libicalssE.pro
+++ b/libical/src/libicalss/libicalssE.pro
@@ -1,37 +1,37 @@
######################################################################
# Automatically generated by qmake (1.07a) Sun Jun 27 23:03:36 2004
######################################################################
TEMPLATE = lib
TARGET = icalss
CONFIG += staticlib
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
-DESTDIR=../../lib/$(PLATFORM)
+DESTDIR=../../../dest$(LIBICAL_PATH)
INCLUDEPATH += . ../libical
# Input
HEADERS += icalcalendar.h \
icalclassify.h \
icalcluster.h \
icalclusterimpl.h \
icaldirset.h \
icaldirsetimpl.h \
icalfileset.h \
icalfilesetimpl.h \
icalgauge.h \
icalgaugeimpl.h \
icalmessage.h \
icalset.h \
icalspanlist.h \
icalss.h \
icalssyacc.h
SOURCES += icalcalendar.c \
icalclassify.c \
icalcluster.c \
icaldirset.c \
icalfileset.c \
icalgauge.c \
icalmessage.c \
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index c2fb4e5..737be53 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -1,36 +1,38 @@
TEMPLATE = lib
CONFIG += qt warn_on
TARGET = microkcal
INCLUDEPATH += ../libkdepim ../microkde ../qtcompat versit ../microkde/kdecore $(QPEDIR)/include
INCLUDEPATH += ../libical/src/libical
INCLUDEPATH += ../libical/src/libicalss
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += ../libical/lib/$(PLATFORM)/libical.a
-LIBS += ../libical/lib/$(PLATFORM)/libicalss.a
+#LIBS += ../libical/lib/$(PLATFORM)/libical.a
+#LIBS += ../libical/lib/$(PLATFORM)/libicalss.a
+LIBS += ../dest$(LIBICAL_PATH)/libical.a
+LIBS += ../dest$(LIBICAL_PATH)/libicalss.a
INTERFACES = \
HEADERS = \
alarm.h \
attachment.h \
attendee.h \
calendar.h \
calendarlocal.h \
calfilter.h \
calformat.h \
calstorage.h \
compat.h \
customproperties.h \
dummyscheduler.h \
duration.h \
event.h \
exceptions.h \
filestorage.h \
freebusy.h \
icaldrag.h \
icalformat.h \
icalformatimpl.h \
imipscheduler.h \
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 5aa3571..c54fb22 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -1,27 +1,27 @@
TEMPLATE = lib
CONFIG += qt warn_on
-INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include
+INCLUDEPATH += . .. $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include
DEPENDPATH += $(QPEDIR)/include
LIBS += -lmicroqtcompat -L$(QPEDIR)/lib
DEFINES += KDE_QT_ONLY
TARGET = microkde
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR=$(QPEDIR)/lib
INTERFACES = \
HEADERS = \
qlayoutengine_p.h \
KDGanttMinimizeSplitter.h \
kapplication.h \
kaudioplayer.h \
kcalendarsystem.h \
kcalendarsystemgregorian.h \
kcolorbutton.h \
kcolordialog.h \
kcombobox.h \
diff --git a/setQtopia b/setQtopia
index 60778ed..50cc6e6 100755
--- a/setQtopia
+++ b/setQtopia
@@ -1,18 +1,21 @@
# add the following line to ~/.bashrc without leading #
# alias cq='source /opt/Qtopia/examples/korge-1.0.9r.sharp/setQtopia'
# then type in terminal cq<return> to set the variables
# for desktop version in virtual framebuffer
export QPEDIR=/opt/Qtopia
export OPIEDIR=/kde_dev/opie
export BUILD_NO_OPIE_PLUGIN=1
+export BUILD_NO_LDAP_PLUGIN=1
#export BUILD_NO_GAMMU=1
export QTDIR=/opt/Qtopia
export PATH=$QTDIR/bin:$PATH
+#export BUILD_NO_PWMANAGER=1
export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
export LD_LIBRARY_PATH=$QTDIR/lib:$OPIEDIR/lib:$LD_LIBRARY_PATH
export PLATFORM=qtopia
export QTOPIALIB=-lqtopia
+export LIBICAL_PATH=/qtopia
#export RELEASE_DEBUG=release
export RELEASE_DEBUG=debug
\ No newline at end of file
diff --git a/setZaurus b/setZaurus
index c7b4e05..0ad740e 100644
--- a/setZaurus
+++ b/setZaurus
@@ -1,19 +1,20 @@
# copy this dir to /opt/Qtopia/examples/
# Now this file should be in the path /opt/Qtopia/examples/kdepim/setZaurus
# add the following line to ~/.bashrc without leading #
# alias cz='source /opt/Qtopia/examples/kdepim/setZaurus'
# then type in terminal cz<return> to set the variables
# for cross-compiling
export QPEDIR=/opt/Qtopia/sharp
export OPIEDIR=/kde_dev/opie
-#export BUILD_NO_OPIE_PLUGIN=1
+export BUILD_NO_OPIE_PLUGIN=1
#export BUILD_NO_SHARP_PLUGIN=1
#export BUILD_NO_GAMMU=1
+#export BUILD_NO_PWMANAGER=1
export QTDIR=/opt/Qtopia/sharp
export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH
export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
-export PLATFORM=zaurus
+export PLATFORM=zaurus
export RELEASE_DEBUG=release
+export LIBICAL_PATH=/zaurus
export SHARPDTMSDK=/opt/dtm
-#export RELEASE_DEBUG=debug
-
+#export RELEASE_DEBUG=debug \ No newline at end of file
diff --git a/setZaurus3 b/setZaurus3
index 5d1fe7b..245e5d6 100755
--- a/setZaurus3
+++ b/setZaurus3
@@ -1,25 +1,26 @@
# Settings to compile KDE-Pim/Pi with gcc 3.3.2 cross compiler for Zaurus
# copy this dir to /opt/Qtopia/examples/
# Now this file should be in the path /opt/Qtopia/examples/kdepim/setZaurus3
# add the following line to ~/.bashrc without leading #
# alias cz='source /opt/Qtopia/examples/kdepim/setZaurus3'
# then type in terminal cz3<return> to set the variables
# for cross-compiling
export QPEDIR=/opt/Qtopia/sharp3
export OPIEDIR=/kde_dev/opie
-#export BUILD_NO_OPIE_PLUGIN=1
-export BUILD_NO_QTOPIA_PLUGIN=1
+export BUILD_NO_OPIE_PLUGIN=1
+#export BUILD_NO_QTOPIA_PLUGIN=1
export BUILD_NO_SHARP_PLUGIN=1
export BUILD_NO_LDAP_PLUGIN=1
#export BUILD_NO_GAMMU=1
export QTDIR=/opt/Qtopia/sharp3
#insert here path to your gcc 3.3.2 compiler
export PATH=$QTDIR/bin:/opt/cross/bin:$PATH
export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
export PLATFORM=zaurus3
export RELEASE_DEBUG=release
export SHARPDTMSDK=/opt/dtm
#export RELEASE_DEBUG=debug
+export LIBICAL_PATH=/zaurus
export GCC3EXTRALIB1=-lpng12
export GCC3EXTRALIB2=-lz
export KDEPIM_VERSION=1.9.5c \ No newline at end of file