summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-30 21:21:12 (UTC)
committer zautrix <zautrix>2004-08-30 21:21:12 (UTC)
commit9bd5f28b42d2fc569cd92ece73282f3dc6491d4d (patch) (unidiff)
treec7e820667c25952048cdf604e0ca91f61b22c077
parenta415f6b4188fe9fc7a7c8d530def31d0877a8073 (diff)
downloadkdepimpi-9bd5f28b42d2fc569cd92ece73282f3dc6491d4d.zip
kdepimpi-9bd5f28b42d2fc569cd92ece73282f3dc6491d4d.tar.gz
kdepimpi-9bd5f28b42d2fc569cd92ece73282f3dc6491d4d.tar.bz2
Makefile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--Makefile.Embedded4
-rw-r--r--kammu.control (renamed from gammu.control)0
-rwxr-xr-xsetQtopia1
-rw-r--r--setZaurus1
5 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b7e0e33..7cc6952 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,10 @@ export KDEPIMDIR = $(shell pwd)
3 3
4ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
7endif 6endif
8 7
9ifneq ($(PLATFORM) , zaurus) 8ifneq ($(PLATFORM) , zaurus)
10 BUILD_NO_SHARP_PLUGIN=1 9 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
12endif 10endif
13 11
14SUBDIRS_MICROKDE = \ 12SUBDIRS_MICROKDE = \
@@ -201,7 +199,7 @@ dist:
201 endif 199 endif
202 ./mkipks korganizer-alarm.control 200 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU 201 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control 202 ./mkipks kammu.control
205 endif 203 endif
206 204
207tmake: objects \ 205tmake: objects \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b7e0e33..7cc6952 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -3,12 +3,10 @@ export KDEPIMDIR = $(shell pwd)
3 3
4ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
7endif 6endif
8 7
9ifneq ($(PLATFORM) , zaurus) 8ifneq ($(PLATFORM) , zaurus)
10 BUILD_NO_SHARP_PLUGIN=1 9 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
12endif 10endif
13 11
14SUBDIRS_MICROKDE = \ 12SUBDIRS_MICROKDE = \
@@ -201,7 +199,7 @@ dist:
201 endif 199 endif
202 ./mkipks korganizer-alarm.control 200 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU 201 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control 202 ./mkipks kammu.control
205 endif 203 endif
206 204
207tmake: objects \ 205tmake: objects \
diff --git a/gammu.control b/kammu.control
index db52c80..db52c80 100644
--- a/gammu.control
+++ b/kammu.control
diff --git a/setQtopia b/setQtopia
index e08f13c..60778ed 100755
--- a/setQtopia
+++ b/setQtopia
@@ -5,6 +5,7 @@
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
8#export BUILD_NO_GAMMU=1
8export QTDIR=/opt/Qtopia 9export QTDIR=/opt/Qtopia
9export PATH=$QTDIR/bin:$PATH 10export PATH=$QTDIR/bin:$PATH
10export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ 11export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
diff --git a/setZaurus b/setZaurus
index 101298d..4767716 100644
--- a/setZaurus
+++ b/setZaurus
@@ -8,6 +8,7 @@ export QPEDIR=/opt/Qtopia/sharp
8export OPIEDIR=/kde_dev/opie 8export OPIEDIR=/kde_dev/opie
9#export BUILD_NO_OPIE_PLUGIN=1 9#export 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
11export QTDIR=/opt/Qtopia/sharp 12export QTDIR=/opt/Qtopia/sharp
12export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH 13export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH
13export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ 14export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++