X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2FMakefile.am;h=2a7885d7c7c1ebb379578766a579ec21b9f8c5cc;hp=a4498187170fd66a6d2e1368093565c433623704;hb=08e967ee301b502b2114e3855210a0b2600d095c;hpb=c75acc64833eb7263b340079e7ba3153ebc60aec

diff --git a/discover/Makefile.am b/discover/Makefile.am
index a449818..2a7885d 100644
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -12,32 +12,19 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+pkgsysconfdir = @sysconfdir@/@PACKAGE@
+
+SUBDIRS = grub2
+
 AM_CPPFLAGS = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = $(DEFAULT_CFLAGS)  \
 	-DPREFIX='"$(prefix)"' \
 	-DPKG_SHARE_DIR='"$(pkgdatadir)"' \
+	-DPKG_SYSCONF_DIR='"$(pkgsysconfdir)"' \
+	-DPKG_LIBEXEC_DIR='"$(pkglibexecdir)"' \
 	-DLOCAL_STATE_DIR='"$(localstatedir)"'
 
-noinst_LIBRARIES = libparser.o
-
-libparser_o_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.o: $(libparser_o_OBJECTS)
-	$(LD) -r -o $@ $^
-
 EXTRA_DIST = native-parser.c
 
 sbin_PROGRAMS = pb-discover
@@ -51,21 +38,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.o $(top_builddir)/lib/libpbcore.la
+pb_discover_LDADD = $(top_builddir)/lib/libpbcore.la grub2/grub2-parser.ro
 
 pb_discover_LDFLAGS = -ludev