summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-30 20:38:49 (UTC)
committer zautrix <zautrix>2004-08-30 20:38:49 (UTC)
commita415f6b4188fe9fc7a7c8d530def31d0877a8073 (patch) (unidiff)
tree015334928bc184833549508bb705384547e55115
parent109a23b70f67552a9ce27f682bb2b1bdbb2bb4f3 (diff)
downloadkdepimpi-a415f6b4188fe9fc7a7c8d530def31d0877a8073.zip
kdepimpi-a415f6b4188fe9fc7a7c8d530def31d0877a8073.tar.gz
kdepimpi-a415f6b4188fe9fc7a7c8d530def31d0877a8073.tar.bz2
Gammu integrated in build system
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
@@ -3,10 +3,12 @@ export KDEPIMDIR = $(shell pwd)
3 3
4ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
6endif 7endif
7 8
8ifneq ($(PLATFORM) , zaurus) 9ifneq ($(PLATFORM) , zaurus)
9 BUILD_NO_SHARP_PLUGIN=1 10 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
10endif 12endif
11 13
12SUBDIRS_MICROKDE = \ 14SUBDIRS_MICROKDE = \
@@ -41,21 +43,26 @@ SUBDIRS_MICROMAIL = \
41 kmicromail/libmailwrapper \ 43 kmicromail/libmailwrapper \
42 kmicromail 44 kmicromail
43 45
46SUBDIRS_GAMMU = \
47 gammu/emb/common \
48 gammu/emb/gammu
49
44SUBDIRS = \ 50SUBDIRS = \
45 $(SUBDIRS_MICROKDE) \ 51 $(SUBDIRS_MICROKDE) \
46 $(SUBDIRS_QTOPIA_PLUGIN) \ 52 $(SUBDIRS_QTOPIA_PLUGIN) \
47 $(SUBDIRS_OPIE_PLUGIN) \ 53 $(SUBDIRS_OPIE_PLUGIN) \
48 $(SUBDIRS_SHARP_PLUGIN) \ 54 $(SUBDIRS_SHARP_PLUGIN) \
49 $(SUBDIRS_LDAP_PLUGIN) \ 55 $(SUBDIRS_LDAP_PLUGIN) \
50 $(SUBDIRS_MICROMAIL) 56 $(SUBDIRS_MICROMAIL) \
51 57 $(SUBDIRS_GAMMU)
52 58
53all: build_microkde \ 59all: build_microkde \
54 build_qtopia_plugin \ 60 build_qtopia_plugin \
55 build_opie_plugin \ 61 build_opie_plugin \
56 build_sharp_plugin \ 62 build_sharp_plugin \
57 build_ldap_plugin \ 63 build_ldap_plugin \
58 build_micromail 64 build_micromail \
65 build_gammu
59 66
60 67
61build_microkde: variable_test tmake 68build_microkde: variable_test tmake
@@ -105,6 +112,15 @@ build_micromail: build_microkde
105 done 112 done
106 endif 113 endif
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
109variable_info: 125variable_info:
110 @echo -------------------------------------- 126 @echo --------------------------------------
@@ -122,6 +138,7 @@ variable_info:
122 ifndef BUILD_NO_SHARP_PLUGIN 138 ifndef BUILD_NO_SHARP_PLUGIN
123 @echo SHARPDTMSDK=$(SHARPDTMSDK) 139 @echo SHARPDTMSDK=$(SHARPDTMSDK)
124 endif 140 endif
141 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
125 @echo -------------------------------------- 142 @echo --------------------------------------
126 143
127variable_test: variable_info 144variable_test: variable_info
@@ -183,6 +200,9 @@ dist:
183 ./mkipks kopiemail.control 200 ./mkipks kopiemail.control
184 endif 201 endif
185 ./mkipks korganizer-alarm.control 202 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control
205 endif
186 206
187tmake: objects \ 207tmake: objects \
188 qtcompat/Makefile$(PLATFORM) \ 208 qtcompat/Makefile$(PLATFORM) \
@@ -204,7 +224,9 @@ tmake: objects \
204 kaddressbook/Makefile$(PLATFORM) \ 224 kaddressbook/Makefile$(PLATFORM) \
205 kmicromail/Makefile$(PLATFORM) \ 225 kmicromail/Makefile$(PLATFORM) \
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
209 231
210 232
@@ -269,3 +291,9 @@ kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
269 291
270kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro 292kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
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
@@ -3,10 +3,12 @@ export KDEPIMDIR = $(shell pwd)
3 3
4ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
6endif 7endif
7 8
8ifneq ($(PLATFORM) , zaurus) 9ifneq ($(PLATFORM) , zaurus)
9 BUILD_NO_SHARP_PLUGIN=1 10 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
10endif 12endif
11 13
12SUBDIRS_MICROKDE = \ 14SUBDIRS_MICROKDE = \
@@ -41,21 +43,26 @@ SUBDIRS_MICROMAIL = \
41 kmicromail/libmailwrapper \ 43 kmicromail/libmailwrapper \
42 kmicromail 44 kmicromail
43 45
46SUBDIRS_GAMMU = \
47 gammu/emb/common \
48 gammu/emb/gammu
49
44SUBDIRS = \ 50SUBDIRS = \
45 $(SUBDIRS_MICROKDE) \ 51 $(SUBDIRS_MICROKDE) \
46 $(SUBDIRS_QTOPIA_PLUGIN) \ 52 $(SUBDIRS_QTOPIA_PLUGIN) \
47 $(SUBDIRS_OPIE_PLUGIN) \ 53 $(SUBDIRS_OPIE_PLUGIN) \
48 $(SUBDIRS_SHARP_PLUGIN) \ 54 $(SUBDIRS_SHARP_PLUGIN) \
49 $(SUBDIRS_LDAP_PLUGIN) \ 55 $(SUBDIRS_LDAP_PLUGIN) \
50 $(SUBDIRS_MICROMAIL) 56 $(SUBDIRS_MICROMAIL) \
51 57 $(SUBDIRS_GAMMU)
52 58
53all: build_microkde \ 59all: build_microkde \
54 build_qtopia_plugin \ 60 build_qtopia_plugin \
55 build_opie_plugin \ 61 build_opie_plugin \
56 build_sharp_plugin \ 62 build_sharp_plugin \
57 build_ldap_plugin \ 63 build_ldap_plugin \
58 build_micromail 64 build_micromail \
65 build_gammu
59 66
60 67
61build_microkde: variable_test tmake 68build_microkde: variable_test tmake
@@ -105,6 +112,15 @@ build_micromail: build_microkde
105 done 112 done
106 endif 113 endif
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
109variable_info: 125variable_info:
110 @echo -------------------------------------- 126 @echo --------------------------------------
@@ -122,6 +138,7 @@ variable_info:
122 ifndef BUILD_NO_SHARP_PLUGIN 138 ifndef BUILD_NO_SHARP_PLUGIN
123 @echo SHARPDTMSDK=$(SHARPDTMSDK) 139 @echo SHARPDTMSDK=$(SHARPDTMSDK)
124 endif 140 endif
141 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
125 @echo -------------------------------------- 142 @echo --------------------------------------
126 143
127variable_test: variable_info 144variable_test: variable_info
@@ -183,6 +200,9 @@ dist:
183 ./mkipks kopiemail.control 200 ./mkipks kopiemail.control
184 endif 201 endif
185 ./mkipks korganizer-alarm.control 202 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control
205 endif
186 206
187tmake: objects \ 207tmake: objects \
188 qtcompat/Makefile$(PLATFORM) \ 208 qtcompat/Makefile$(PLATFORM) \
@@ -204,7 +224,9 @@ tmake: objects \
204 kaddressbook/Makefile$(PLATFORM) \ 224 kaddressbook/Makefile$(PLATFORM) \
205 kmicromail/Makefile$(PLATFORM) \ 225 kmicromail/Makefile$(PLATFORM) \
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
209 231
210 232
@@ -269,3 +291,9 @@ kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
269 291
270kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro 292kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
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
@@ -173,7 +173,7 @@ phone/nokia/nfuncold.c \
173phone/obex/obexgen.c \ 173phone/obex/obexgen.c \
174phone/symbian/mroutgen.c 174phone/symbian/mroutgen.c
175 175
176TARGET = microgammu 176TARGET = kammu
177DESTDIR = $(QPEDIR)/lib 177DESTDIR = $(QPEDIR)/lib
178OBJECTS_DIR = obj/$(PLATFORM) 178OBJECTS_DIR = obj/$(PLATFORM)
179MOC_DIR = moc/$(PLATFORM) 179MOC_DIR = moc/$(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
@@ -47,7 +47,7 @@ SOURCES += gammu.c \
47 depend/nokia/dct3trac/wmx.c 47 depend/nokia/dct3trac/wmx.c
48 48
49LIBS += -L$(QPEDIR)/lib 49LIBS += -L$(QPEDIR)/lib
50LIBS += -lmicrogammu 50LIBS += -lkammu
51LIBS += -lbluetooth 51LIBS += -lbluetooth
52LIBS += -lsdp 52LIBS += -lsdp
53LIBS += -lpthread 53LIBS += -lpthread