summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorCyril Jourdan2012-07-03 11:01:42 +0200
committerCyril Jourdan2012-09-20 10:25:49 +0200
commit5e0a6782d207bea6c0825ccd82f893a8449c898e (patch)
tree842288d075e2872a1c001248db5db1ccd24af0ea /common
parentf877df633f3896ad682f81057f7fe6f9e1395032 (diff)
common/tools/genNVRAM: correct genNVRAM compilation from bundle, closes #3200
At the same time, add management of the dependency file to have the same Makefile in master and eoc.
Diffstat (limited to 'common')
-rw-r--r--common/tools/genNVRAM/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/common/tools/genNVRAM/Makefile b/common/tools/genNVRAM/Makefile
index 8053cf06be..638e1cba3c 100644
--- a/common/tools/genNVRAM/Makefile
+++ b/common/tools/genNVRAM/Makefile
@@ -16,9 +16,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
-TOP_DIR=../../..
-CLEO_DIR=$(TOP_DIR)/cleopatre
-CFLAGS= -I$(CLEO_DIR)/include -DCONFIG_CHIP_FEATURE_EXTRA_NVRAM_FIELDS
+BUNDLE_DIR=n
+ifeq ($(BUNDLE_DIR),y)
+INCLUDE_DIR=../../include
+else
+INCLUDE_DIR=../../../cleopatre/include
+endif
+CFLAGS= -I$(INCLUDE_DIR) -DCONFIG_CHIP_FEATURE_EXTRA_NVRAM_FIELDS -MMD
all: genNVRAM
@@ -26,4 +30,4 @@ genNVRAM: genNVRAM.c
$(CC) $(CFLAGS) -o $@ $<
clean:
- @rm *.o *~ genNVRAM -f
+ @rm *.o *.d *~ genNVRAM -f