summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -5,2 +5,3 @@ ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
6endif 7endif
@@ -9,2 +10,3 @@ ifneq ($(PLATFORM) , zaurus)
9 BUILD_NO_SHARP_PLUGIN=1 10 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
10endif 12endif
@@ -43,2 +45,6 @@ SUBDIRS_MICROMAIL = \
43 45
46SUBDIRS_GAMMU = \
47 gammu/emb/common \
48 gammu/emb/gammu
49
44SUBDIRS = \ 50SUBDIRS = \
@@ -49,4 +55,4 @@ SUBDIRS = \
49 $(SUBDIRS_LDAP_PLUGIN) \ 55 $(SUBDIRS_LDAP_PLUGIN) \
50 $(SUBDIRS_MICROMAIL) 56 $(SUBDIRS_MICROMAIL) \
51 57 $(SUBDIRS_GAMMU)
52 58
@@ -57,3 +63,4 @@ all: build_microkde \
57 build_ldap_plugin \ 63 build_ldap_plugin \
58 build_micromail 64 build_micromail \
65 build_gammu
59 66
@@ -107,2 +114,11 @@ build_micromail: build_microkde
107 114
115build_gammu: variable_test tmake
116 ifdef BUILD_NO_GAMMU
117 @echo ---> gammu not build.
118 else
119 for i in $(SUBDIRS_GAMMU); do pushd $$i; \
120 make -f Makefile$(PLATFORM) || exit 1; popd; \
121 done
122 endif
123
108 124
@@ -124,2 +140,3 @@ variable_info:
124 endif 140 endif
141 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
125 @echo -------------------------------------- 142 @echo --------------------------------------
@@ -185,2 +202,5 @@ dist:
185 ./mkipks korganizer-alarm.control 202 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control
205 endif
186 206
@@ -206,3 +226,5 @@ tmake: objects \
206 kmicromail/libetpan/Makefile$(PLATFORM) \ 226 kmicromail/libetpan/Makefile$(PLATFORM) \
207 kmicromail/libmailwrapper/Makefile$(PLATFORM) 227 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
228 gammu/emb/common/Makefile$(PLATFORM) \
229 gammu/emb/gammu/Makefile$(PLATFORM) \
208 230
@@ -271 +293,7 @@ kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmail
271 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) 293 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
294
295gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
296 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM)
297
298gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
299 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)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
6endif 7endif
@@ -9,2 +10,3 @@ ifneq ($(PLATFORM) , zaurus)
9 BUILD_NO_SHARP_PLUGIN=1 10 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
10endif 12endif
@@ -43,2 +45,6 @@ SUBDIRS_MICROMAIL = \
43 45
46SUBDIRS_GAMMU = \
47 gammu/emb/common \
48 gammu/emb/gammu
49
44SUBDIRS = \ 50SUBDIRS = \
@@ -49,4 +55,4 @@ SUBDIRS = \
49 $(SUBDIRS_LDAP_PLUGIN) \ 55 $(SUBDIRS_LDAP_PLUGIN) \
50 $(SUBDIRS_MICROMAIL) 56 $(SUBDIRS_MICROMAIL) \
51 57 $(SUBDIRS_GAMMU)
52 58
@@ -57,3 +63,4 @@ all: build_microkde \
57 build_ldap_plugin \ 63 build_ldap_plugin \
58 build_micromail 64 build_micromail \
65 build_gammu
59 66
@@ -107,2 +114,11 @@ build_micromail: build_microkde
107 114
115build_gammu: variable_test tmake
116 ifdef BUILD_NO_GAMMU
117 @echo ---> gammu not build.
118 else
119 for i in $(SUBDIRS_GAMMU); do pushd $$i; \
120 make -f Makefile$(PLATFORM) || exit 1; popd; \
121 done
122 endif
123
108 124
@@ -124,2 +140,3 @@ variable_info:
124 endif 140 endif
141 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
125 @echo -------------------------------------- 142 @echo --------------------------------------
@@ -185,2 +202,5 @@ dist:
185 ./mkipks korganizer-alarm.control 202 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control
205 endif
186 206
@@ -206,3 +226,5 @@ tmake: objects \
206 kmicromail/libetpan/Makefile$(PLATFORM) \ 226 kmicromail/libetpan/Makefile$(PLATFORM) \
207 kmicromail/libmailwrapper/Makefile$(PLATFORM) 227 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
228 gammu/emb/common/Makefile$(PLATFORM) \
229 gammu/emb/gammu/Makefile$(PLATFORM) \
208 230
@@ -271 +293,7 @@ kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmail
271 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) 293 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
294
295gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
296 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM)
297
298gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
299 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 @@
1Files: bin/kammu lib/libkammu*
2
3Priority: optional
4Section: qpe/pim
5Maintainer: Lutz Rogowski <lutz@pi-sync.net>
6Architecture: arm
7Version: 1.9.4
8License: GPL
9Depends:
10Description: Special version of gammu / libgammu
11 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
175 175
176TARGET = microgammu 176TARGET = kammu
177DESTDIR = $(QPEDIR)/lib 177DESTDIR = $(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 \
49LIBS += -L$(QPEDIR)/lib 49LIBS += -L$(QPEDIR)/lib
50LIBS += -lmicrogammu 50LIBS += -lkammu
51LIBS += -lbluetooth 51LIBS += -lbluetooth