From e5f672430e0848c596c784dcc9d97c97ea36be79 Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran Date: Mon, 8 May 2017 16:15:45 +1000 Subject: pore: Always use libpore In the days of yore libpore was closed source and people wanted the option to not use it. That's no longer the case so lets ditch all the #ifdef crap. Signed-off-by: Oliver O'Halloran Signed-off-by: Stewart Smith --- Makefile.main | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Makefile.main') diff --git a/Makefile.main b/Makefile.main index 5494131..65eacb1 100644 --- a/Makefile.main +++ b/Makefile.main @@ -53,9 +53,7 @@ DBG=-g CPPFLAGS := -I$(SRC)/include -Iinclude -MMD -include $(SRC)/include/config.h CPPFLAGS += -I$(SRC)/libfdt -I$(SRC)/libflash -I$(SRC)/libc/include -I$(SRC) -ifeq ($(PORE),1) -CPPFLAGS += -I$(SRC)/libpore -D__HAVE_LIBPORE__ -endif +CPPFLAGS += -I$(SRC)/libpore CPPFLAGS += -D__SKIBOOT__ -nostdinc CPPFLAGS += -isystem $(shell $(CC) -print-file-name=include) CPPFLAGS += -DBITS_PER_LONG=64 -DHAVE_BIG_ENDIAN @@ -193,10 +191,7 @@ all: $(SUBDIRS) $(TARGET).lid $(TARGET).lid.xz $(TARGET).map extract-gcov all: $(TARGET).lid.stb $(TARGET).lid.xz.stb OBJS := $(ASM) $(CORE) $(HW) $(PLATFORMS) $(LIBFDT) $(LIBFLASH) $(LIBSTB) -ifeq ($(PORE),1) -OBJS += $(LIBPORE) -endif -OBJS += $(LIBC) $(CCAN) $(DEVSRC_OBJ) +OBJS += $(LIBC) $(CCAN) $(DEVSRC_OBJ) $(LIBPORE) OBJS_NO_VER = $(OBJS) ALL_OBJS = $(OBJS) version.o -- cgit v1.1