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
@@ -1,15 +1,17 @@
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 \
@@ -38,27 +40,32 @@ SUBDIRS_LDAP_PLUGIN = \
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
@@ -102,12 +109,21 @@ build_micromail: build_microkde
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)
@@ -119,12 +135,13 @@ variable_info:
@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.
@@ -180,12 +197,15 @@ dist:
./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) \
@@ -201,13 +221,15 @@ tmake: objects \
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)
@@ -266,6 +288,12 @@ kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
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,15 +1,17 @@
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 \
@@ -38,27 +40,32 @@ SUBDIRS_LDAP_PLUGIN = \
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
@@ -102,12 +109,21 @@ build_micromail: build_microkde
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)
@@ -119,12 +135,13 @@ variable_info:
@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.
@@ -180,12 +197,15 @@ dist:
./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) \
@@ -201,13 +221,15 @@ tmake: objects \
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)
@@ -266,6 +288,12 @@ kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
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
@@ -170,11 +170,11 @@ 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
@@ -44,13 +44,13 @@ SOURCES += gammu.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)