PDCurses: Don't hard code version number

Don't hard code the PDCurses version number in every file
added to the object list.

Change-Id: Ic2e9230b7e3089c60dd7f442e3ea7baffb4aa400
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/12397
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

1 files changed, 44 insertions, 43 deletions

diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.inc
index 290abc4b3737..f7aa51665f9a 100644
--- a/payloads/libpayload/curses/Makefile.inc
+++ b/payloads/libpayload/curses/Makefile.inc
@@ -38,7 +38,8 @@ libcurses-$(CONFIG_LP_TINYCURSES) += colors.c
 includes-$(CONFIG_LP_TINYCURSES) += curses.h
 
 ifeq ($(CONFIG_LP_PDCURSES),y)
-INCLUDES += -D_LP64=0 -Icurses/PDCurses-3.4 -Icurses/pdcurses-backend -Icurses/menu -Icurses/form
+PDCURSES := PDCurses-3.4
+INCLUDES += -D_LP64=0 -Icurses/$(PDCURSES) -Icurses/pdcurses-backend -Icurses/menu -Icurses/form
 endif
 
 libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcdisp.c
@@ -47,56 +48,56 @@ libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdckbd.c
 libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcscrn.c
 libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcsetsc.c
 libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcutil.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/addch.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/move.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/overlay.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/refresh.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/terminfo.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/window.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/util.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/inopts.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/addstr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/keyname.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/instr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/clear.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/addchstr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/kernel.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/pad.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/insstr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/border.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/getyx.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/getstr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/getch.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/termattr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/outopts.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/color.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/deleteln.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/initscr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/slk.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/delch.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/touch.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/mouse.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/scanw.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/scroll.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/printw.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/bkgd.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/inch.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/attr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/insch.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/inchstr.c
-libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/beep.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/addch.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/move.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/overlay.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/refresh.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/terminfo.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/window.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/util.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/inopts.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/addstr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/keyname.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/instr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/clear.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/addchstr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/kernel.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/pad.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/insstr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/border.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/getyx.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/getstr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/getch.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/termattr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/outopts.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/color.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/deleteln.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/initscr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/slk.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/delch.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/touch.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/mouse.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/scanw.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/scroll.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/printw.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/bkgd.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/inch.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/attr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/insch.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/inchstr.c
+libcurses-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/beep.c
 
 includes-$(CONFIG_LP_PDCURSES) += pdcurses-backend/nc_alloc.h
 includes-$(CONFIG_LP_PDCURSES) += pdcurses-backend/ncurses_cfg.h
-includes-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/curses.h
-includes-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/term.h
-includes-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/panel.h
+includes-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/curses.h
+includes-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/term.h
+includes-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/panel.h
 includes-$(CONFIG_LP_PDCURSES) += menu/eti.h
 includes-$(CONFIG_LP_PDCURSES) += menu/menu.h
 includes-$(CONFIG_LP_PDCURSES) += menu/mf_common.h
 includes-$(CONFIG_LP_PDCURSES) += form/form.h
 
-libpanel-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/panel.c
+libpanel-$(CONFIG_LP_PDCURSES) += $(PDCURSES)/pdcurses/panel.c
 
 libmenu-$(CONFIG_LP_PDCURSES) += menu/m_req_name.c
 libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_nam.c