Gammu integrated in build system

5 files changed, 77 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 9b55ecf..b7e0e33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,23 @@
 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 \
    microkde \
    libkcal \
    libkdepim \
    kabc \
    kabc/formats/binary \
    kabc/plugins/file \
@@ -32,39 +34,44 @@ SUBDIRS_OPIE_PLUGIN = \
 
 SUBDIRS_SHARP_PLUGIN = \
    kabc/plugins/sharpdtm
 
 SUBDIRS_LDAP_PLUGIN = \
    kabc/plugins/ldap
 
 SUBDIRS_MICROMAIL = \
    kmicromail/libetpan \
    kmicromail/libmailwrapper \
    kmicromail
 
+SUBDIRS_GAMMU = \
+   gammu/emb/common \
+   gammu/emb/gammu
+
 SUBDIRS = \
    $(SUBDIRS_MICROKDE) \
    $(SUBDIRS_QTOPIA_PLUGIN) \
    $(SUBDIRS_OPIE_PLUGIN) \
    $(SUBDIRS_SHARP_PLUGIN) \
    $(SUBDIRS_LDAP_PLUGIN) \
-   $(SUBDIRS_MICROMAIL)
-
+   $(SUBDIRS_MICROMAIL) \
+   $(SUBDIRS_GAMMU) 
 
 all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
      build_sharp_plugin \
      build_ldap_plugin \
-     build_micromail
+     build_micromail \
+     build_gammu
 
 
 build_microkde: variable_test tmake
 	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_qtopia_plugin: build_microkde
 	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
@@ -96,41 +103,51 @@ build_ldap_plugin: build_microkde
   endif
 
 
 build_micromail: build_microkde
   ifdef BUILD_NO_MICROMAIL
 	@echo ---> micromail not build.
   else
 	for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
 
+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
+
 
 variable_info:
 	@echo --------------------------------------
 	@echo KDEPIM buildsystem, variableinfo...
 	@echo KDEPIMDIR=$(KDEPIMDIR)
 	@echo QTDIR=$(QTDIR)
 	@echo QPEDIR=$(QPEDIR)
 	@echo OPIEDIR=$(OPIEDIR)
 	@echo PLATFORM=$(PLATFORM)
 	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
 	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
 	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
 	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
 	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
         ifndef BUILD_NO_SHARP_PLUGIN
 	@echo SHARPDTMSDK=$(SHARPDTMSDK)
         endif
+	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
 	@echo --------------------------------------
 
 variable_test: variable_info
 	@echo KDEPIM buildsystem, variablecheck...
   ifndef KDEPIMDIR
 	@echo KDEPIMDIR is not defined.
 	$(error KDEPIMDIR is not defined)
   endif
   ifndef PLATFORM
 	@echo PLATFORM is not defined.
 	$(error PLATFORM is not defined)
   endif
@@ -174,46 +191,51 @@ install:
 dist:
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
 	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
 	./mkipks kmicrokdelibs.control
 	./mkipks korganizer.control
 	./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	./mkipks kopiemail.control
   endif
 	./mkipks korganizer-alarm.control
+  ifndef BUILD_NO_GAMMU
+	./mkipks gammu.control
+  endif
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
-       kmicromail/libmailwrapper/Makefile$(PLATFORM) 
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
+       gammu/emb/common/Makefile$(PLATFORM) \
+       gammu/emb/gammu/Makefile$(PLATFORM) \
        
 
 
 
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
 	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
 
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
 	cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
 
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
 	cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
@@ -260,12 +282,18 @@ kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
 
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
 	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
 
 kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
 	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
 	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
 	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
@@ -1,21 +1,23 @@
 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 \
    microkde \
    libkcal \
    libkdepim \
    kabc \
    kabc/formats/binary \
    kabc/plugins/file \
@@ -32,39 +34,44 @@ SUBDIRS_OPIE_PLUGIN = \
 
 SUBDIRS_SHARP_PLUGIN = \
    kabc/plugins/sharpdtm
 
 SUBDIRS_LDAP_PLUGIN = \
    kabc/plugins/ldap
 
 SUBDIRS_MICROMAIL = \
    kmicromail/libetpan \
    kmicromail/libmailwrapper \
    kmicromail
 
