makefile changes

9 files changed, 22 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index b2ef295..d24c8b8 100644
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,8 @@ 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:
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b2ef295..d24c8b8 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -211,6 +211,8 @@ 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:
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
@@ -7,7 +7,7 @@ INCLUDEPATH += .
         CONFIG  += staticlib 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
-DESTDIR=../../lib/$(PLATFORM)
+DESTDIR=../../../dest$(LIBICAL_PATH)
 TARGET          = ical
 # Input
 HEADERS += astime.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
@@ -10,7 +10,7 @@ CONFIG		+= staticlib
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
-DESTDIR=../../lib/$(PLATFORM)
+DESTDIR=../../../dest$(LIBICAL_PATH)
 INCLUDEPATH     += . ../libical
 # Input
 HEADERS += icalcalendar.h \
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index c2fb4e5..737be53 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -8,8 +8,10 @@ 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 = \
 
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 5aa3571..c54fb22 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -1,6 +1,6 @@
         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
diff --git a/setQtopia b/setQtopia
index 60778ed..50cc6e6 100755
--- a/setQtopia
+++ b/setQtopia
@@ -5,13 +5,16 @@
 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
 
diff --git a/setZaurus b/setZaurus
index c7b4e05..0ad740e 100644
--- a/setZaurus
+++ b/setZaurus
@@ -6,14 +6,15 @@
 # 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
@@ -7,8 +7,8 @@
 # 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
@@ -20,6 +20,7 @@ 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