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: Make libsystemd-shared link to libsystemd-daemon
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index f8fe2529ab92d41ff75567d576baba98462f784e..163a180dc4a086f1c80f6fc2aa06ad01de7ca539 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-422,11
+422,6
@@
systemgenerator_PROGRAMS += \
systemd-rc-local-generator
endif
systemd-rc-local-generator
endif
-if TARGET_FRUGALWARE
-dist_systemunit_DATA += \
- units/frugalware/display-manager.service
-endif
-
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/rc-local.service \
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/rc-local.service \
@@
-806,6
+801,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/hashmap.h \
src/shared/set.c \
src/shared/set.h \
src/shared/hashmap.h \
src/shared/set.c \
src/shared/set.h \
+ src/shared/fdset.c \
+ src/shared/fdset.h \
src/shared/strv.c \
src/shared/strv.h \
src/shared/strbuf.c \
src/shared/strv.c \
src/shared/strv.h \
src/shared/strbuf.c \
@@
-852,6
+849,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/calendarspec.c \
src/shared/calendarspec.h
src/shared/calendarspec.c \
src/shared/calendarspec.h
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
+
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-dbus.la
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-dbus.la
@@
-1062,8
+1061,6
@@
libsystemd_core_la_SOURCES = \
src/core/mount-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
src/core/mount-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
- src/core/fdset.c \
- src/core/fdset.h \
src/core/condition.c \
src/core/condition.h \
src/core/namespace.c \
src/core/condition.c \
src/core/condition.h \
src/core/namespace.c \
@@
-1237,7
+1234,8
@@
noinst_PROGRAMS += \
test-sleep \
test-replace-var \
test-sched-prio \
test-sleep \
test-replace-var \
test-sched-prio \
- test-calendarspec
+ test-calendarspec \
+ test-strip-tab-ansi
TESTS += \
test-job-type \
TESTS += \
test-job-type \
@@
-1249,7
+1247,8
@@
TESTS += \
test-sleep \
test-replace-var \
test-sched-prio \
test-sleep \
test-replace-var \
test-sched-prio \
- test-calendarspec
+ test-calendarspec \
+ test-strip-tab-ansi
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1346,6
+1345,12
@@
test_calendarspec_SOURCES = \
test_calendarspec_LDADD = \
libsystemd-shared.la
test_calendarspec_LDADD = \
libsystemd-shared.la
+test_strip_tab_ansi_SOURCES = \
+ src/test/test-strip-tab-ansi.c
+
+test_strip_tab_ansi_LDADD = \
+ libsystemd-shared.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
test_daemon_SOURCES = \
src/test/test-daemon.c