diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-03-05 15:28:14 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-15 15:42:26 +0800 |
| commit | 16ebe978aeced862dd877cfee81ac7604902fd55 (patch) | |
| tree | c73db6d36b3a8785f6a47c4544419b9341cd5ea2 | |
| parent | 9a960821e54b0794b1c519b493294b7222dd98d4 (diff) | |
| download | talos-petitboot-16ebe978aeced862dd877cfee81ac7604902fd55.tar.gz talos-petitboot-16ebe978aeced862dd877cfee81ac7604902fd55.zip | |
lib/url: Move URL-handling code to lib
We'll need to use the URL handling code in the server, so move it to the
lib/ directory.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/url/url.c (renamed from ui/common/url.c) | 0 | ||||
| -rw-r--r-- | lib/url/url.h (renamed from ui/common/url.h) | 0 | ||||
| -rw-r--r-- | test/urls/Makefile.am | 5 | ||||
| -rw-r--r-- | test/urls/parse-url.c | 2 | ||||
| -rw-r--r-- | ui/common/Makefile.am | 4 | ||||
| -rw-r--r-- | ui/common/loader.c | 2 |
7 files changed, 7 insertions, 10 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 7847d09..cce05fe 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -32,6 +32,8 @@ libpbcore_la_SOURCES = \ talloc/talloc.c \ talloc/talloc.h \ system/system.c \ - system/system.h + system/system.h \ + url/url.c \ + url/url.h MAINTAINERCLEANFILES = Makefile.in diff --git a/ui/common/url.c b/lib/url/url.c index 4e4b961..4e4b961 100644 --- a/ui/common/url.c +++ b/lib/url/url.c diff --git a/ui/common/url.h b/lib/url/url.h index 3cb7cd8..3cb7cd8 100644 --- a/ui/common/url.h +++ b/lib/url/url.h diff --git a/test/urls/Makefile.am b/test/urls/Makefile.am index 850c58f..d16ffdc 100644 --- a/test/urls/Makefile.am +++ b/test/urls/Makefile.am @@ -22,10 +22,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(DEFAULT_CFLAGS) -parse_url_SOURCES = \ - parse-url.c \ - ../../ui/common/url.c \ - ../../ui/common/url.h +parse_url_SOURCES = parse-url.c parse_url_LDADD = ../../lib/libpbcore.la diff --git a/test/urls/parse-url.c b/test/urls/parse-url.c index 3e2f10f..d748cdb 100644 --- a/test/urls/parse-url.c +++ b/test/urls/parse-url.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <stdio.h> -#include <ui/common/url.h> +#include <url/url.h> #include <log/log.h> int main(int argc, char **argv) diff --git a/ui/common/Makefile.am b/ui/common/Makefile.am index 284bf36..9e8d3ea 100644 --- a/ui/common/Makefile.am +++ b/ui/common/Makefile.am @@ -33,9 +33,7 @@ libpbui_la_SOURCES = \ timer.c \ timer.h \ ui-system.c \ - ui-system.h \ - url.c \ - url.h + ui-system.h if ENABLE_PS3 libpbui_la_SOURCES += \ diff --git a/ui/common/loader.c b/ui/common/loader.c index 74b3c76..b3ae765 100644 --- a/ui/common/loader.c +++ b/ui/common/loader.c @@ -26,9 +26,9 @@ #include "log/log.h" #include <system/system.h> +#include <url/url.h> #include "talloc/talloc.h" #include "loader.h" -#include "url.h" /** |
