Makefile fixes

5 files changed, 4 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index b7e0e33..7cc6952 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,15 @@
 export KDEPIMDIR = $(shell pwd)
 
 
 ifeq ($(PLATFORM) , zaurus)
   BUILD_NO_LDAP_PLUGIN=1
-  BUILD_NO_GAMMU=1
 endif
 
 ifneq ($(PLATFORM) , zaurus)
   BUILD_NO_SHARP_PLUGIN=1
-  BUILD_NO_GAMMU=1
 endif
 
 SUBDIRS_MICROKDE = \
    libical/src/libical \
    libical/src/libicalss \
    qtcompat \
@@ -198,13 +196,13 @@ dist:
         ./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         ./mkipks kopiemail.control
   endif
         ./mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
-        ./mkipks gammu.control
+        ./mkipks kammu.control
   endif
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b7e0e33..7cc6952 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,17 +1,15 @@
 export KDEPIMDIR = $(shell pwd)
 
 
 ifeq ($(PLATFORM) , zaurus)
   BUILD_NO_LDAP_PLUGIN=1
-  BUILD_NO_GAMMU=1
 endif
 
 ifneq ($(PLATFORM) , zaurus)
   BUILD_NO_SHARP_PLUGIN=1
-  BUILD_NO_GAMMU=1
 endif
 
 SUBDIRS_MICROKDE = \
    libical/src/libical \
    libical/src/libicalss \
    qtcompat \
@@ -198,13 +196,13 @@ dist:
         ./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         ./mkipks kopiemail.control
   endif
         ./mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
-        ./mkipks gammu.control
+        ./mkipks kammu.control
   endif
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
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
@@ -2,12 +2,13 @@
 # alias cq='source /opt/Qtopia/examples/korge-1.0.9r.sharp/setQtopia'
 # then type in terminal cq<return> to set the variables
 # for desktop version in virtual framebuffer
 export QPEDIR=/opt/Qtopia
 export OPIEDIR=/kde_dev/opie
 export BUILD_NO_OPIE_PLUGIN=1
+#export BUILD_NO_GAMMU=1
 export QTDIR=/opt/Qtopia
 export PATH=$QTDIR/bin:$PATH   
 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
diff --git a/setZaurus b/setZaurus
index 101298d..4767716 100644
--- a/setZaurus
+++ b/setZaurus
@@ -5,12 +5,13 @@
 # then type in terminal cz<return> to set the variables
 # for cross-compiling
 export QPEDIR=/opt/Qtopia/sharp
 export OPIEDIR=/kde_dev/opie
 #export BUILD_NO_OPIE_PLUGIN=1
 #export BUILD_NO_SHARP_PLUGIN=1
+#export BUILD_NO_GAMMU=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 RELEASE_DEBUG=release
 export SHARPDTMSDK=/opt/dtm