summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-12 09:23:35 (UTC)
committer zautrix <zautrix>2004-09-12 09:23:35 (UTC)
commit8d822fd4d97fbb38ab2c4f3f3f64f175ef143cff (patch) (unidiff)
tree4ebe4f2edc51d45374efe04f2524e0f7a9990484
parent2848d8373ab0785cd21c4588d8fe7ad21ad6f291 (diff)
downloadkdepimpi-8d822fd4d97fbb38ab2c4f3f3f64f175ef143cff.zip
kdepimpi-8d822fd4d97fbb38ab2c4f3f3f64f175ef143cff.tar.gz
kdepimpi-8d822fd4d97fbb38ab2c4f3f3f64f175ef143cff.tar.bz2
Fixed the makefile
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile10
-rw-r--r--Makefile.Embedded10
2 files changed, 8 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 77def29..01439bd 100644
--- a/Makefile
+++ b/Makefile
@@ -160,12 +160,12 @@ variable_test: variable_info
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
@@ -182,18 +182,16 @@ clean:
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 ifdef KDEPIM_VERSION 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
192 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 192 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
193 else 193
194 @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
195 endif
196dist: 194dist:
197 @echo Dont forget to do "make install" before "make dist" 195 @echo Dont forget to do "make install" before "make dist"
198 rm -f *arm.ipk 196 rm -f *arm.ipk
199 rm -f *~ 197 rm -f *~
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 77def29..01439bd 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -160,12 +160,12 @@ variable_test: variable_info
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
@@ -182,18 +182,16 @@ clean:
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 ifdef KDEPIM_VERSION 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
192 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 192 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
193 else 193
194 @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
195 endif
196dist: 194dist:
197 @echo Dont forget to do "make install" before "make dist" 195 @echo Dont forget to do "make install" before "make dist"
198 rm -f *arm.ipk 196 rm -f *arm.ipk
199 rm -f *~ 197 rm -f *~