summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile36
-rw-r--r--Makefile.Embedded36
-rw-r--r--gammu.control11
-rw-r--r--gammu/emb/common/commonE.pro2
-rw-r--r--gammu/emb/gammu/gammuE.pro2
5 files changed, 77 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 9b55ecf..b7e0e33 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,10 @@ 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
@@ -42,4 +44,8 @@ SUBDIRS_MICROMAIL = \
kmicromail
+SUBDIRS_GAMMU = \
+ gammu/emb/common \
+ gammu/emb/gammu
+
SUBDIRS = \
$(SUBDIRS_MICROKDE) \
@@ -48,6 +54,6 @@ SUBDIRS = \
$(SUBDIRS_SHARP_PLUGIN) \
$(SUBDIRS_LDAP_PLUGIN) \
- $(SUBDIRS_MICROMAIL)
-
+ $(SUBDIRS_MICROMAIL) \
+ $(SUBDIRS_GAMMU)
all: build_microkde \
@@ -56,5 +62,6 @@ all: build_microkde \
build_sharp_plugin \
build_ldap_plugin \
- build_micromail
+ build_micromail \
+ build_gammu
@@ -106,4 +113,13 @@ build_micromail: build_microkde
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:
@@ -123,4 +139,5 @@ variable_info:
@echo SHARPDTMSDK=$(SHARPDTMSDK)
endif
+ @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
@echo --------------------------------------
@@ -184,4 +201,7 @@ dist:
endif
./mkipks korganizer-alarm.control
+ ifndef BUILD_NO_GAMMU
+ ./mkipks gammu.control
+ endif
tmake: objects \
@@ -205,5 +225,7 @@ tmake: objects \
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) \
@@ -270,2 +292,8 @@ kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
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
@@ -4,8 +4,10 @@ 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
@@ -42,4 +44,8 @@ SUBDIRS_MICROMAIL = \
kmicromail
+SUBDIRS_GAMMU = \
+ gammu/emb/common \
+ gammu/emb/gammu
+
SUBDIRS = \
$(SUBDIRS_MICROKDE) \
@@ -48,6 +54,6 @@ SUBDIRS = \
$(SUBDIRS_SHARP_PLUGIN) \
$(SUBDIRS_LDAP_PLUGIN) \
- $(SUBDIRS_MICROMAIL)
-
+ $(SUBDIRS_MICROMAIL) \
+ $(SUBDIRS_GAMMU)
all: build_microkde \
@@ -56,5 +62,6 @@ all: build_microkde \
build_sharp_plugin \
build_ldap_plugin \
- build_micromail
+ build_micromail \
+ build_gammu
@@ -106,4 +113,13 @@ build_micromail: build_microkde
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:
@@ -123,4 +139,5 @@ variable_info:
@echo SHARPDTMSDK=$(SHARPDTMSDK)
endif
+ @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
@echo --------------------------------------
@@ -184,4 +201,7 @@ dist:
endif
./mkipks korganizer-alarm.control
+ ifndef BUILD_NO_GAMMU
+ ./mkipks gammu.control
+ endif
tmake: objects \
@@ -205,5 +225,7 @@ tmake: objects \
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) \
@@ -270,2 +292,8 @@ kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
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
@@ -174,5 +174,5 @@ phone/obex/obexgen.c \
phone/symbian/mroutgen.c
-TARGET = microgammu
+TARGET = kammu
DESTDIR = $(QPEDIR)/lib
OBJECTS_DIR = obj/$(PLATFORM)
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
@@ -48,5 +48,5 @@ SOURCES += gammu.c \
LIBS += -L$(QPEDIR)/lib
-LIBS += -lmicrogammu
+LIBS += -lkammu
LIBS += -lbluetooth
LIBS += -lsdp