summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--Makefile.Embedded4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 01439bd..de9d5ce 100644
--- a/Makefile
+++ b/Makefile
@@ -140,52 +140,52 @@ variable_info:
140 @echo -------------------------------------- 140 @echo --------------------------------------
141 141
142variable_test: variable_info 142variable_test: variable_info
143 @echo KDEPIM buildsystem, variablecheck... 143 @echo KDEPIM buildsystem, variablecheck...
144 ifndef KDEPIMDIR 144 ifndef KDEPIMDIR
145 @echo KDEPIMDIR is not defined. 145 @echo KDEPIMDIR is not defined.
146 $(error KDEPIMDIR is not defined) 146 $(error KDEPIMDIR is not defined)
147 endif 147 endif
148 ifndef PLATFORM 148 ifndef PLATFORM
149 @echo PLATFORM is not defined. 149 @echo PLATFORM is not defined.
150 $(error PLATFORM is not defined) 150 $(error PLATFORM is not defined)
151 endif 151 endif
152 ifdef BUILD_NO_LDAP_PLUGIN 152 ifdef BUILD_NO_LDAP_PLUGIN
153 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 153 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
154 endif 154 endif
155 ifdef BUILD_NO_OPIE_PLUGIN 155 ifdef BUILD_NO_OPIE_PLUGIN
156 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 156 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
157 endif 157 endif
158 ifdef BUILD_NO_MICROMAIL 158 ifdef BUILD_NO_MICROMAIL
159 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 159 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
160 endif 160 endif
161 ifdef BUILD_NO_SHARP_PLUGIN 161 ifdef BUILD_NO_SHARP_PLUGIN
162 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 162 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
163 else 163 else
164 ifndef SHARPDTMSDK 164 ifndef SHARPDTMSDK
165 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 165 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
166 $(error SHARPDTMSDK is not defined) 166 $(error SHARPDTMSDK is not defined)
167 endif 167 endif
168 endif 168 endif
169 ifdef BUILD_NO_GAMMU 169 ifdef BUILD_NO_GAMMU
170 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) 170 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
171 endif 171 endif
172 @echo -------------------------------------- 172 @echo --------------------------------------
173 173
174 174
175objects: 175objects:
176 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 176 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
177 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 177 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
178 mkdir -p libical/lib/$(PLATFORM) 178 mkdir -p libical/lib/$(PLATFORM)
179 179
180clean: 180clean:
181 rm -rf libical/lib/$(PLATFORM)/*; 181 rm -rf libical/lib/$(PLATFORM)/*;
182 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 182 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
183 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 183 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
184 done 184 done
185install: 185install:
186 186
187 cd bin/kdepim; make install 187 cd bin/kdepim; make install
188 cp -r Pim $(QPEDIR)/apps 188 cp -r Pim $(QPEDIR)/apps
189 cp db2file/db2file $(QPEDIR)/bin/db2file 189 cp db2file/db2file $(QPEDIR)/bin/db2file
190 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 190 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
191 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 191 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 01439bd..de9d5ce 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -140,52 +140,52 @@ variable_info:
140 @echo -------------------------------------- 140 @echo --------------------------------------
141 141
142variable_test: variable_info 142variable_test: variable_info
143 @echo KDEPIM buildsystem, variablecheck... 143 @echo KDEPIM buildsystem, variablecheck...
144 ifndef KDEPIMDIR 144 ifndef KDEPIMDIR
145 @echo KDEPIMDIR is not defined. 145 @echo KDEPIMDIR is not defined.
146 $(error KDEPIMDIR is not defined) 146 $(error KDEPIMDIR is not defined)
147 endif 147 endif
148 ifndef PLATFORM 148 ifndef PLATFORM
149 @echo PLATFORM is not defined. 149 @echo PLATFORM is not defined.
150 $(error PLATFORM is not defined) 150 $(error PLATFORM is not defined)
151 endif 151 endif
152 ifdef BUILD_NO_LDAP_PLUGIN 152 ifdef BUILD_NO_LDAP_PLUGIN
153 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 153 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
154 endif 154 endif
155 ifdef BUILD_NO_OPIE_PLUGIN 155 ifdef BUILD_NO_OPIE_PLUGIN
156 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 156 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
157 endif 157 endif
158 ifdef BUILD_NO_MICROMAIL 158 ifdef BUILD_NO_MICROMAIL
159 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 159 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
160 endif 160 endif
161 ifdef BUILD_NO_SHARP_PLUGIN 161 ifdef BUILD_NO_SHARP_PLUGIN
162 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 162 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
163 else 163 else
164 ifndef SHARPDTMSDK 164 ifndef SHARPDTMSDK
165 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 165 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
166 $(error SHARPDTMSDK is not defined) 166 $(error SHARPDTMSDK is not defined)
167 endif 167 endif
168 endif 168 endif
169 ifdef BUILD_NO_GAMMU 169 ifdef BUILD_NO_GAMMU
170 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) 170 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
171 endif 171 endif
172 @echo -------------------------------------- 172 @echo --------------------------------------
173 173
174 174
175objects: 175objects:
176 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 176 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
177 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 177 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
178 mkdir -p libical/lib/$(PLATFORM) 178 mkdir -p libical/lib/$(PLATFORM)
179 179
180clean: 180clean:
181 rm -rf libical/lib/$(PLATFORM)/*; 181 rm -rf libical/lib/$(PLATFORM)/*;
182 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 182 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
183 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 183 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
184 done 184 done
185install: 185install:
186 186
187 cd bin/kdepim; make install 187 cd bin/kdepim; make install
188 cp -r Pim $(QPEDIR)/apps 188 cp -r Pim $(QPEDIR)/apps
189 cp db2file/db2file $(QPEDIR)/bin/db2file 189 cp db2file/db2file $(QPEDIR)/bin/db2file
190 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 190 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
191 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 191 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop