chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: remove default CFLAGS assignment
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index a06a79b958759f2e43ab659c28be3c8959457385..8d1e85d92948750024da9a7e3ff8a91264bb83bb 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-183,6
+183,7
@@
AM_CPPFLAGS = \
-I $(top_srcdir)/src/udev/net \
-I $(top_builddir)/src/udev \
-I $(top_srcdir)/src/libsystemd-bus \
-I $(top_srcdir)/src/udev/net \
-I $(top_builddir)/src/udev \
-I $(top_srcdir)/src/libsystemd-bus \
+ -I $(top_srcdir)/src/libsystemd-rtnl \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
@@
-627,7
+628,9
@@
libsystemd_rtnl_la_SOURCES = \
src/systemd/sd-rtnl.h \
src/libsystemd-rtnl/sd-rtnl.c \
src/libsystemd-rtnl/rtnl-internal.h \
src/systemd/sd-rtnl.h \
src/libsystemd-rtnl/sd-rtnl.c \
src/libsystemd-rtnl/rtnl-internal.h \
- src/libsystemd-rtnl/rtnl-message.c
+ src/libsystemd-rtnl/rtnl-message.c \
+ src/libsystemd-rtnl/rtnl-util.h \
+ src/libsystemd-rtnl/rtnl-util.c
test_rtnl_SOURCES = \
src/libsystemd-rtnl/test-rtnl.c
test_rtnl_SOURCES = \
src/libsystemd-rtnl/test-rtnl.c
@@
-3689,9
+3692,6
@@
systemd_machined_SOURCES = \
src/machine/machined.c \
src/machine/machined.h
src/machine/machined.c \
src/machine/machined.h
-systemd_machined_CFLAGS = \
- $(libsystemd_machine_core_la_CFLAGS)
-
systemd_machined_LDADD = \
libsystemd-machine-core.la \
$(libsystemd_machine_core_la_LIBADD)
systemd_machined_LDADD = \
libsystemd-machine-core.la \
$(libsystemd_machine_core_la_LIBADD)
@@
-3705,16
+3705,12
@@
libsystemd_machine_core_la_SOURCES = \
src/machine/machine.h \
src/machine/machine-dbus.c
src/machine/machine.h \
src/machine/machine-dbus.c
-libsystemd_machine_core_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-
d
bus.la \
+ libsystemd-bus.la \
libsystemd-id128-internal.la \
libudev.la
libsystemd-id128-internal.la \
libudev.la
@@
-3739,10
+3735,6
@@
rootbin_PROGRAMS += \
test_machine_tables_SOURCES = \
src/machine/test-machine-tables.c
test_machine_tables_SOURCES = \
src/machine/test-machine-tables.c
-test_machine_tables_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_machine_tables_LDADD = \
libsystemd-machine-core.la
test_machine_tables_LDADD = \
libsystemd-machine-core.la