diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | discover/device-handler.c | 2 | ||||
| -rw-r--r-- | discover/discover-server.c | 2 | ||||
| -rw-r--r-- | discover/kboot-parser.c | 2 | ||||
| -rw-r--r-- | discover/parser.c | 2 | ||||
| -rw-r--r-- | discover/pb-discover.c | 2 | ||||
| -rw-r--r-- | discover/udev.c | 2 | ||||
| -rw-r--r-- | lib/log/log.c (renamed from discover/log.c) | 0 | ||||
| -rw-r--r-- | lib/log/log.h (renamed from discover/log.h) | 0 | ||||
| -rw-r--r-- | rules.mk | 9 |
10 files changed, 12 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index f06ac80..88e5833 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,6 @@ AC_PROG_INSTALL PKG_CHECK_MODULES([twin], [libtwin]) mkdir -p discover ui/test ui/common lib/talloc lib/pb-protocol lib/list \ - lib/waiter + lib/waiter lib/log AC_OUTPUT diff --git a/discover/device-handler.c b/discover/device-handler.c index 7e5819c..9e40fb1 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -8,13 +8,13 @@ #include <talloc/talloc.h> #include <list/list.h> +#include <log/log.h> #include <pb-protocol/pb-protocol.h> #include "device-handler.h" #include "discover-server.h" #include "parser.h" #include "udev.h" -#include "log.h" #include "paths.h" #define MOUNT_BIN "/bin/mount" diff --git a/discover/discover-server.c b/discover/discover-server.c index 1fab303..56a427b 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -12,11 +12,11 @@ #include <talloc/talloc.h> #include <waiter/waiter.h> +#include <log/log.h> #include "pb-protocol/pb-protocol.h" #include "list/list.h" -#include "log.h" #include "device-handler.h" #include "discover-server.h" diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c index 7124561..930fbe4 100644 --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -11,8 +11,8 @@ #include <sys/stat.h> #include <talloc/talloc.h> +#include <log/log.h> -#include "log.h" #include "pb-protocol/pb-protocol.h" #include "paths.h" #include "params.h" diff --git a/discover/parser.c b/discover/parser.c index 87241a9..2b4ddd2 100644 --- a/discover/parser.c +++ b/discover/parser.c @@ -2,9 +2,9 @@ #include <stdlib.h> #include "pb-protocol/pb-protocol.h" +#include <log/log.h> #include "device-handler.h" -#include "log.h" #include "parser.h" #include "parser-utils.h" diff --git a/discover/pb-discover.c b/discover/pb-discover.c index d11ab64..d8709b3 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -3,11 +3,11 @@ #include <signal.h> #include <waiter/waiter.h> +#include <log/log.h> #include "udev.h" #include "discover-server.h" #include "device-handler.h" -#include "log.h" static int running; diff --git a/discover/udev.c b/discover/udev.c index 66d9544..9d62840 100644 --- a/discover/udev.c +++ b/discover/udev.c @@ -11,9 +11,9 @@ #include <talloc/talloc.h> #include <waiter/waiter.h> +#include <log/log.h> #include "udev.h" -#include "log.h" #include "pb-discover.h" #include "device-handler.h" diff --git a/discover/log.c b/lib/log/log.c index e006fd0..e006fd0 100644 --- a/discover/log.c +++ b/lib/log/log.c diff --git a/discover/log.h b/lib/log/log.h index 3e92555..3e92555 100644 --- a/discover/log.h +++ b/lib/log/log.h @@ -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 $@ $^ |
