summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 15:18:27 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 15:18:27 -0400
commit0c5542dc8db97b30690cca4bce75d26cf69ed731 (patch)
treed4f3fee4ee275a51b111a6d72d5e920627ab1db6
parentca3fbb58a70e54dac75def93379ce7ae01167af5 (diff)
Makefile: systemd-nspawn use symlinks instead of copying
-rw-r--r--src/systemd-nspawn/.gitignore4
-rw-r--r--src/systemd-nspawn/Makefile5
l---------src/systemd-nspawn/loopback-setup.c1
l---------src/systemd-nspawn/loopback-setup.h1
l---------src/systemd-nspawn/mount-setup.c1
l---------src/systemd-nspawn/mount-setup.h1
6 files changed, 4 insertions, 9 deletions
diff --git a/src/systemd-nspawn/.gitignore b/src/systemd-nspawn/.gitignore
index b1ba4fd9af..85c81fff24 100644
--- a/src/systemd-nspawn/.gitignore
+++ b/src/systemd-nspawn/.gitignore
@@ -1,5 +1 @@
/nspawn-gperf.c
-/loopback-setup.c
-/loopback-setup.h
-/mount-setup.c
-/mount-setup.h
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 12b002c868..3455305df8 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -76,11 +76,6 @@ ifneq ($(HAVE_LIBIPTC),)
$(outdir)/systemd-nspawn: $(libfirewall.DEPENDS)
endif
-$(outdir)/mount-setup.c: $(topsrcdir)/src/libcore/mount-setup.c; $(CP) $< $@
-$(outdir)/mount-setup.h: $(topsrcdir)/src/libcore/mount-setup.h; $(CP) $< $@
-$(outdir)/loopback-setup.c: $(topsrcdir)/src/libcore/loopback-setup.c; $(CP) $< $@
-$(outdir)/loopback-setup.h: $(topsrcdir)/src/libcore/loopback-setup.h; $(CP) $< $@
-
$(outdir)/nspawn.o: $(outdir)/loopback-setup.h
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/loopback-setup.c b/src/systemd-nspawn/loopback-setup.c
new file mode 120000
index 0000000000..1078ace0bf
--- /dev/null
+++ b/src/systemd-nspawn/loopback-setup.c
@@ -0,0 +1 @@
+../libcore/loopback-setup.c \ No newline at end of file
diff --git a/src/systemd-nspawn/loopback-setup.h b/src/systemd-nspawn/loopback-setup.h
new file mode 120000
index 0000000000..18fc7663a2
--- /dev/null
+++ b/src/systemd-nspawn/loopback-setup.h
@@ -0,0 +1 @@
+../libcore/loopback-setup.h \ No newline at end of file
diff --git a/src/systemd-nspawn/mount-setup.c b/src/systemd-nspawn/mount-setup.c
new file mode 120000
index 0000000000..a4ab487157
--- /dev/null
+++ b/src/systemd-nspawn/mount-setup.c
@@ -0,0 +1 @@
+../libcore/mount-setup.c \ No newline at end of file
diff --git a/src/systemd-nspawn/mount-setup.h b/src/systemd-nspawn/mount-setup.h
new file mode 120000
index 0000000000..1f984851f8
--- /dev/null
+++ b/src/systemd-nspawn/mount-setup.h
@@ -0,0 +1 @@
+../libcore/mount-setup.h \ No newline at end of file