summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-12 09:23:35 (UTC)
committer zautrix <zautrix>2004-09-12 09:23:35 (UTC)
commit8d822fd4d97fbb38ab2c4f3f3f64f175ef143cff (patch) (side-by-side diff)
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
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
+ ifndef SHARPDTMSDK
@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
$(error SHARPDTMSDK is not defined)
- endif
+ endif
endif
ifdef BUILD_NO_GAMMU
@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
endif
@@ -182,18 +182,16 @@ clean:
for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
done
install:
- ifdef KDEPIM_VERSION
+
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
cp db2file/db2file $(QPEDIR)/bin/db2file
cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
- else
- @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
- endif
+
dist:
@echo Dont forget to do "make install" before "make dist"
rm -f *arm.ipk
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
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
+ ifndef SHARPDTMSDK
@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
$(error SHARPDTMSDK is not defined)
- endif
+ endif
endif
ifdef BUILD_NO_GAMMU
@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
endif
@@ -182,18 +182,16 @@ clean:
for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
done
install:
- ifdef KDEPIM_VERSION
+
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
cp db2file/db2file $(QPEDIR)/bin/db2file
cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
- else
- @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
- endif
+
dist:
@echo Dont forget to do "make install" before "make dist"
rm -f *arm.ipk
rm -f *~