summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-01 12:38:27 (UTC)
committer zautrix <zautrix>2005-02-01 12:38:27 (UTC)
commitb699d9cf03b5b5bb92609bcd04eef2651fe0028b (patch) (unidiff)
tree64f5a933633816ef6df6433b3b4af2f070f84216
parent3295269ea601147ea60ba4d20ad225048d9d47c0 (diff)
downloadkdepimpi-b699d9cf03b5b5bb92609bcd04eef2651fe0028b.zip
kdepimpi-b699d9cf03b5b5bb92609bcd04eef2651fe0028b.tar.gz
kdepimpi-b699d9cf03b5b5bb92609bcd04eef2651fe0028b.tar.bz2
makefile changes
Diffstat (more/less context) (show 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--setZaurus5
-rwxr-xr-xsetZaurus35
9 files changed, 20 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index b2ef295..d24c8b8 100644
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,8 @@ objects:
211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 mkdir -p libical/lib/$(PLATFORM) 213 mkdir -p libical/lib/$(PLATFORM)
214 mkdir -p dest
215 mkdir -p dest$(LIBICAL_PATH)
214 mkdir -p pwmanager/libcrypt/$(PLATFORM) 216 mkdir -p pwmanager/libcrypt/$(PLATFORM)
215 217
216clean: 218clean:
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b2ef295..d24c8b8 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -211,6 +211,8 @@ objects:
211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 mkdir -p libical/lib/$(PLATFORM) 213 mkdir -p libical/lib/$(PLATFORM)
214 mkdir -p dest
215 mkdir -p dest$(LIBICAL_PATH)
214 mkdir -p pwmanager/libcrypt/$(PLATFORM) 216 mkdir -p pwmanager/libcrypt/$(PLATFORM)
215 217
216clean: 218clean:
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 += .
7 CONFIG += staticlib 7 CONFIG += staticlib
8OBJECTS_DIR = obj/$(PLATFORM) 8OBJECTS_DIR = obj/$(PLATFORM)
9MOC_DIR = moc/$(PLATFORM) 9MOC_DIR = moc/$(PLATFORM)
10DESTDIR=../../lib/$(PLATFORM) 10DESTDIR=../../../dest$(LIBICAL_PATH)
11TARGET = ical 11TARGET = ical
12# Input 12# Input
13HEADERS += astime.h \ 13HEADERS += 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
10 10
11OBJECTS_DIR = obj/$(PLATFORM) 11OBJECTS_DIR = obj/$(PLATFORM)
12MOC_DIR = moc/$(PLATFORM) 12MOC_DIR = moc/$(PLATFORM)
13DESTDIR=../../lib/$(PLATFORM) 13DESTDIR=../../../dest$(LIBICAL_PATH)
14INCLUDEPATH += . ../libical 14INCLUDEPATH += . ../libical
15# Input 15# Input
16HEADERS += icalcalendar.h \ 16HEADERS += 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
8OBJECTS_DIR = obj/$(PLATFORM) 8OBJECTS_DIR = obj/$(PLATFORM)
9MOC_DIR = moc/$(PLATFORM) 9MOC_DIR = moc/$(PLATFORM)
10DESTDIR = $(QPEDIR)/lib 10DESTDIR = $(QPEDIR)/lib
11LIBS += ../libical/lib/$(PLATFORM)/libical.a 11#LIBS += ../libical/lib/$(PLATFORM)/libical.a
12LIBS += ../libical/lib/$(PLATFORM)/libicalss.a 12#LIBS += ../libical/lib/$(PLATFORM)/libicalss.a
13LIBS += ../dest$(LIBICAL_PATH)/libical.a
14LIBS += ../dest$(LIBICAL_PATH)/libicalss.a
13 15
14INTERFACES = \ 16INTERFACES = \
15 17
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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include 3INCLUDEPATH += . .. $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include
4 4
5DEPENDPATH += $(QPEDIR)/include 5DEPENDPATH += $(QPEDIR)/include
6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib 6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib
diff --git a/setQtopia b/setQtopia
index 60778ed..50cc6e6 100755
--- a/setQtopia
+++ b/setQtopia
@@ -5,13 +5,16 @@
5export QPEDIR=/opt/Qtopia 5export QPEDIR=/opt/Qtopia
6export OPIEDIR=/kde_dev/opie 6export OPIEDIR=/kde_dev/opie
7export BUILD_NO_OPIE_PLUGIN=1 7export BUILD_NO_OPIE_PLUGIN=1
8export BUILD_NO_LDAP_PLUGIN=1
8#export BUILD_NO_GAMMU=1 9#export BUILD_NO_GAMMU=1
9export QTDIR=/opt/Qtopia 10export QTDIR=/opt/Qtopia
10export PATH=$QTDIR/bin:$PATH 11export PATH=$QTDIR/bin:$PATH
12#export BUILD_NO_PWMANAGER=1
11export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ 13export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
12export LD_LIBRARY_PATH=$QTDIR/lib:$OPIEDIR/lib:$LD_LIBRARY_PATH 14export LD_LIBRARY_PATH=$QTDIR/lib:$OPIEDIR/lib:$LD_LIBRARY_PATH
13export PLATFORM=qtopia 15export PLATFORM=qtopia
14export QTOPIALIB=-lqtopia 16export QTOPIALIB=-lqtopia
17export LIBICAL_PATH=/qtopia
15#export RELEASE_DEBUG=release 18#export RELEASE_DEBUG=release
16export RELEASE_DEBUG=debug 19export RELEASE_DEBUG=debug
17 20
diff --git a/setZaurus b/setZaurus
index c7b4e05..0ad740e 100644
--- a/setZaurus
+++ b/setZaurus
@@ -6,14 +6,15 @@
6# for cross-compiling 6# for cross-compiling
7export QPEDIR=/opt/Qtopia/sharp 7export QPEDIR=/opt/Qtopia/sharp
8export OPIEDIR=/kde_dev/opie 8export OPIEDIR=/kde_dev/opie
9#export BUILD_NO_OPIE_PLUGIN=1 9export BUILD_NO_OPIE_PLUGIN=1
10#export BUILD_NO_SHARP_PLUGIN=1 10#export BUILD_NO_SHARP_PLUGIN=1
11#export BUILD_NO_GAMMU=1 11#export BUILD_NO_GAMMU=1
12#export BUILD_NO_PWMANAGER=1
12export QTDIR=/opt/Qtopia/sharp 13export QTDIR=/opt/Qtopia/sharp
13export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH 14export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH
14export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ 15export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
15export PLATFORM=zaurus 16export PLATFORM=zaurus
16export RELEASE_DEBUG=release 17export RELEASE_DEBUG=release
18export LIBICAL_PATH=/zaurus
17export SHARPDTMSDK=/opt/dtm 19export SHARPDTMSDK=/opt/dtm
18#export RELEASE_DEBUG=debug 20#export RELEASE_DEBUG=debug
19
diff --git a/setZaurus3 b/setZaurus3
index 5d1fe7b..245e5d6 100755
--- a/setZaurus3
+++ b/setZaurus3
@@ -7,8 +7,8 @@
7# for cross-compiling 7# for cross-compiling
8export QPEDIR=/opt/Qtopia/sharp3 8export QPEDIR=/opt/Qtopia/sharp3
9export OPIEDIR=/kde_dev/opie 9export OPIEDIR=/kde_dev/opie
10#export BUILD_NO_OPIE_PLUGIN=1 10export BUILD_NO_OPIE_PLUGIN=1
11export BUILD_NO_QTOPIA_PLUGIN=1 11#export BUILD_NO_QTOPIA_PLUGIN=1
12export BUILD_NO_SHARP_PLUGIN=1 12export BUILD_NO_SHARP_PLUGIN=1
13export BUILD_NO_LDAP_PLUGIN=1 13export BUILD_NO_LDAP_PLUGIN=1
14#export BUILD_NO_GAMMU=1 14#export BUILD_NO_GAMMU=1
@@ -20,6 +20,7 @@ export PLATFORM=zaurus3
20export RELEASE_DEBUG=release 20export RELEASE_DEBUG=release
21export SHARPDTMSDK=/opt/dtm 21export SHARPDTMSDK=/opt/dtm
22#export RELEASE_DEBUG=debug 22#export RELEASE_DEBUG=debug
23export LIBICAL_PATH=/zaurus
23export GCC3EXTRALIB1=-lpng12 24export GCC3EXTRALIB1=-lpng12
24export GCC3EXTRALIB2=-lz 25export GCC3EXTRALIB2=-lz
25export KDEPIM_VERSION=1.9.5c \ No newline at end of file 26export KDEPIM_VERSION=1.9.5c \ No newline at end of file