5 files changed, 77 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 9b55ecf..b7e0e33 100644
--- a/Makefile
+++ b/Makefile
@@ -5,2 +5,3 @@ ifeq ($(PLATFORM) , zaurus)
   BUILD_NO_LDAP_PLUGIN=1
+  BUILD_NO_GAMMU=1
 endif
@@ -9,2 +10,3 @@ ifneq ($(PLATFORM) , zaurus)
   BUILD_NO_SHARP_PLUGIN=1
+  BUILD_NO_GAMMU=1
 endif
@@ -43,2 +45,6 @@ SUBDIRS_MICROMAIL = \
 
+SUBDIRS_GAMMU = \
+   gammu/emb/common \
+   gammu/emb/gammu
+
 SUBDIRS = \
@@ -49,4 +55,4 @@ SUBDIRS = \
    $(SUBDIRS_LDAP_PLUGIN) \
-   $(SUBDIRS_MICROMAIL)
-
+   $(SUBDIRS_MICROMAIL) \
+   $(SUBDIRS_GAMMU) 
 
@@ -57,3 +63,4 @@ all: build_microkde \
      build_ldap_plugin \
-     build_micromail
+     build_micromail \
+     build_gammu
 
@@ -107,2 +114,11 @@ build_micromail: build_microkde
 
+build_gammu: variable_test tmake
+  ifdef BUILD_NO_GAMMU
+        @echo ---> gammu not build.
+  else
+        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
 
@@ -124,2 +140,3 @@ variable_info:
         endif
+        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
         @echo --------------------------------------
@@ -185,2 +202,5 @@ dist:
         ./mkipks korganizer-alarm.control
+  ifndef BUILD_NO_GAMMU
+        ./mkipks gammu.control
+  endif
 
@@ -206,3 +226,5 @@ tmake: objects \
        kmicromail/libetpan/Makefile$(PLATFORM) \
-       kmicromail/libmailwrapper/Makefile$(PLATFORM) 
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
+       gammu/emb/common/Makefile$(PLATFORM) \
+       gammu/emb/gammu/Makefile$(PLATFORM) \
        
@@ -271 +293,7 @@ kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmail
         cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
+
+gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
+        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM)
+
+gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
+        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" gammuE.pro -o Makefile$(PLATFORM)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 9b55ecf..b7e0e33 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -5,2 +5,3 @@ ifeq ($(PLATFORM) , zaurus)
   BUILD_NO_LDAP_PLUGIN=1
+  BUILD_NO_GAMMU=1
 endif
@@ -9,2 +10,3 @@ ifneq ($(PLATFORM) , zaurus)
   BUILD_NO_SHARP_PLUGIN=1
+  BUILD_NO_GAMMU=1
 endif
@@ -43,2 +45,6 @@ SUBDIRS_MICROMAIL = \
 
+SUBDIRS_GAMMU = \
+   gammu/emb/common \
+   gammu/emb/gammu
+
 SUBDIRS = \
@@ -49,4 +55,4 @@ SUBDIRS = \
    $(SUBDIRS_LDAP_PLUGIN) \
-   $(SUBDIRS_MICROMAIL)
-
+   $(SUBDIRS_MICROMAIL) \
+   $(SUBDIRS_GAMMU) 
 
@@ -57,3 +63,4 @@ all: build_microkde \
      build_ldap_plugin \
-     build_micromail
+     build_micromail \
+     build_gammu
 
@@ -107,2 +114,11 @@ build_micromail: build_microkde
 
+build_gammu: variable_test tmake
+  ifdef BUILD_NO_GAMMU
+        @echo ---> gammu not build.
+  else
+        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
 
@@ -124,2 +140,3 @@ variable_info:
         endif
+        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
         @echo --------------------------------------
@@ -185,2 +202,5 @@ dist:
         ./mkipks korganizer-alarm.control
+  ifndef BUILD_NO_GAMMU
+        ./mkipks gammu.control
+  endif
 
@@ -206,3 +226,5 @@ tmake: objects \
        kmicromail/libetpan/Makefile$(PLATFORM) \
-       kmicromail/libmailwrapper/Makefile$(PLATFORM) 
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
+       gammu/emb/common/Makefile$(PLATFORM) \
+       gammu/emb/gammu/Makefile$(PLATFORM) \
        
@@ -271 +293,7 @@ kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmail
         cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
+
+gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
+        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM)
+
+gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
+        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" gammuE.pro -o Makefile$(PLATFORM)
diff --git a/gammu.control b/gammu.control
new file mode 100644
index 0000000..db52c80
--- a/dev/null
+++ b/gammu.control
@@ -0,0 +1,11 @@
+Files:  bin/kammu  lib/libkammu*
+
+Priority: optional
+Section: qpe/pim
+Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Architecture: arm
+Version: 1.9.4
+License: GPL
+Depends: 
+Description: Special version of gammu / libgammu
+    for Zaurus PDA and microkde
diff --git a/gammu/emb/common/commonE.pro b/gammu/emb/common/commonE.pro
index 33c0224..a36947b 100644
--- a/gammu/emb/common/commonE.pro
+++ b/gammu/emb/common/commonE.pro
@@ -175,3 +175,3 @@ phone/symbian/mroutgen.c
 
-TARGET = microgammu
+TARGET = kammu
 DESTDIR = $(QPEDIR)/lib
diff --git a/gammu/emb/gammu/gammuE.pro b/gammu/emb/gammu/gammuE.pro
index 5010d8c..c685bf8 100644
--- a/gammu/emb/gammu/gammuE.pro
+++ b/gammu/emb/gammu/gammuE.pro
@@ -49,3 +49,3 @@ SOURCES += gammu.c \
 LIBS += -L$(QPEDIR)/lib
-LIBS += -lmicrogammu
+LIBS += -lkammu
 LIBS += -lbluetooth