From 3b77b723ca209199c8a224702812441e2196d452 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 7 Jul 2011 15:41:53 +0200 Subject: libpayload: Add PDCurses and ncurses' libform/libmenu PDCurses provides an alternative implementation of the curses library standard in addition to tinycurses. Where tinycurses is really tiny, PDCurses is more complete and provides virtually unlimited windows and the full API. The PDCurses code is brought in "vanilla", with all local changes residing in curses/pdcurses-backend/ In addition to a curses library, this change also provides libpanel (as part of the PDCurses code), and libform and libmenu which were derived from ncurses-5.9. As they rely on ncurses internals (and PDCurses is not ncurses), more changes were required for these libraries to work. The build system is extended to install the right set of header files depending on the selected curses implementation. Change-Id: I9e5b920f94b6510da01da2f656196a993170d1c5 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/106 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones --- payloads/libpayload/Makefile.inc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'payloads/libpayload/Makefile.inc') diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 03862ca878..5a7d142b1b 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -39,7 +39,8 @@ real-target: lib classes-$(CONFIG_PCI) += libpci classes-$(CONFIG_LIBC) += libc -classes-$(CONFIG_TINYCURSES) += libcurses +classes-$(CONFIG_CURSES) += libcurses +classes-$(CONFIG_PDCURSES) += libmenu libform libpanel libraries := $(classes-y) classes-y += head.o @@ -50,7 +51,7 @@ head.o-S-deps = $(obj)/libpayload-config.h subdirs-y := arch/$(ARCHDIR-y) subdirs-y += crypto libc drivers libpci -subdirs-$(CONFIG_TINYCURSES) += curses +subdirs-$(CONFIG_CURSES) += curses INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) CFLAGS = $(INCLUDES) -O2 -pipe -g @@ -64,6 +65,15 @@ $(obj)/libpayload-config.h: $(KCONFIG_AUTOHEADER) library-targets = $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a lib: $$(library-targets) $(obj)/head.o +extract_nth=$(word $(1), $(subst |, ,$(2))) + +####################################################################### +# Add handler for special include files +$(call add-special-class,includes) +includes-handler= \ + $(if $(wildcard $(1)$(call extract_nth,1,$(2))), \ + $(eval includes += $(1)$(2))) + $(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs)) printf " AR $(subst $(shell pwd)/,,$(@))\n" $(AR) rc $@ $^ @@ -92,6 +102,9 @@ install: real-target install -m 644 $$file $(DESTDIR)/libpayload/$$file; \ done install -m 644 $(obj)/libpayload-config.h $(DESTDIR)/libpayload/include + $(foreach item,$(includes), \ + install -m 755 -d $(DESTDIR)/libpayload/include/$(call extract_nth,2,$(item)); \ + install -m 644 $(call extract_nth,1,$(item)) $(DESTDIR)/libpayload/include/$(call extract_nth,2,$(item)); ) printf " INSTALL $(DESTDIR)/libpayload/bin\n" install -m 755 -d $(DESTDIR)/libpayload/bin install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin -- cgit v1.2.3