summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-01-13 19:12:16 +0100
committerTom Gundersen <teg@jklm.no>2014-01-13 21:06:08 +0100
commitc813ca40c859ff8abc8bc6aabc3f1e896623eb67 (patch)
tree63f4b52985f7f14b19ecdcb8215b18ade86b128d /src
parent6bb648a16ae4a682ad4784412af706d2e6a3e4da (diff)
libsystemd-dhcp: merge into libsystemd
Diffstat (limited to 'src')
l---------src/libsystemd-dhcp/Makefile1
-rw-r--r--src/libsystemd/dhcp-internal.h (renamed from src/libsystemd-dhcp/dhcp-internal.h)0
-rw-r--r--src/libsystemd/dhcp-network.c (renamed from src/libsystemd-dhcp/dhcp-network.c)0
-rw-r--r--src/libsystemd/dhcp-option.c (renamed from src/libsystemd-dhcp/dhcp-option.c)0
-rw-r--r--src/libsystemd/dhcp-protocol.h (renamed from src/libsystemd-dhcp/dhcp-protocol.h)0
-rw-r--r--src/libsystemd/sd-dhcp-client.c (renamed from src/libsystemd-dhcp/dhcp-client.c)0
-rw-r--r--src/libsystemd/test-dhcp-client.c (renamed from src/libsystemd-dhcp/test-dhcp-client.c)0
-rw-r--r--src/libsystemd/test-dhcp-option.c (renamed from src/libsystemd-dhcp/test-dhcp-option.c)0
8 files changed, 0 insertions, 1 deletions
diff --git a/src/libsystemd-dhcp/Makefile b/src/libsystemd-dhcp/Makefile
deleted file mode 120000
index d0b0e8e008..0000000000
--- a/src/libsystemd-dhcp/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile \ No newline at end of file
diff --git a/src/libsystemd-dhcp/dhcp-internal.h b/src/libsystemd/dhcp-internal.h
index 43b5b1d000..43b5b1d000 100644
--- a/src/libsystemd-dhcp/dhcp-internal.h
+++ b/src/libsystemd/dhcp-internal.h
diff --git a/src/libsystemd-dhcp/dhcp-network.c b/src/libsystemd/dhcp-network.c
index b2de67e8a7..b2de67e8a7 100644
--- a/src/libsystemd-dhcp/dhcp-network.c
+++ b/src/libsystemd/dhcp-network.c
diff --git a/src/libsystemd-dhcp/dhcp-option.c b/src/libsystemd/dhcp-option.c
index 4d45b3b3a4..4d45b3b3a4 100644
--- a/src/libsystemd-dhcp/dhcp-option.c
+++ b/src/libsystemd/dhcp-option.c
diff --git a/src/libsystemd-dhcp/dhcp-protocol.h b/src/libsystemd/dhcp-protocol.h
index 76621f541b..76621f541b 100644
--- a/src/libsystemd-dhcp/dhcp-protocol.h
+++ b/src/libsystemd/dhcp-protocol.h
diff --git a/src/libsystemd-dhcp/dhcp-client.c b/src/libsystemd/sd-dhcp-client.c
index edfcb54a4c..edfcb54a4c 100644
--- a/src/libsystemd-dhcp/dhcp-client.c
+++ b/src/libsystemd/sd-dhcp-client.c
diff --git a/src/libsystemd-dhcp/test-dhcp-client.c b/src/libsystemd/test-dhcp-client.c
index 929b869ec3..929b869ec3 100644
--- a/src/libsystemd-dhcp/test-dhcp-client.c
+++ b/src/libsystemd/test-dhcp-client.c
diff --git a/src/libsystemd-dhcp/test-dhcp-option.c b/src/libsystemd/test-dhcp-option.c
index ac0b0a435a..ac0b0a435a 100644
--- a/src/libsystemd-dhcp/test-dhcp-option.c
+++ b/src/libsystemd/test-dhcp-option.c