summaryrefslogtreecommitdiffstats
path: root/rules.mk
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2009-01-21 16:26:56 -0800
committerJeremy Kerr <jk@ozlabs.org>2009-02-01 11:49:29 +1100
commitdae4540e417e2bf72dd83b2713a670bde0056ba9 (patch)
treebf6f168b7f865e3a35eda16879c2d43637056b3f /rules.mk
parent6106bb6672af26232546c07a4b631779f21dbbb0 (diff)
downloadtalos-petitboot-dae4540e417e2bf72dd83b2713a670bde0056ba9.tar.gz
talos-petitboot-dae4540e417e2bf72dd83b2713a670bde0056ba9.zip
Move log to library
Move the log routines to the petitboot library. The log routines are generic enough to be used for both server and client. Does not change the log source. jk: move to lib/log/ instead of lib/ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/rules.mk b/rules.mk
index 607a25e..0eb4cab 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,5 @@
+
VPATH = $(srcdir)
CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
@@ -13,7 +14,7 @@ uis = ui/test/pb-test
parsers = kboot
artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
-
+log_objs = lib/log/log.o
talloc_objs = lib/talloc/talloc.o
list_objs = lib/list/list.o
waiter_objs = lib/waiter/waiter.o
@@ -36,7 +37,7 @@ ui/twin/pb-twin: $(pb_twin_objs)
# test ui
pb_test_objs = ui/test/pb-test.o ui/common/discover-client.o \
- $(talloc_objs) $(server_objs) $(list_objs)
+ $(log_objs) $(talloc_objs) $(server_objs) $(list_objs)
ui/test/pb-test: $(pb_test_objs)
$(LINK.o) -o $@ $^
@@ -46,10 +47,10 @@ ui/test/pb-test: $(pb_test_objs)
# discover/yaboot-cfg.o \
# $(foreach p,$(parsers),discover/$(p)-parser.o)
-pb_discover_objs = discover/pb-discover.o discover/udev.o discover/log.o \
+pb_discover_objs = discover/pb-discover.o discover/udev.o \
discover/discover-server.o discover/device-handler.o \
discover/paths.o $(talloc_objs) $(server_objs) \
- $(parser_objs) $(list_objs) $(waiter_objs)
+ $(parser_objs) $(list_objs) $(waiter_objs) $(log_objs)
discover/pb-discover: $(pb_discover_objs)
$(LINK.o) -o $@ $^
OpenPOWER on IntegriCloud