1 files changed, 17 insertions, 8 deletions

diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index 1e5a297f79..d9ead7072d 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -58,11 +58,28 @@ all: $(BINARY)
 OBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(notdir $(SOURCES))))
 LIBOBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(notdir $(LIBSOURCES))))
 
+# additional link dependencies for the standalone executable
+# extra dependencies: libucl
+LIBUCL = libucl$(RBARCH).a
+$(LIBUCL): $(OBJDIR)$(LIBUCL)
+
+$(OBJDIR)$(LIBUCL):
+        $(SILENT)$(MAKE) -C $(TOP)/../tools/ucl/src TARGET_DIR=$(OBJDIR) $@
+
+# building the standalone executable
+$(BINARY): $(OBJS) $(EXTRADEPS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS))
+        @echo LD $@
+#       $(SILENT)mkdir -p $(dir $@)
+# EXTRADEPS need to be built into OBJDIR.
+        $(SILENT)$(CROSS)$(CC) $(CFLAGS) -o $(BINARY) $(OBJS) $(addprefix $(OBJDIR),$(EXTRADEPS)) $(addprefix $(OBJDIR),$(EXTRALIBOBJS))
+
+# common rules
 $(OBJDIR)%.o: %.c
         @echo CC $<
         $(SILENT)mkdir -p $(dir $@)
         $(SILENT)$(CROSS)$(CC) $(CFLAGS) -c -o $@ $<
 
+# lib rules
 lib$(OUTPUT)$(RBARCH).a: $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a
 lib$(OUTPUT)$(RBARCH): $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a
 
@@ -71,14 +88,6 @@ $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALI
         $(SILENT)mkdir -p $(dir $@)
         $(SILENT)$(AR) rucs $@ $^
 
-
-# building the standalone executable
-$(BINARY): $(OBJS) $(EXTRADEPS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS))
-        @echo LD $@
-#       $(SILENT)mkdir -p $(dir $@)
-# EXTRADEPS need to be built into OBJDIR.
-        $(SILENT)$(CROSS)$(CC) $(CFLAGS) -o $(BINARY) $(OBJS) $(addprefix $(OBJDIR),$(EXTRADEPS)) $(addprefix $(OBJDIR),$(EXTRALIBOBJS))
-
 # some trickery to build ppc and i386 from a single call
 ifeq ($(RBARCH),)
 $(TARGET_DIR)lib$(OUTPUT)i386.a: