chiark / gitweb /
build-sys: fix build without -Wl,--gc-sections
[elogind.git] / Makefile.am
index ad69ee3870f9765b9e57475e21b1cbf9aaa3bd62..163e8f8fee6d9239a7415f61325d54af5d5f4ba5 100644 (file)
@@ -71,7 +71,6 @@ sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log
 systemdstatedir=$(localstatedir)/lib/systemd
 catalogstatedir=$(systemdstatedir)/catalog
-hwdb_bin=/etc/udev/hwdb.bin
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -138,7 +137,6 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DCATALOG_PATH=\"$(catalogstatedir)\" \
-       -DHWDB_BIN=\"$(hwdb_bin)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
@@ -1786,7 +1784,7 @@ INSTALL_DATA_HOOKS += \
        hwdb-update-hook
 
 hwdb-remove-hook:
-       -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN)
+       -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
 
 # ------------------------------------------------------------------------------
 TESTS += \
@@ -2426,6 +2424,7 @@ libsystemd_journal_la_LDFLAGS = \
 libsystemd_journal_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-label.la \
+       libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \