From a415f6b4188fe9fc7a7c8d530def31d0877a8073 Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 30 Aug 2004 20:38:49 +0000 Subject: Gammu integrated in build system --- diff --git a/Makefile b/Makefile index 9b55ecf..b7e0e33 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,12 @@ 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 = \ @@ -41,21 +43,26 @@ SUBDIRS_MICROMAIL = \ 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 @@ -105,6 +112,15 @@ build_micromail: build_microkde 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 -------------------------------------- @@ -122,6 +138,7 @@ variable_info: ifndef BUILD_NO_SHARP_PLUGIN @echo SHARPDTMSDK=$(SHARPDTMSDK) endif + @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) @echo -------------------------------------- variable_test: variable_info @@ -183,6 +200,9 @@ dist: ./mkipks kopiemail.control endif ./mkipks korganizer-alarm.control + ifndef BUILD_NO_GAMMU + ./mkipks gammu.control + endif tmake: objects \ qtcompat/Makefile$(PLATFORM) \ @@ -204,7 +224,9 @@ tmake: objects \ 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) \ @@ -269,3 +291,9 @@ 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 @@ -3,10 +3,12 @@ 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 = \ @@ -41,21 +43,26 @@ SUBDIRS_MICROMAIL = \ 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 @@ -105,6 +112,15 @@ build_micromail: build_microkde 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 -------------------------------------- @@ -122,6 +138,7 @@ variable_info: ifndef BUILD_NO_SHARP_PLUGIN @echo SHARPDTMSDK=$(SHARPDTMSDK) endif + @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) @echo -------------------------------------- variable_test: variable_info @@ -183,6 +200,9 @@ dist: ./mkipks kopiemail.control endif ./mkipks korganizer-alarm.control + ifndef BUILD_NO_GAMMU + ./mkipks gammu.control + endif tmake: objects \ qtcompat/Makefile$(PLATFORM) \ @@ -204,7 +224,9 @@ tmake: objects \ 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) \ @@ -269,3 +291,9 @@ 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 +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 @@ -173,7 +173,7 @@ 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) 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 \ depend/nokia/dct3trac/wmx.c LIBS += -L$(QPEDIR)/lib -LIBS += -lmicrogammu +LIBS += -lkammu LIBS += -lbluetooth LIBS += -lsdp LIBS += -lpthread -- cgit v0.9.0.2