discover/device-handler: Attempt to retry failed mounts

[petitboot] / ui / ncurses / Makefile.am

diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am
index ec8217f6e3328468afca24226ae390022f9f5f01..265ae6960b8dce15c501b941e9c3cfc3867de844 100644 (file)
--- a/ui/ncurses/Makefile.am
+++ b/ui/ncurses/Makefile.am
@@ -12,47 +12,61 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/lib \
-       -I$(includedir) \
-       $(DEFAULT_CPPFLAGS)
+ui_ncurses_common_libs = \
+       ui/ncurses/libpbnc.la \
+       ui/common/libpbui.la \
+       $(core_lib) \
+       @MENU_LIB@ @FORM_LIB@ @CURSES_LIB@
 
-AM_CFLAGS = \
-       $(DEFAULT_CFLAGS)
+noinst_LTLIBRARIES += ui/ncurses/libpbnc.la
 
-AM_LDFLAGS = -lmenu -lform -lncurses
+ui_ncurses_libpbnc_la_SOURCES = \
+       ui/ncurses/nc-config.c \
+       ui/ncurses/nc-config.h \
+       ui/ncurses/nc-config-help.c \
+       ui/ncurses/nc-cui.c \
+       ui/ncurses/nc-cui.h \
+       ui/ncurses/nc-cui-help.c \
+       ui/ncurses/nc-boot-editor.c \
+       ui/ncurses/nc-boot-editor.h \
+       ui/ncurses/nc-boot-editor-help.c \
+       ui/ncurses/nc-helpscreen.c \
+       ui/ncurses/nc-helpscreen.h \
+       ui/ncurses/nc-lang.c \
+       ui/ncurses/nc-lang.h \
+       ui/ncurses/nc-menu.c \
+       ui/ncurses/nc-menu.h \
+       ui/ncurses/nc-scr.c \
+       ui/ncurses/nc-scr.h \
+       ui/ncurses/nc-sysinfo.c \
+       ui/ncurses/nc-sysinfo.h \
+       ui/ncurses/nc-sysinfo-help.c \
+       ui/ncurses/nc-textscreen.c \
+       ui/ncurses/nc-textscreen.h \
+       ui/ncurses/nc-widgets.c \
+       ui/ncurses/nc-widgets.h \
+       ui/ncurses/nc-add-url.c \
+       ui/ncurses/nc-add-url.h \
+       ui/ncurses/nc-add-url-help.c \
+       ui/ncurses/nc-subset.c \
+       ui/ncurses/nc-subset.h
 
-common_libs = \
-       libpbnc.la \
-       $(top_builddir)/ui/common/libpbui.la \
-       $(top_builddir)/lib/libpbcore.la
-
-noinst_LTLIBRARIES = libpbnc.la
-
-libpbnc_la_SOURCES = \
-       nc-cui.c \
-       nc-cui.h \
-       nc-ked.c \
-       nc-ked.h \
-       nc-menu.c \
-       nc-menu.h \
-       nc-scr.c \
-       nc-scr.h
-
-sbin_PROGRAMS = pb-nc
+sbin_PROGRAMS += ui/ncurses/petitboot-nc
 
 if ENABLE_PS3
-sbin_PROGRAMS += pb-nc-ps3
+sbin_PROGRAMS += ui/ncurses/petitboot-ps3-nc
 endif
 
+ui_ncurses_petitboot_nc_CPPFLAGS = \
+       $(DEFAULT_CPPFLAGS) \
+       -DLOCALEDIR='"$(localedir)"' \
+       -I$(top_srcdir)/lib
 
-pb_nc_SOURCES = generic-main.c
-pb_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
+ui_ncurses_petitboot_nc_SOURCES = ui/ncurses/generic-main.c
+ui_ncurses_petitboot_nc_LDADD = $(ui_ncurses_common_libs)
 
+ui_ncurses_petitboot_ps3_nc_SOURCES = ui/ncurses/ps3-main.c
+ui_ncurses_petitboot_ps3_nc_LDADD = $(ui_ncurses_common_libs) \
+                                   $(libdir)/libps3-utils.so
 
-MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST += ui/ncurses/ui-guidelines.text