| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.Embedded | 2 | ||||
| -rw-r--r-- | libical/src/libical/libicalE.pro | 2 | ||||
| -rw-r--r-- | libical/src/libicalss/libicalssE.pro | 2 | ||||
| -rw-r--r-- | libkcal/libkcalE.pro | 6 | ||||
| -rw-r--r-- | microkde/microkdeE.pro | 2 | ||||
| -rwxr-xr-x | setQtopia | 3 | ||||
| -rw-r--r-- | setZaurus | 5 | ||||
| -rwxr-xr-x | setZaurus3 | 5 |
9 files changed, 20 insertions, 9 deletions
@@ -212,4 +212,6 @@ objects: 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) diff --git a/Makefile.Embedded b/Makefile.Embedded index b2ef295..d24c8b8 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded @@ -212,4 +212,6 @@ objects: 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) 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 @@ -8,5 +8,5 @@ CONFIG += staticlib OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) -DESTDIR=../../lib/$(PLATFORM) +DESTDIR=../../../dest$(LIBICAL_PATH) TARGET = ical # Input 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 @@ -11,5 +11,5 @@ CONFIG += staticlib OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) -DESTDIR=../../lib/$(PLATFORM) +DESTDIR=../../../dest$(LIBICAL_PATH) INCLUDEPATH += . ../libical # Input diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro index c2fb4e5..737be53 100644 --- a/libkcal/libkcalE.pro +++ b/libkcal/libkcalE.pro @@ -9,6 +9,8 @@ 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,5 +1,5 @@ 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 @@ -6,11 +6,14 @@ 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 @@ -7,7 +7,8 @@ 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 @@ -15,5 +16,5 @@ export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ export PLATFORM=zaurus export RELEASE_DEBUG=release +export LIBICAL_PATH=/zaurus export SHARPDTMSDK=/opt/dtm #export RELEASE_DEBUG=debug - @@ -8,6 +8,6 @@ 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 @@ -21,4 +21,5 @@ export RELEASE_DEBUG=release export SHARPDTMSDK=/opt/dtm #export RELEASE_DEBUG=debug +export LIBICAL_PATH=/zaurus export GCC3EXTRALIB1=-lpng12 export GCC3EXTRALIB2=-lz |