-LINKAGE = @LT_LIB_LINKAGE@
-
-NT_DYN_TEST_DEFS = -DLIBLBER_DECL=dllimport
-
-# Extras for building the library
-EXTRA_DEFS = $(@PLAT@_@LIB_LINKAGE@_LIB_DEFS)
-EXTRA_LIBS =
-
-# Only the test programs will pick up these defs.
-CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
-
-dtest: $(LIBRARY) dtest.o
- $(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS)
-etest: $(LIBRARY) etest.o
- $(LTLINK) $(LDFLAGS) -o $@ etest.o $(LIBS)
-idtest: $(LIBRARY) idtest.o
- $(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS)
+dtest: $(XLIBS) dtest.o
+ $(LTLINK) -o $@ dtest.o $(LIBS)
+etest: $(XLIBS) etest.o
+ $(LTLINK) -o $@ etest.o $(LIBS)
+idtest: $(XLIBS) idtest.o
+ $(LTLINK) -o $@ idtest.o $(LIBS)