[CRIU] [crtools-bot] make: Link parasite.o and util-net.o

[Cyrill Gorcunov]

The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit aa19c22e85f282c234542524f3b2d9a2fe42d785
Author: Andrey Vagin <avagin at openvz.org>
Date:   Wed Feb 1 13:00:52 2012 +0300

    make: Link parasite.o and util-net.o
    
    Signed-off-by: Andrey Vagin <avagin at openvz.org>
    Acked-by: Pavel Emelyanov <xemul at parallels.com>
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 Makefile   |    8 ++++++--
 parasite.c |    2 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ab67166..3cbef29 100644
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,13 @@ $(OBJS-BLOB): $(SRCS-BLOB)
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) -fpic $< -o $@
 
-$(HEAD-BIN): $(OBJS-BLOB) $(HEAD-LDS)
+parasite-util-net.o: util-net.c
+	$(E) "  CC      " $@
+	$(Q) $(CC) -c $(CFLAGS) -fpic $< -o $@
+
+$(HEAD-BIN): $(HEAD-LDS) $(OBJS-BLOB) parasite-util-net.o
 	$(E) "  GEN     " $@
-	$(Q) $(LD) -T $(patsubst %.bin,%.lds.S,$@) $< -o $@
+	$(Q) $(LD) -T $^ -o $@
 
 $(HEAD-BLOB-GEN): $(HEAD-BIN)
 	$(E) "  GEN     " $@
diff --git a/parasite.c b/parasite.c
index f1a2acb..ad60f1a 100644
--- a/parasite.c
+++ b/parasite.c
@@ -437,8 +437,6 @@ static void __parasite_head __used parasite_head(void)
 		     ".long 0									\n\t");
 }
 
-#include "util-net.c"
-
 #else /* CONFIG_X86_64 */
 # error x86-32 bit mode not yet implemented
 #endif /* CONFIG_X86_64 */