From 03062ea30b5fa5bcfb9ab9471ca85e4fadb83592 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Wed, 22 Jul 2015 14:35:35 +0200
Subject: [PATCH] ppsi: pick new master and act accordingly
"act accordingly" means pre-including ppsi/...autoconf.h within
CFLAGS, or we miss CONFIG_MAX_VLANS_PER_PORT, used in defining the
ppsi local data structure.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 1a40df7..a3f80bd 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ SIZE = $(CROSS_COMPILE)size
AUTOCONF = $(CURDIR)/include/generated/autoconf.h
PPSI = ppsi
+PPSI_CONFIG = ppsi/include/generated/autoconf.h
# we miss CONFIG_ARCH_LM32 as we have no other archs by now
obj-y = arch/lm32/crt0.o arch/lm32/irq.o
@@ -153,7 +154,8 @@ clean:
$(MAKE) -C tools clean
%.o: %.c
- ${CC} $(CFLAGS) $(PTPD_CFLAGS) $(INCLUDE_DIR) $(LIB_DIR) -c $*.c -o $@
+ ${CC} $(CFLAGS) $(PTPD_CFLAGS) $(INCLUDE_DIR) $(LIB_DIR) \
+ -include $(PPSI_CONFIG) -c $*.c -o $@
tools:
$(MAKE) -C tools
@@ -186,4 +188,4 @@ defconfig:
.depend: $(wildcard *.c [^pt]/*.c)
$(CC) $(CFLAGS) -DSDBFS_BIG_ENDIAN -MM $^ > $@
--include .depend
\ No newline at end of file
+-include .depend
--
GitLab