discover/grub2: Allow EOF as a statement terminator

[petitboot] / ui / ncurses / Makefile.am

diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am
index ec8217f6e3328468afca24226ae390022f9f5f01..64b6eb1fd9215d2efeac97ffe458080cd9791f7b 100644 (file)
--- a/ui/ncurses/Makefile.am
+++ b/ui/ncurses/Makefile.am
@@ -15,44 +15,42 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
-       -I$(includedir) \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CFLAGS)
 
-AM_LDFLAGS = -lmenu -lform -lncurses
-
 common_libs = \
        libpbnc.la \
        $(top_builddir)/ui/common/libpbui.la \
-       $(top_builddir)/lib/libpbcore.la
+       $(top_builddir)/lib/libpbcore.la \
+       @MENU_LIB@ @FORM_LIB@ @CURSES_LIB@
 
 noinst_LTLIBRARIES = libpbnc.la
 
 libpbnc_la_SOURCES = \
        nc-cui.c \
        nc-cui.h \
-       nc-ked.c \
-       nc-ked.h \
+       nc-boot-editor.c \
+       nc-boot-editor.h \
        nc-menu.c \
        nc-menu.h \
        nc-scr.c \
        nc-scr.h
 
-sbin_PROGRAMS = pb-nc
+sbin_PROGRAMS = petitboot-nc
 
 if ENABLE_PS3
-sbin_PROGRAMS += pb-nc-ps3
+sbin_PROGRAMS += petitboot-ps3-nc
 endif
 
 
-pb_nc_SOURCES = generic-main.c
-pb_nc_LDADD = $(common_libs)
+petitboot_nc_SOURCES = generic-main.c
+petitboot_nc_LDADD = $(common_libs)
 
-pb_nc_ps3_SOURCES = ps3-main.c
-pb_nc_ps3_LDADD = $(common_libs) $(libdir)/libps3-utils.so
-#pb_nc_ps3_LDFLAGS = -L$(libdir) -lps3-utils
+petitboot_ps3_nc_SOURCES = ps3-main.c
+petitboot_ps3_nc_LDADD = $(common_libs) $(libdir)/libps3-utils.so
+#petitboot_ps3_nc_LDFLAGS = -L$(libdir) -lps3-utils
 
 
 MAINTAINERCLEANFILES = Makefile.in