summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-07-19 22:24:30 (UTC)
committer ulf69 <ulf69>2004-07-19 22:24:30 (UTC)
commit94636524739ecaa2206ca2cace3c460010df3a18 (patch) (unidiff)
tree1ba059e62ac669f5dd82317ce43ff61b0ed381d5
parent43c7ee98c326979a9d78783dd574bcde3fa06e52 (diff)
downloadkdepimpi-94636524739ecaa2206ca2cace3c460010df3a18.zip
kdepimpi-94636524739ecaa2206ca2cace3c460010df3a18.tar.gz
kdepimpi-94636524739ecaa2206ca2cace3c460010df3a18.tar.bz2
added env variable SHARPDTMSDK
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.Embedded54
-rw-r--r--kabc/converter/sharpdtm/sharpdtmE.pro4
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmE.pro4
-rw-r--r--kaddressbook/xxport/sharpdtm/sharpdtmE.pro2
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
@@ -3,2 +3,3 @@ DISTDIR = $(shell basename $(DISTPATH))
3 3
4
4ifeq ($(PLATFORM) , zaurus) 5ifeq ($(PLATFORM) , zaurus)
@@ -11,4 +12,3 @@ endif
11 12
12 13SUBDIRS_MICROKDE = \
13SUBDIRS_MAIN = \
14 libical/src/libical \ 14 libical/src/libical \
@@ -50,3 +50,12 @@ SUBDIRS_MICROMAIL = \
50 50
51all: build_main \ 51SUBDIRS = \
52 $(SUBDIRS_MICROKDE) \
53 $(SUBDIRS_QTOPIA_PLUGIN) \
54 $(SUBDIRS_OPIE_PLUGIN) \
55 $(SUBDIRS_SHARP_PLUGIN) \
56 $(SUBDIRS_LDAP_PLUGIN) \
57 $(SUBDIRS_MICROMAIL)
58
59
60all: build_microkde \
52 build_qtopia_plugin \ 61 build_qtopia_plugin \
@@ -58,4 +67,4 @@ all: build_main \
58 67
59build_main: variable_info tmake 68build_microkde: variable_test tmake
60 for i in $(SUBDIRS_MAIN); do pushd $$i; \ 69 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
61 make -f Makefile$(PLATFORM) || exit 1; popd; \ 70 make -f Makefile$(PLATFORM) || exit 1; popd; \
@@ -63,3 +72,3 @@ build_main: variable_info tmake
63 72
64build_qtopia_plugin: build_main 73build_qtopia_plugin: build_microkde
65 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 74 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
@@ -68,3 +77,3 @@ build_qtopia_plugin: build_main
68 77
69build_opie_plugin: build_main 78build_opie_plugin: build_microkde
70 ifdef BUILD_NO_OPIE_PLUGIN 79 ifdef BUILD_NO_OPIE_PLUGIN
@@ -77,3 +86,3 @@ build_opie_plugin: build_main
77 86
78build_sharp_plugin: build_main 87build_sharp_plugin: build_microkde
79 ifdef BUILD_NO_SHARP_PLUGIN 88 ifdef BUILD_NO_SHARP_PLUGIN
@@ -86,3 +95,3 @@ build_sharp_plugin: build_main
86 95
87build_ldap_plugin: build_main 96build_ldap_plugin: build_microkde
88 ifdef BUILD_NO_LDAP_PLUGIN 97 ifdef BUILD_NO_LDAP_PLUGIN
@@ -96,3 +105,3 @@ build_ldap_plugin: build_main
96 105
97build_micromail: build_main 106build_micromail: build_microkde
98 ifdef BUILD_NO_MICROMAIL 107 ifdef BUILD_NO_MICROMAIL
@@ -106,5 +115,5 @@ build_micromail: build_main
106 115
107variable_info: variable_test 116variable_info:
108 @echo -------------------------------------- 117 @echo --------------------------------------
109 @echo KDEPIM buildsystem, variablecheck... 118 @echo KDEPIM buildsystem, variableinfo...
110 @echo QTDIR=$(QTDIR) 119 @echo QTDIR=$(QTDIR)
@@ -114,2 +123,3 @@ variable_info: variable_test
114 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 123 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
124 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
115 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 125 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
@@ -117,6 +127,9 @@ variable_info: variable_test
117 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 127 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
118 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 128 ifndef BUILD_NO_SHARP_PLUGIN
129 @echo SHARPDTMSDK=$(SHARPDTMSDK)
130 endif
119 @echo -------------------------------------- 131 @echo --------------------------------------
120 132
121variable_test: 133variable_test: variable_info
134 @echo KDEPIM buildsystem, variablecheck...
122 ifdef BUILD_NO_LDAP_PLUGIN 135 ifdef BUILD_NO_LDAP_PLUGIN
@@ -127,5 +140,2 @@ variable_test:
127 endif 140 endif
128 ifdef BUILD_NO_SHARP_PLUGIN
129 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
130 endif
131 ifdef BUILD_NO_MICROMAIL 141 ifdef BUILD_NO_MICROMAIL
@@ -133,3 +143,11 @@ variable_test:
133 endif 143 endif
134 144 ifdef BUILD_NO_SHARP_PLUGIN
145 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
146 else
147 ifndef SHARPDTMSDK
148 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
149 $(error SHARPDTMSDK is not defined)
150 endif
151 endif
152 @echo --------------------------------------
135 153
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,3 +1,3 @@
1TEMPLATE = lib 1TEMPLATE = lib
2INCLUDEPATH += . ../.. ../../../external/sharpdtm/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include 2INCLUDEPATH += . ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include
3#CONFIG += staticlib 3#CONFIG += staticlib
@@ -15,3 +15,3 @@ LIBS += -lmicrokabc
15LIBS += -L$(QPEDIR)/lib 15LIBS += -L$(QPEDIR)/lib
16LIBS += -lqpepim 16#LIBS += -lqpepim
17LIBS += -lqpe 17LIBS += -lqpe
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
@@ -2,6 +2,5 @@ TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3#release debug
4TARGET = microkabc_sharpdtm 3TARGET = microkabc_sharpdtm
5 4
6INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 5INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
7 6
@@ -18,3 +17,2 @@ LIBS += -lzdtm
18LIBS += -lmicrokabc_sharpdtmconverter 17LIBS += -lmicrokabc_sharpdtmconverter
19#LIBS += -L../../lib/$(PLATFORM)
20 18
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
@@ -10,3 +10,3 @@ DEFINES += KAB_EMBEDDED
10 10
11INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../.. ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include 11INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../.. ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
12LIBS += -L$(QPEDIR)/lib 12LIBS += -L$(QPEDIR)/lib