sb118: introduced AUGMENT_LIBRARY_PATH_LOCAL, used by CPPUNITTESTER so that tests within a module pick up shared libs from that module in the local output tree

2 files changed, 4 insertions, 22 deletions

diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 94be97c81038..36b540231188 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -78,16 +78,10 @@ SHL1OBJS=  \
     $(SLO)$/linetest.obj		\
     $(SLO)$/masktest.obj		\
     $(SLO)$/polytest.obj		\
-    $(SLO)$/tools.obj		    \
-    $(SLO)$/bitmapdevice.obj    \
-    $(SLO)$/debug.obj			\
-    $(SLO)$/polypolygonrenderer.obj
-# last three objs are a bit of a hack: cannot link against LIBBASEBMP
-# here, because not yet delivered. Need the functionality to test, so
-# we're linking it in statically. Need to keep this in sync with
-# source/makefile.mk
+    $(SLO)$/tools.obj
 SHL1TARGET= tests
-SHL1STDLIBS= 	$(SALLIB)		 \
+SHL1STDLIBS=    $(BASEBMPLIB) \
+                $(SALLIB)		 \
                 $(CPPUNITLIB)	 \
                 $(BASEGFXLIB)
 
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index fd9633ab6f2d..be6e537ba25a 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -48,21 +48,9 @@ SHL1OBJS=  \
     $(SLO)$/basegfx3d.obj \
     $(SLO)$/testtools.obj
 
-# linking statically against basegfx parts
-SHL1LIBS=\
-    $(SLB)$/curve.lib	\
-    $(SLB)$/matrix.lib	\
-    $(SLB)$/numeric.lib	\
-    $(SLB)$/point.lib	\
-    $(SLB)$/polygon.lib	\
-    $(SLB)$/range.lib	\
-    $(SLB)$/tuple.lib	\
-    $(SLB)$/tools.lib	\
-    $(SLB)$/color.lib	\
-    $(SLB)$/vector.lib
-
 SHL1TARGET= basegfx_tests
 SHL1STDLIBS= \
+                $(BASEGFXLIB) \
                 $(SALLIB)        \
                 $(CPPUHELPERLIB) \
                         $(CPPULIB)       \