discover: Fix CDROM handling

[petitboot] / discover / Makefile.am

diff --git a/discover/Makefile.am b/discover/Makefile.am
index 45b168f9b726c919eb15bff6caa29c656f147ff4..84c0436a9ade56835d4a737dce769bcd47d084fb 100644 (file)
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -14,12 +14,15 @@
 
 pkgsysconfdir = @sysconfdir@/@PACKAGE@
 
 
 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)"' \
 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)"'
 
 EXTRA_DIST = native-parser.c
        -DLOCAL_STATE_DIR='"$(localstatedir)"'
 
 EXTRA_DIST = native-parser.c


@@ -29,13 +32,14 @@ sbin_PROGRAMS = pb-discover
 pb_discover_SOURCES = \
        boot.c \
        boot.h \
 pb_discover_SOURCES = \
        boot.c \
        boot.h \

+       cdrom.c \
+       cdrom.h \

        device-handler.c \
        device-handler.h \
        discover-server.c \
        discover-server.h \
        event.c \
        event.h \
        device-handler.c \
        device-handler.h \
        discover-server.c \
        discover-server.h \
        event.c \
        event.h \

-       event-parser.c \

        file.c \
        file.h \
        params.c \
        file.c \
        file.h \
        params.c \


@@ -52,6 +56,8 @@ pb_discover_SOURCES = \
        pb-discover.h \
        resource.c \
        resource.h \
        pb-discover.h \
        resource.c \
        resource.h \

+       sysinfo.c \
+       sysinfo.h \

        network.c \
        network.h \
        udev.c \
        network.c \
        network.h \
        udev.c \


@@ -59,11 +65,10 @@ pb_discover_SOURCES = \
        user-event.c \
        user-event.h \
        kboot-parser.c \
        user-event.c \
        user-event.h \
        kboot-parser.c \

-       grub2-parser.c \

        yaboot-parser.c \
        pxe-parser.c
 
        yaboot-parser.c \
        pxe-parser.c
 

-pb_discover_LDADD = $(top_builddir)/lib/libpbcore.la
+pb_discover_LDADD = $(top_builddir)/lib/libpbcore.la grub2/grub2-parser.ro

 
 pb_discover_LDFLAGS = -ludev
 
 
 pb_discover_LDFLAGS = -ludev