From 5472ed16df5642aedc124a1b49a35d99da98cc37 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 25 Mar 2009 12:35:56 +0000 Subject: Split common routines from kboot parser Pull out the common .conf file parsing logic from kboot-parser.c and into two new files parser-conf.h and parser-conf.c, and rework the kboot parser to use those common routines. The new common routines are based on a .conf file parser context struct conf_context. The specific parsers setup the context then call the main parsing entry routine conf_parse(). conf_parse() uses the context info to open and read .conf files and call parser specific callbacks to process name:value pairs and to add boot_option instances to the discover server. Signed-off-by: Geoff Levand Signed-off-by: Jeremy Kerr --- rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rules.mk') diff --git a/rules.mk b/rules.mk index d377f8b..8d6aba8 100644 --- a/rules.mk +++ b/rules.mk @@ -17,7 +17,6 @@ parser_test = test/parser-test # install targets and components daemons = $(pb_discover) -#parsers = kboot native yaboot (todo) parsers = kboot uis = $(pb_test) tests = $(parser_test) @@ -39,6 +38,7 @@ waiter_objs = lib/waiter/waiter.o # daemon objs parser_objs = discover/parser.o discover/parser-utils.o \ + discover/parser-conf.o\ $(foreach p, $(parsers), discover/$(p)-parser.o) discover_objs = discover/udev.o discover/discover-server.o \ discover/device-handler.o discover/paths.o -- cgit v1.2.1