summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-01 12:38:27 (UTC)
committer zautrix <zautrix>2005-02-01 12:38:27 (UTC)
commitb699d9cf03b5b5bb92609bcd04eef2651fe0028b (patch) (side-by-side diff)
tree64f5a933633816ef6df6433b3b4af2f070f84216
parent3295269ea601147ea60ba4d20ad225048d9d47c0 (diff)
downloadkdepimpi-b699d9cf03b5b5bb92609bcd04eef2651fe0028b.zip
kdepimpi-b699d9cf03b5b5bb92609bcd04eef2651fe0028b.tar.gz
kdepimpi-b699d9cf03b5b5bb92609bcd04eef2651fe0028b.tar.bz2
makefile changes
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
@@ -213,2 +213,4 @@ objects:
mkdir -p libical/lib/$(PLATFORM)
+ mkdir -p dest
+ mkdir -p dest$(LIBICAL_PATH)
mkdir -p pwmanager/libcrypt/$(PLATFORM)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b2ef295..d24c8b8 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -213,2 +213,4 @@ objects:
mkdir -p libical/lib/$(PLATFORM)
+ mkdir -p dest
+ mkdir -p dest$(LIBICAL_PATH)
mkdir -p pwmanager/libcrypt/$(PLATFORM)
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
@@ -9,3 +9,3 @@ OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
-DESTDIR=../../lib/$(PLATFORM)
+DESTDIR=../../../dest$(LIBICAL_PATH)
TARGET = ical
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
@@ -12,3 +12,3 @@ OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
-DESTDIR=../../lib/$(PLATFORM)
+DESTDIR=../../../dest$(LIBICAL_PATH)
INCLUDEPATH += . ../libical
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index c2fb4e5..737be53 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -10,4 +10,6 @@ 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
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 5aa3571..c54fb22 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -2,3 +2,3 @@ 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
diff --git a/setQtopia b/setQtopia
index 60778ed..50cc6e6 100755
--- a/setQtopia
+++ b/setQtopia
@@ -7,2 +7,3 @@ export OPIEDIR=/kde_dev/opie
export BUILD_NO_OPIE_PLUGIN=1
+export BUILD_NO_LDAP_PLUGIN=1
#export BUILD_NO_GAMMU=1
@@ -10,2 +11,3 @@ export QTDIR=/opt/Qtopia
export PATH=$QTDIR/bin:$PATH
+#export BUILD_NO_PWMANAGER=1
export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
@@ -14,2 +16,3 @@ export PLATFORM=qtopia
export QTOPIALIB=-lqtopia
+export LIBICAL_PATH=/qtopia
#export RELEASE_DEBUG=release
diff --git a/setZaurus b/setZaurus
index c7b4e05..0ad740e 100644
--- a/setZaurus
+++ b/setZaurus
@@ -8,5 +8,6 @@ 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
@@ -14,6 +15,6 @@ 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
@@ -9,4 +9,4 @@ 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
@@ -22,2 +22,3 @@ export SHARPDTMSDK=/opt/dtm
#export RELEASE_DEBUG=debug
+export LIBICAL_PATH=/zaurus
export GCC3EXTRALIB1=-lpng12