Merge branch 'master' of ssh://git.samba.org/data/git/samba

[kai/samba.git] / source3 / samba4-templates.mk

diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk
index 154c3aabda7487be63f981b8e017f16ca113232b..0024a7531f3d83157d328d2bba1fadb73b7c790d 100644 (file)
--- a/source3/samba4-templates.mk
+++ b/source3/samba4-templates.mk
@@ -19,28 +19,27 @@ endef
 # Link a binary
 # Arguments: target file, depends, flags
 define binary_link_template
-$(1)4: $(2) $(LIBREPLACE_OBJ) ;
+$(1)4: $(2) ;
        @echo Linking $$@
-       @$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)  $$(LIBS) $$(LIBREPLACE_OBJ)
+       @$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)  $$(LIBS)
 clean::
        @rm -f $(1)
 
-binaries:: $(1)
-
+everything:: $(1)4
 
 endef
 
 # Link a host-machine binary
 # Arguments: target file, depends, flags
 define host_binary_link_template
-$(1)4: $(2) $(LIBREPLACE_OBJ) ;
+$(1)4: $(2) ;
        @echo Linking $$@
-       @$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3) $$(LIBREPLACE_OBJ)
+       @$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
 
 clean::
        rm -f $(1)
 
-binaries:: $(1)
+binaries:: $(1)4
 
 
 endef
@@ -91,7 +90,7 @@ $(4): $(1)
 endif
 
 ifneq ($(notdir $(1)),$(notdir $(5)))
-$(5): $(1)
+$(5): $(1) $(4)
        @echo "Creating symbolic link for $$@"
        @ln -fs $$(<F) $$@
 endif