author | ulf69 <ulf69> | 2004-07-19 22:24:30 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-19 22:24:30 (UTC) |
commit | 94636524739ecaa2206ca2cace3c460010df3a18 (patch) (side-by-side diff) | |
tree | 1ba059e62ac669f5dd82317ce43ff61b0ed381d5 | |
parent | 43c7ee98c326979a9d78783dd574bcde3fa06e52 (diff) | |
download | kdepimpi-94636524739ecaa2206ca2cace3c460010df3a18.zip kdepimpi-94636524739ecaa2206ca2cace3c460010df3a18.tar.gz kdepimpi-94636524739ecaa2206ca2cace3c460010df3a18.tar.bz2 |
added env variable SHARPDTMSDK
-rw-r--r-- | Makefile.Embedded | 52 | ||||
-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, 39 insertions, 23 deletions
diff --git a/Makefile.Embedded b/Makefile.Embedded index 71035d6..7777a19 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded @@ -2,4 +2,5 @@ DISTPATH = $(shell pwd) DISTDIR = $(shell basename $(DISTPATH)) + ifeq ($(PLATFORM) , zaurus) BUILD_NO_LDAP_PLUGIN=1 @@ -10,6 +11,5 @@ ifneq ($(PLATFORM) , zaurus) endif - -SUBDIRS_MAIN = \ +SUBDIRS_MICROKDE = \ libical/src/libical \ libical/src/libicalss \ @@ -49,5 +49,14 @@ SUBDIRS_MICROMAIL = \ 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 \ @@ -57,15 +66,15 @@ all: build_main \ -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. @@ -76,5 +85,5 @@ build_opie_plugin: build_main endif -build_sharp_plugin: build_main +build_sharp_plugin: build_microkde ifdef BUILD_NO_SHARP_PLUGIN @echo ---> ldap plugin not build. @@ -85,5 +94,5 @@ build_sharp_plugin: build_main endif -build_ldap_plugin: build_main +build_ldap_plugin: build_microkde ifdef BUILD_NO_LDAP_PLUGIN @echo ---> ldap plugin not build. @@ -95,5 +104,5 @@ build_ldap_plugin: build_main -build_micromail: build_main +build_micromail: build_microkde ifdef BUILD_NO_MICROMAIL @echo ---> micromail not build. @@ -105,7 +114,7 @@ build_micromail: build_main -variable_info: variable_test +variable_info: @echo -------------------------------------- - @echo KDEPIM buildsystem, variablecheck... + @echo KDEPIM buildsystem, variableinfo... @echo QTDIR=$(QTDIR) @echo QPEDIR=$(QPEDIR) @@ -113,11 +122,15 @@ variable_info: variable_test @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) @@ -126,11 +139,16 @@ variable_test: @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_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 - ifdef BUILD_NO_MICROMAIL - @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) endif - + @echo -------------------------------------- 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,4 +1,4 @@ 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) @@ -14,5 +14,5 @@ LIBS += -lmicrokde LIBS += -lmicrokabc LIBS += -L$(QPEDIR)/lib -LIBS += -lqpepim +#LIBS += -lqpepim LIBS += -lqpe LIBS += -lzdtm 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,8 +1,7 @@ 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 @@ -17,5 +16,4 @@ LIBS += -lqte LIBS += -lzdtm LIBS += -lmicrokabc_sharpdtmconverter -#LIBS += -L../../lib/$(PLATFORM) 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 @@ -9,5 +9,5 @@ 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 |