X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2FMakefile.am;h=1a5e43a1b5c3b53f607d405ccca42ab40448e236;hp=e5c32cface37179cf489e5313d72571ba197a559;hb=6e14e1404f36f7706016531e4e19e5e6025a846a;hpb=203254ec7ca2352e898acc9ac5c971bcbf630720

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index e5c32cf..1a5e43a 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = -O0 -ggdb -Wall -Wextra -Werror
 
-LDADD = $(top_builddir)/lib/libpbcore.la libtest.o
+LDADD = $(top_builddir)/lib/libpbcore.la libtest.ro
 
 TESTS = \
 	test-null \
@@ -33,8 +33,18 @@ TESTS = \
 	test-grub2-ubuntu-13_04-x86 \
 	test-kboot-single \
 	test-yaboot-single \
+	test-yaboot-partition \
+	test-yaboot-partition-override \
 	test-yaboot-external \
-	test-yaboot-rh8-ppc64
+	test-yaboot-root-global \
+	test-yaboot-root-override \
+	test-yaboot-device-override \
+	test-yaboot-default \
+	test-yaboot-rh8-ppc64 \
+	test-pxe-empty \
+	test-pxe-single \
+	test-pxe-initrd-in-append \
+	test-pxe-default
 
 $(TESTS): %: %.embedded-config.o
 $(TESTS): LDADD += $@.embedded-config.o
@@ -48,24 +58,26 @@ extract_config = $(srcdir)/extract-config.awk
 parser_objs = \
 	$(top_srcdir)/discover/yaboot-parser.c \
 	$(top_srcdir)/discover/kboot-parser.c \
-	$(top_srcdir)/discover/grub2-parser.c \
+	$(top_srcdir)/discover/pxe-parser.c \
 	$(top_srcdir)/discover/resource.c \
 	$(top_srcdir)/discover/paths.c \
 	$(top_srcdir)/discover/device-handler.c \
 	$(top_srcdir)/discover/parser-conf.c
 
-libtest_o_SOURCES = \
+libtest_ro_SOURCES = \
 	main.c \
 	utils.c \
 	handler.c \
 	parser-test.h \
 	$(parser_objs)
 
-libtest.o: $(libtest_o_OBJECTS)
+libtest_ro_LDADD = \
+	../../discover/grub2/grub2-parser.ro
+
+libtest.ro$(EXEEXT): $(libtest_ro_OBJECTS) $(libtest_ro_LDADD)
 	$(LD) -o $@ -r $^
 
-check_PROGRAMS = $(TESTS)
-check_LIBRARIES = libtest.o
+check_PROGRAMS = $(TESTS) libtest.ro
 
 check_DATA = \
 	data/grub2-f18-ppc64.conf \