+SUBDIRS_GAMMU = \
+   gammu/emb/common \
+   gammu/emb/gammu
+
 SUBDIRS = \
    $(SUBDIRS_MICROKDE) \
    $(SUBDIRS_QTOPIA_PLUGIN) \
    $(SUBDIRS_OPIE_PLUGIN) \
    $(SUBDIRS_SHARP_PLUGIN) \
    $(SUBDIRS_LDAP_PLUGIN) \
-   $(SUBDIRS_MICROMAIL)
-
+   $(SUBDIRS_MICROMAIL) \
+   $(SUBDIRS_GAMMU) 
 
 all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
      build_sharp_plugin \
      build_ldap_plugin \
-     build_micromail
+     build_micromail \
+     build_gammu
 
 
 build_microkde: variable_test tmake
 	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_qtopia_plugin: build_microkde
 	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
@@ -96,41 +103,51 @@ build_ldap_plugin: build_microkde
   endif
 
 
 build_micromail: build_microkde
   ifdef BUILD_NO_MICROMAIL
 	@echo ---> micromail not build.
   else
 	for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
 
+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
+
 
 variable_info:
 	@echo --------------------------------------
 	@echo KDEPIM buildsystem, variableinfo...
 	@echo KDEPIMDIR=$(KDEPIMDIR)
 	@echo QTDIR=$(QTDIR)
 	@echo QPEDIR=$(QPEDIR)
 	@echo OPIEDIR=$(OPIEDIR)
 	@echo PLATFORM=$(PLATFORM)
 	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
 	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
 	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
 	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
 	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
         ifndef BUILD_NO_SHARP_PLUGIN
 	@echo SHARPDTMSDK=$(SHARPDTMSDK)
         endif
+	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
 	@echo --------------------------------------
 
 variable_test: variable_info
 	@echo KDEPIM buildsystem, variablecheck...
   ifndef KDEPIMDIR
 	@echo KDEPIMDIR is not defined.
 	$(error KDEPIMDIR is not defined)
   endif
   ifndef PLATFORM
 	@echo PLATFORM is not defined.
 	$(error PLATFORM is not defined)
   endif
@@ -174,46 +191,51 @@ install:
 dist:
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
 	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
 	./mkipks kmicrokdelibs.control
 	./mkipks korganizer.control
 	./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	./mkipks kopiemail.control
   endif
 	./mkipks korganizer-alarm.control
+  ifndef BUILD_NO_GAMMU
+	./mkipks gammu.control
+  endif
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
-       kmicromail/libmailwrapper/Makefile$(PLATFORM) 
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
+       gammu/emb/common/Makefile$(PLATFORM) \
+       gammu/emb/gammu/Makefile$(PLATFORM) \
        
 
 
 
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
 	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
 
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
 	cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
 
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
 	cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
@@ -260,12 +282,18 @@ kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
 
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
 	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
 
 kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
 	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
 	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
 	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
@@ -164,17 +164,17 @@ phone/nokia/dct3/n7110.c \
 phone/nokia/dct3/n9210.c \
 phone/nokia/dct3/dct3func.c \
 phone/nokia/dct4/n3320.c \
 phone/nokia/dct4/n3650.c \
 phone/nokia/dct4/n6510.c \
 phone/nokia/dct4/dct4func.c \
 phone/nokia/nauto.c \
 phone/nokia/nfunc.c \
 phone/nokia/nfuncold.c \
 phone/obex/obexgen.c \
 phone/symbian/mroutgen.c 
 
-TARGET = microgammu
+TARGET = kammu
 DESTDIR = $(QPEDIR)/lib
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 CONFIG			=  warn_off release console
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
@@ -38,20 +38,20 @@ SOURCES += gammu.c \
            smsd/smsdcore.c \
            depend/nokia/dct3.c \
            depend/nokia/dct4.c \
            depend/siemens/chiffre.c \
            depend/siemens/dsiemens.c \
            depend/nokia/dct3trac/wmx-gsm.c \
            depend/nokia/dct3trac/wmx-list.c \
            depend/nokia/dct3trac/wmx-sim.c \
            depend/nokia/dct3trac/wmx-util.c \
            depend/nokia/dct3trac/wmx.c
 
 LIBS += -L$(QPEDIR)/lib
-LIBS += -lmicrogammu
+LIBS += -lkammu
 LIBS += -lbluetooth
 LIBS += -lsdp
 LIBS += -lpthread
 CONFIG			=  warn_off release console
 DESTDIR=$(QPEDIR)/bin
 OBJECTS_DIR = obj/$(PLATFORM)
 TARGET = kammu
\ No newline at end of file