From: Jeremy Kerr Date: Wed, 23 Jul 2014 05:32:08 +0000 (+0800) Subject: discover: Move platform config to a .ro X-Git-Tag: v1.0.0~127 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=ddb1a5dddc20c208c1db311ba17e77de109b99cd;hp=76591d5e727b35295ea238322f73515c8cc93945 discover: Move platform config to a .ro We want to allow an external utility to use the platform config code, so build it into a .ro, which is then linked to the discover code. Signed-off-by: Jeremy Kerr --- diff --git a/discover/Makefile.am b/discover/Makefile.am index 0dc5e89..cd5c957 100644 --- a/discover/Makefile.am +++ b/discover/Makefile.am @@ -13,6 +13,7 @@ # sbin_PROGRAMS += discover/pb-discover +noinst_PROGRAMS += discover/platform.ro discover_pb_discover_SOURCES = \ discover/boot.c \ @@ -39,9 +40,6 @@ discover_pb_discover_SOURCES = \ discover/paths.h \ discover/pb-discover.c \ discover/pb-discover.h \ - discover/platform.c \ - discover/platform.h \ - discover/platform-powerpc.c \ discover/resource.c \ discover/resource.h \ discover/sysinfo.c \ @@ -58,6 +56,7 @@ discover_pb_discover_SOURCES = \ discover_pb_discover_LDADD = \ discover/grub2/grub2-parser.ro \ + discover/platform.ro \ $(core_lib) \ $(UDEV_LIBS) @@ -69,5 +68,13 @@ discover_pb_discover_CPPFLAGS = \ -DPKG_SHARE_DIR='"$(pkgsharedir)"' \ -DPKG_SYSCONF_DIR='"$(pkgsysconfdir)"' +discover_platform_ro_SOURCES = \ + discover/platform.c \ + discover/platform.h \ + discover/platform-powerpc.c + +discover_platform_ro_LINK = \ + $(LD) -r -o $@ + EXTRA_DIST += discover/native-parser.c