chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import: rename "gpt" disk image type to "raw"
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 205dafafce125f723077031a67683645188c80fd..520c4e944e970756e9b0f8254c20eaa614dbd7ba 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2658,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
@@
-5213,8
+5218,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 \
@@
-5403,6
+5408,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
@@
-5493,6
+5503,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