X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2FMakefile.am;h=1fd8d96c6001954c1620f6b5865e463146065b35;hp=fc9336eac2ba6f9fe47f74146a97294ee22be4c4;hb=bc4114e2235163bd88456c25cc0a908d86151f93;hpb=f2747434dcdfe71c3a4d1b841070f4c9d8dc4965

diff --git a/discover/Makefile.am b/discover/Makefile.am
index fc9336e..1fd8d96 100644
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -14,6 +14,8 @@
 
 pkgsysconfdir = @sysconfdir@/@PACKAGE@
 
+SUBDIRS = grub2
+
 AM_CPPFLAGS = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = $(DEFAULT_CFLAGS)  \
@@ -22,25 +24,6 @@ AM_CFLAGS = $(DEFAULT_CFLAGS)  \
 	-DPKG_SYSCONF_DIR='"$(pkgsysconfdir)"' \
 	-DLOCAL_STATE_DIR='"$(localstatedir)"'
 
-noinst_PROGRAMS = libparser.ro
-
-libparser_ro_SOURCES = \
-	parser.c \
-	parser.h \
-	parser-conf.c \
-	parser-conf.h \
-	paths.c \
-	paths.h \
-	resource.c \
-	resource.h \
-	kboot-parser.c \
-	grub2-parser.c \
-	yaboot-parser.c \
-	pxe-parser.c
-
-libparser.ro$(EXEEXT): $(libparser_ro_OBJECTS)
-	$(LD) -r -o $@ $^
-
 EXTRA_DIST = native-parser.c
 
 sbin_PROGRAMS = pb-discover
@@ -54,21 +37,35 @@ pb_discover_SOURCES = \
 	discover-server.h \
 	event.c \
 	event.h \
-	event-parser.c \
+	file.c \
+	file.h \
 	params.c \
 	params.h \
+	parser.c \
+	parser.h \
+	parser-conf.c \
+	parser-conf.h \
 	parser-utils.c \
 	parser-utils.h \
+	paths.c \
+	paths.h \
 	pb-discover.c \
 	pb-discover.h \
+	resource.c \
+	resource.h \
+	sysinfo.c \
+	sysinfo.h \
 	network.c \
 	network.h \
 	udev.c \
 	udev.h \
 	user-event.c \
-	user-event.h
+	user-event.h \
+	kboot-parser.c \
+	yaboot-parser.c \
+	pxe-parser.c
 
-pb_discover_LDADD = libparser.ro $(top_builddir)/lib/libpbcore.la
+pb_discover_LDADD = $(top_builddir)/lib/libpbcore.la grub2/grub2-parser.ro
 
 pb_discover_LDFLAGS = -ludev