| -rw-r--r-- | Makefile.Embedded | 54 | ||||
| -rw-r--r-- | kabc/converter/sharpdtm/sharpdtmE.pro | 4 | ||||
| -rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmE.pro | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/sharpdtm/sharpdtmE.pro | 2 |
4 files changed, 40 insertions, 24 deletions
diff --git a/Makefile.Embedded b/Makefile.Embedded index 71035d6..7777a19 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded @@ -1,17 +1,17 @@ DISTPATH = $(shell pwd) DISTDIR = $(shell basename $(DISTPATH)) + ifeq ($(PLATFORM) , zaurus) BUILD_NO_LDAP_PLUGIN=1 endif ifneq ($(PLATFORM) , zaurus) BUILD_NO_SHARP_PLUGIN=1 endif - -SUBDIRS_MAIN = \ +SUBDIRS_MICROKDE = \ libical/src/libical \ libical/src/libicalss \ qtcompat \ microkde \ @@ -47,45 +47,54 @@ SUBDIRS_MICROMAIL = \ kmicromail/libetpan \ kmicromail/libmailwrapper \ kmicromail -all: build_main \ +SUBDIRS = \ + $(SUBDIRS_MICROKDE) \ + $(SUBDIRS_QTOPIA_PLUGIN) \ + $(SUBDIRS_OPIE_PLUGIN) \ + $(SUBDIRS_SHARP_PLUGIN) \ + $(SUBDIRS_LDAP_PLUGIN) \ + $(SUBDIRS_MICROMAIL) + + +all: build_microkde \ build_qtopia_plugin \ build_opie_plugin \ build_sharp_plugin \ build_ldap_plugin \ build_micromail -build_main: variable_info tmake - for i in $(SUBDIRS_MAIN); do pushd $$i; \ +build_microkde: variable_test tmake + for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ make -f Makefile$(PLATFORM) || exit 1; popd; \ done -build_qtopia_plugin: build_main +build_qtopia_plugin: build_microkde for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ make -f Makefile$(PLATFORM) || exit 1; popd; \ done -build_opie_plugin: build_main +build_opie_plugin: build_microkde ifdef BUILD_NO_OPIE_PLUGIN @echo ---> opie plugin not build. else for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ make -f Makefile$(PLATFORM) || exit 1; popd; \ done endif -build_sharp_plugin: build_main +build_sharp_plugin: build_microkde ifdef BUILD_NO_SHARP_PLUGIN @echo ---> ldap plugin not build. else for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ make -f Makefile$(PLATFORM) || exit 1; popd; \ done endif -build_ldap_plugin: build_main +build_ldap_plugin: build_microkde ifdef BUILD_NO_LDAP_PLUGIN @echo ---> ldap plugin not build. else for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ @@ -93,9 +102,9 @@ build_ldap_plugin: build_main done endif -build_micromail: build_main +build_micromail: build_microkde ifdef BUILD_NO_MICROMAIL @echo ---> micromail not build. else for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ @@ -103,36 +112,45 @@ build_micromail: build_main done endif -variable_info: variable_test +variable_info: @echo -------------------------------------- - @echo KDEPIM buildsystem, variablecheck... + @echo KDEPIM buildsystem, variableinfo... @echo QTDIR=$(QTDIR) @echo QPEDIR=$(QPEDIR) @echo OPIEDIR=$(OPIEDIR) @echo PLATFORM=$(PLATFORM) @echo RELEASE_DEBUG=$(RELEASE_DEBUG) + @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) @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) - @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) + ifndef BUILD_NO_SHARP_PLUGIN + @echo SHARPDTMSDK=$(SHARPDTMSDK) + endif @echo -------------------------------------- -variable_test: +variable_test: variable_info + @echo KDEPIM buildsystem, variablecheck... ifdef BUILD_NO_LDAP_PLUGIN @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) endif ifdef BUILD_NO_OPIE_PLUGIN @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) endif - ifdef BUILD_NO_SHARP_PLUGIN - @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) - endif ifdef BUILD_NO_MICROMAIL @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) endif - + ifdef BUILD_NO_SHARP_PLUGIN + @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) + else + ifndef SHARPDTMSDK + @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) + $(error SHARPDTMSDK is not defined) + endif + endif + @echo -------------------------------------- objects: for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done diff --git a/kabc/converter/sharpdtm/sharpdtmE.pro b/kabc/converter/sharpdtm/sharpdtmE.pro index cd7032a..89b4e64 100644 --- a/kabc/converter/sharpdtm/sharpdtmE.pro +++ b/kabc/converter/sharpdtm/sharpdtmE.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -INCLUDEPATH += . ../.. ../../../external/sharpdtm/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include +INCLUDEPATH += . ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include #CONFIG += staticlib OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) @@ -12,9 +12,9 @@ DESTDIR=$(QPEDIR)/lib LIBS += -lmicrokde LIBS += -lmicrokabc LIBS += -L$(QPEDIR)/lib -LIBS += -lqpepim +#LIBS += -lqpepim LIBS += -lqpe LIBS += -lzdtm TARGET = microkabc_sharpdtmconverter diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro index 7c7a6d5..a03454f 100644 --- a/kabc/plugins/sharpdtm/sharpdtmE.pro +++ b/kabc/plugins/sharpdtm/sharpdtmE.pro @@ -1,10 +1,9 @@ TEMPLATE = lib CONFIG += qt warn_on -#release debug TARGET = microkabc_sharpdtm -INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include +INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) @@ -15,9 +14,8 @@ LIBS += -L$(QPEDIR)/lib LIBS += -lqpe LIBS += -lqte LIBS += -lzdtm LIBS += -lmicrokabc_sharpdtmconverter -#LIBS += -L../../lib/$(PLATFORM) INTERFACES = \ diff --git a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro index 0425c42..de8e342 100644 --- a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro +++ b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro @@ -7,9 +7,9 @@ MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib DEFINES += KAB_EMBEDDED -INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../.. ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include +INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../.. ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include LIBS += -L$(QPEDIR)/lib LIBS += -lmicrokde LIBS += -lmicrokabc LIBS += -lqpe |