diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-09-07 02:59:08 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-09-07 02:59:08 +0200 |
| commit | 6167a91c745e5406164ef57e27212ba572d9a0dc (patch) | |
| tree | 35af349cc76d850d1593163d8dabfd4c59dfe267 /Makefile.am | |
| parent | 2009bcfd23400bacd50848ac3e72cd5f6fbe53db (diff) | |
| parent | 08acb521f30d692f13056daa23fb1323528249ff (diff) | |
Merge pull request #1165 from poettering/nspawn-files
various fixes to the core, logind, machined, nspawn
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 003308e580..1a844acc13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,6 +155,7 @@ noinst_PROGRAMS = TESTS = endif udevlibexec_PROGRAMS = +gperf_gperf_sources = in_files = $(filter %.in,$(EXTRA_DIST)) in_in_files = $(filter %.in.in, $(in_files)) @@ -220,6 +221,7 @@ AM_CPPFLAGS = \ -I $(top_builddir)/src/journal \ -I $(top_srcdir)/src/timedate \ -I $(top_srcdir)/src/timesync \ + -I $(top_srcdir)/src/nspawn \ -I $(top_srcdir)/src/resolve \ -I $(top_builddir)/src/resolve \ -I $(top_srcdir)/src/systemd \ @@ -2776,11 +2778,20 @@ systemd_cgtop_LDADD = \ # ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ src/nspawn/nspawn.c \ + src/nspawn/nspawn.h \ + src/nspawn/nspawn-settings.c \ + src/nspawn/nspawn-settings.h \ src/core/mount-setup.c \ src/core/mount-setup.h \ src/core/loopback-setup.c \ src/core/loopback-setup.h +nodist_systemd_nspawn_SOURCES = \ + src/nspawn/nspawn-gperf.c + +gperf_gperf_sources += \ + src/nspawn/nspawn-gperf.gperf + systemd_nspawn_CFLAGS = \ $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ @@ -3486,7 +3497,7 @@ nodist_libudev_core_la_SOURCES = \ src/udev/keyboard-keys-to-name.h \ src/udev/net/link-config-gperf.c -gperf_gperf_sources = \ +gperf_gperf_sources += \ src/udev/net/link-config-gperf.gperf libudev_core_la_CFLAGS = \ |