diff --git a/src/xpdev/GNUmakefile b/src/xpdev/GNUmakefile
index 7b6cfb8bd2def5204c758335f5cbf49c36f78062..b3f687c80ef9fb3b9c26fa10f0955c8e4e3f5beb 100644
--- a/src/xpdev/GNUmakefile
+++ b/src/xpdev/GNUmakefile
@@ -27,7 +27,7 @@ endif
 # Executable Build Rule
 $(WRAPTEST): $(OBJODIR)/wraptest.o $(DEPS)
 	@echo Linking $@
-	$(QUIET)$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^ $(LIBS)
+	$(QUIET)$(CC) -o $@ $(LDFLAGS) $(MT_LDFLAGS) $^ $(XPDEV-MT_LIBS)
 
 $(XPDEV_LIB_BUILD): $(OBJODIR) $(OBJS)
 	@echo Creating $@
diff --git a/src/xpdev/targets.mk b/src/xpdev/targets.mk
index 2fc922e7498cbdbb6b90482b505d28101f2df61e..bcbd824bb346e9a6cfd047a0a01227f8881b3dce 100644
--- a/src/xpdev/targets.mk
+++ b/src/xpdev/targets.mk
@@ -26,3 +26,4 @@ mtlib:	$(MTOBJODIR) $(LIBODIR) $(XPDEV-MT_LIB_BUILD)
 
 dl-mtlib: $(MTOBJODIR) $(LIBODIR) $(XPDEV-MT_SHLIB_BUILD)
 
+$(WRAPTEST): $(XPDEV-MT_LIB_BUILD)