chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TODO: update
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 8a60f3fa4bdbec46333f3cb9fe6286692a763461..ff69bb93d24fb5fe5e9b85281b96a661eb220e54 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-769,6
+769,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
+ src/shared/fstab-util.c \
+ src/shared/fstab-util.h \
src/shared/path-util.c \
src/shared/path-util.h \
src/shared/time-util.c \
src/shared/path-util.c \
src/shared/path-util.h \
src/shared/time-util.c \
@@
-980,6
+982,24
@@
libsystemd_label_la_LIBADD = \
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
+if HAVE_LIBIPTC
+noinst_LTLIBRARIES += \
+ libsystemd-fw.la
+
+libsystemd_fw_la_SOURCES = \
+ src/shared/fw-util.h \
+ src/shared/fw-util.c
+
+libsystemd_fw_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBIPTC_CFLAGS)
+
+libsystemd_fw_la_LIBADD = \
+ $(LIBIPTC_LIBS)
+endif
+
+# -----------------------------------------------------------------------------
+
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
@@
-1332,7
+1352,8
@@
manual_tests += \
test-watchdog \
test-log \
test-ipcrm \
test-watchdog \
test-log \
test-ipcrm \
- test-btrfs
+ test-btrfs \
+ test-fw-util
if HAVE_KMOD
manual_tests += \
if HAVE_KMOD
manual_tests += \
@@
-1354,6
+1375,7
@@
tests += \
test-utf8 \
test-ellipsize \
test-util \
test-utf8 \
test-ellipsize \
test-util \
+ test-path-lookup \
test-ring \
test-barrier \
test-pty \
test-ring \
test-barrier \
test-pty \
@@
-1366,6
+1388,7
@@
tests += \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
+ test-fstab-util \
test-prioq \
test-fileio \
test-time \
test-prioq \
test-fileio \
test-time \
@@
-1608,6
+1631,12
@@
test_fdset_LDADD = \
libsystemd-shared.la \
libsystemd-internal.la
libsystemd-shared.la \
libsystemd-internal.la
+test_fstab_util_SOURCES = \
+ src/test/test-fstab-util.c
+
+test_fstab_util_LDADD = \
+ libsystemd-shared.la
+
test_ratelimit_SOURCES = \
src/test/test-ratelimit.c
test_ratelimit_SOURCES = \
src/test/test-ratelimit.c
@@
-1620,6
+1649,14
@@
test_util_SOURCES = \
test_util_LDADD = \
libsystemd-shared.la
test_util_LDADD = \
libsystemd-shared.la
+test_path_lookup_SOURCES = \
+ src/test/test-path-lookup.c
+
+test_path_lookup_LDADD = \
+ -lm \
+ libsystemd-units.la \
+ libsystemd-shared.la
+
test_uid_range_SOURCES = \
src/test/test-uid-range.c
test_uid_range_SOURCES = \
src/test/test-uid-range.c
@@
-1797,6
+1834,18
@@
test_btrfs_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-shared.la
+test_fw_util_SOURCES = \
+ src/test/test-fw-util.c
+
+test_fw_util_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBIPTC_CFLAGS)
+
+test_fw_util_LDADD = \
+ libsystemd-fw.la \
+ libsystemd-shared.la \
+ $(LIBIPTC_LIBS)
+
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
@@
-2609,6
+2658,11
@@
systemd_nspawn_LDADD += \
$(SECCOMP_LIBS)
endif
$(SECCOMP_LIBS)
endif
+if HAVE_LIBIPTC
+systemd_nspawn_LDADD += \
+ libsystemd-fw.la
+endif
+
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c
@@
-2622,7
+2676,11
@@
systemd_run_LDADD = \
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c \
src/bus-proxyd/bus-xml-policy.c \
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c \
src/bus-proxyd/bus-xml-policy.c \
- src/bus-proxyd/bus-xml-policy.h
+ src/bus-proxyd/bus-xml-policy.h \
+ src/bus-proxyd/driver.c \
+ src/bus-proxyd/driver.h \
+ src/bus-proxyd/synthesize.c \
+ src/bus-proxyd/synthesize.h
systemd_bus_proxyd_LDADD = \
libsystemd-internal.la \
systemd_bus_proxyd_LDADD = \
libsystemd-internal.la \
@@
-4419,6
+4477,7
@@
dist_catalog_DATA = \
catalog/systemd.fr.catalog \
catalog/systemd.it.catalog \
catalog/systemd.pl.catalog \
catalog/systemd.fr.catalog \
catalog/systemd.it.catalog \
catalog/systemd.pl.catalog \
+ catalog/systemd.pt_BR.catalog \
catalog/systemd.ru.catalog \
catalog/systemd.catalog
catalog/systemd.ru.catalog \
catalog/systemd.catalog
@@
-5161,8
+5220,8
@@
bin_PROGRAMS += \
systemd_import_SOURCES = \
src/import/import.c \
systemd_import_SOURCES = \
src/import/import.c \
- src/import/import-
gpt
.c \
- src/import/import-
gpt
.h \
+ src/import/import-
raw
.c \
+ src/import/import-
raw
.h \
src/import/import-dkr.c \
src/import/import-dkr.h \
src/import/curl-util.c \
src/import/import-dkr.c \
src/import/import-dkr.h \
src/import/curl-util.c \
@@
-5351,6
+5410,11
@@
systemd_networkd_SOURCES = \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la
systemd_networkd_LDADD = \
libsystemd-networkd-core.la
+if HAVE_LIBIPTC
+systemd_networkd_LDADD += \
+ libsystemd-fw.la
+endif
+
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
@@
-5441,6
+5505,11
@@
test_network_SOURCES = \
test_network_LDADD = \
libsystemd-networkd-core.la
test_network_LDADD = \
libsystemd-networkd-core.la
+if HAVE_LIBIPTC
+test_network_LDADD += \
+ libsystemd-fw.la
+endif
+
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
src/shared/test-tables.h
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
src/shared/test-tables.h