summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile.Embedded52
-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, 39 insertions, 23 deletions
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 71035d6..7777a19 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,6 +1,7 @@
1DISTPATH = $(shell pwd) 1DISTPATH = $(shell pwd)
2DISTDIR = $(shell basename $(DISTPATH)) 2DISTDIR = $(shell basename $(DISTPATH))
3 3
4
4ifeq ($(PLATFORM) , zaurus) 5ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 6 BUILD_NO_LDAP_PLUGIN=1
6endif 7endif
@@ -9,8 +10,7 @@ ifneq ($(PLATFORM) , zaurus)
9 BUILD_NO_SHARP_PLUGIN=1 10 BUILD_NO_SHARP_PLUGIN=1
10endif 11endif
11 12
12 13SUBDIRS_MICROKDE = \
13SUBDIRS_MAIN = \
14 libical/src/libical \ 14 libical/src/libical \
15 libical/src/libicalss \ 15 libical/src/libicalss \
16 qtcompat \ 16 qtcompat \
@@ -48,7 +48,16 @@ SUBDIRS_MICROMAIL = \
48 kmicromail/libmailwrapper \ 48 kmicromail/libmailwrapper \
49 kmicromail 49 kmicromail
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 \
53 build_opie_plugin \ 62 build_opie_plugin \
54 build_sharp_plugin \ 63 build_sharp_plugin \
@@ -56,17 +65,17 @@ all: build_main \
56 build_micromail 65 build_micromail
57 66
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; \
62 done 71 done
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; \
66 make -f Makefile$(PLATFORM) || exit 1; popd; \ 75 make -f Makefile$(PLATFORM) || exit 1; popd; \
67 done 76 done
68 77
69build_opie_plugin: build_main 78build_opie_plugin: build_microkde
70 ifdef BUILD_NO_OPIE_PLUGIN 79 ifdef BUILD_NO_OPIE_PLUGIN
71 @echo ---> opie plugin not build. 80 @echo ---> opie plugin not build.
72 else 81 else
@@ -75,7 +84,7 @@ build_opie_plugin: build_main
75 done 84 done
76 endif 85 endif
77 86
78build_sharp_plugin: build_main 87build_sharp_plugin: build_microkde
79 ifdef BUILD_NO_SHARP_PLUGIN 88 ifdef BUILD_NO_SHARP_PLUGIN
80 @echo ---> ldap plugin not build. 89 @echo ---> ldap plugin not build.
81 else 90 else
@@ -84,7 +93,7 @@ build_sharp_plugin: build_main
84 done 93 done
85 endif 94 endif
86 95
87build_ldap_plugin: build_main 96build_ldap_plugin: build_microkde
88 ifdef BUILD_NO_LDAP_PLUGIN 97 ifdef BUILD_NO_LDAP_PLUGIN
89 @echo ---> ldap plugin not build. 98 @echo ---> ldap plugin not build.
90 else 99 else
@@ -94,7 +103,7 @@ build_ldap_plugin: build_main
94 endif 103 endif
95 104
96 105
97build_micromail: build_main 106build_micromail: build_microkde
98 ifdef BUILD_NO_MICROMAIL 107 ifdef BUILD_NO_MICROMAIL
99 @echo ---> micromail not build. 108 @echo ---> micromail not build.
100 else 109 else
@@ -104,34 +113,43 @@ build_micromail: build_main
104 endif 113 endif
105 114
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)
111 @echo QPEDIR=$(QPEDIR) 120 @echo QPEDIR=$(QPEDIR)
112 @echo OPIEDIR=$(OPIEDIR) 121 @echo OPIEDIR=$(OPIEDIR)
113 @echo PLATFORM=$(PLATFORM) 122 @echo PLATFORM=$(PLATFORM)
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)
116 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 126 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
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
123 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 136 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
124 endif 137 endif
125 ifdef BUILD_NO_OPIE_PLUGIN 138 ifdef BUILD_NO_OPIE_PLUGIN
126 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 139 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
127 endif 140 endif
141 ifdef BUILD_NO_MICROMAIL
142 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
143 endif
128 ifdef BUILD_NO_SHARP_PLUGIN 144 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) 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)
130 endif 150 endif
131 ifdef BUILD_NO_MICROMAIL
132 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
133 endif 151 endif
134 152 @echo --------------------------------------
135 153
136 154
137objects: 155objects:
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,5 +1,5 @@
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
4OBJECTS_DIR = obj/$(PLATFORM) 4OBJECTS_DIR = obj/$(PLATFORM)
5MOC_DIR = moc/$(PLATFORM) 5MOC_DIR = moc/$(PLATFORM)
@@ -13,7 +13,7 @@ DESTDIR=$(QPEDIR)/lib
13LIBS += -lmicrokde 13LIBS += -lmicrokde
14LIBS += -lmicrokabc 14LIBS += -lmicrokabc
15LIBS += -L$(QPEDIR)/lib 15LIBS += -L$(QPEDIR)/lib
16LIBS += -lqpepim 16#LIBS += -lqpepim
17LIBS += -lqpe 17LIBS += -lqpe
18LIBS += -lzdtm 18LIBS += -lzdtm
19 19
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,9 +1,8 @@
1 TEMPLATE= lib 1 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
8 7
9OBJECTS_DIR = obj/$(PLATFORM) 8OBJECTS_DIR = obj/$(PLATFORM)
@@ -16,7 +15,6 @@ LIBS += -lqpe
16LIBS += -lqte 15LIBS += -lqte
17LIBS += -lzdtm 16LIBS += -lzdtm
18LIBS += -lmicrokabc_sharpdtmconverter 17LIBS += -lmicrokabc_sharpdtmconverter
19#LIBS += -L../../lib/$(PLATFORM)
20 18
21 19
22INTERFACES = \ 20INTERFACES = \
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
@@ -8,7 +8,7 @@ DESTDIR = $(QPEDIR)/lib
8 8
9DEFINES += KAB_EMBEDDED 9DEFINES += 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
13LIBS += -lmicrokde 13LIBS += -lmicrokde
14LIBS += -lmicrokabc 14LIBS += -lmicrokabc