discover: remove libparser object

There's no real need for a separate libparser object. Our tests pull-in
the parsers directly, and the discover server is the only thing that
actually links to libparser.ro.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/Makefile.am b/discover/Makefile.am
index fc9336eac2ba6f9fe47f74146a97294ee22be4c4..e736e936d817d885c55ed8bf3e82086949be503e 100644 (file)
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -22,25 +22,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
@@ -57,18 +38,30 @@ pb_discover_SOURCES = \
        event-parser.c \
        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 \
        network.c \
        network.h \
        udev.c \
        udev.h \
        user-event.c \
-       user-event.h
+       user-event.h \
+       kboot-parser.c \
+       grub2-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
 
 pb_discover_LDFLAGS = -ludev