diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-08-08 14:33:19 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-08-08 16:28:39 +0800 |
| commit | bee85b3946d50bc4ee02ab889f4b3a9cd0defe98 (patch) | |
| tree | de96e98dbfc65af8dc28e25aaddca6e6d9cbd968 /discover/Makefile.am | |
| parent | f53d1e4dc6735b90806ceed54f9d73572b5960f5 (diff) | |
| download | talos-petitboot-bee85b3946d50bc4ee02ab889f4b3a9cd0defe98.tar.gz talos-petitboot-bee85b3946d50bc4ee02ab889f4b3a9cd0defe98.zip | |
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>
Diffstat (limited to 'discover/Makefile.am')
| -rw-r--r-- | discover/Makefile.am | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/discover/Makefile.am b/discover/Makefile.am index fc9336e..e736e93 100644 --- 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 |
