52 lines
1.2 KiB
Diff
52 lines
1.2 KiB
Diff
|
From 0bb96d9971975a42c102d87036c858e1347d6bc5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
||
|
|
Date: Thu, 9 Feb 2012 14:12:10 +0100
|
||
|
|
Subject: [PATCH] kmod-setup: fix build with libkmod
|
||
|
|
|
||
|
|
---
|
||
|
|
Makefile.am | 12 ++++++------
|
||
|
|
1 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index fbf2358..c5b819e 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -546,7 +546,8 @@ libsystemd_core_la_CFLAGS = \
|
||
|
|
$(UDEV_CFLAGS) \
|
||
|
|
$(LIBWRAP_CFLAGS) \
|
||
|
|
$(PAM_CFLAGS) \
|
||
|
|
- $(AUDIT_CFLAGS)
|
||
|
|
+ $(AUDIT_CFLAGS) \
|
||
|
|
+ $(KMOD_CFLAGS)
|
||
|
|
|
||
|
|
libsystemd_core_la_LIBADD = \
|
||
|
|
libsystemd-basic.la \
|
||
|
|
@@ -555,7 +556,8 @@ libsystemd_core_la_LIBADD = \
|
||
|
|
$(LIBWRAP_LIBS) \
|
||
|
|
$(PAM_LIBS) \
|
||
|
|
$(AUDIT_LIBS) \
|
||
|
|
- $(CAP_LIBS)
|
||
|
|
+ $(CAP_LIBS) \
|
||
|
|
+ $(KMOD_LIBS)
|
||
|
|
|
||
|
|
# This is needed because automake is buggy in how it generates the
|
||
|
|
# rules for C programs, but not Vala programs. We therefore can't
|
||
|
|
@@ -728,12 +730,10 @@ systemd_SOURCES = \
|
||
|
|
systemd_CFLAGS = \
|
||
|
|
$(AM_CFLAGS) \
|
||
|
|
$(DBUS_CFLAGS) \
|
||
|
|
- $(UDEV_CFLAGS) \
|
||
|
|
- $(KMOD_CFLAGS)
|
||
|
|
+ $(UDEV_CFLAGS)
|
||
|
|
|
||
|
|
systemd_LDADD = \
|
||
|
|
- libsystemd-core.la \
|
||
|
|
- $(KMOD_LIBS)
|
||
|
|
+ libsystemd-core.la
|
||
|
|
|
||
|
|
test_engine_SOURCES = \
|
||
|
|
src/test-engine.c
|
||
|
|
--
|
||
|
|
1.7.7
|
||
|
|
|