summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorOlivier Dufour2012-11-22 10:35:15 +0100
committerOlivier Dufour2012-11-29 11:41:55 +0100
commitcc1738fc906794cc1618245a62018752f28d9b21 (patch)
tree16a8e6aed7c8b1d4b7ef3a6948459a0cdb20cad5 /cleopatre
parent64840b9e24eefae37f2aa2b6059285f40365bfa5 (diff)
cleo/Makefile: fix libmme compilation error in bundle, closes #3475
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/Makefile3
-rw-r--r--cleopatre/application/libmme/Makefile10
2 files changed, 8 insertions, 5 deletions
diff --git a/cleopatre/Makefile b/cleopatre/Makefile
index 7a73f4fe7f..8c0ddfc1d3 100644
--- a/cleopatre/Makefile
+++ b/cleopatre/Makefile
@@ -164,7 +164,8 @@ prepare-includes:
$(Q)$(MAKE) -C $(UBOOT_PATH) cpincludes
$(Q)rm -f $(UBOOT_PATH)/cpincludes.mk
$(Q)rm -f $(UBOOT_PATH)/include/asm-arm/arch-spc300/.gitignore
- $(Q)cp $(GIT_BASE)/common/include/ethernet.h $(BUNDLE_PATH)/include/
+ $(Q)rm -f $(BUNDLE_PATH)/include/ethernet.h $(BUNDLE_PATH)/include/spid_img_desc.h
+ $(Q)cp -f $(GIT_BASE)/common/include/ethernet.h $(BUNDLE_PATH)/include/
$(Q)cp $(GIT_BASE)/common/include/spid_img_desc.h \
$(BUNDLE_PATH)/include/
diff --git a/cleopatre/application/libmme/Makefile b/cleopatre/application/libmme/Makefile
index 1fb8aa613d..d45266d0a6 100644
--- a/cleopatre/application/libmme/Makefile
+++ b/cleopatre/application/libmme/Makefile
@@ -53,12 +53,14 @@ $(OBJPATH):
-include $(STAT_DEPS) $(DYN_DEPS) $(MMTCGEN)/Makefile
-.PHONY: all clean
+.PHONY: all clean distclean
-clean:
- rm -f $(DYN_OBJS) $(STAT_OBJS) $(STAT_DEPS) $(DYN_DEPS) $(DYN_LIB) \
- $(STAT_LIB)
+distclean: clean
if [ -e $(MMTCGEN) ]; then \
rm -f $(MMTYPES); \
fi;
+
+clean:
+ rm -f $(DYN_OBJS) $(STAT_OBJS) $(STAT_DEPS) $(DYN_DEPS) $(DYN_LIB) \
+ $(STAT_LIB)
rmdir $(OBJPATH)