make sure we build against local headers and link against local libs

test/Rules.mak

@@ -77,7 +77,7 @@ endif
 XWARNINGS      := $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes
 XARCH_CFLAGS   := $(subst ",, $(strip $(ARCH_CFLAGS)))
 XCOMMON_CFLAGS := -D_GNU_SOURCE -I$(top_builddir)test
-CFLAGS         := $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS)
+CFLAGS         := $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -I$(top_builddir)include
 HOST_CFLAGS    += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS)
 
 ifeq ($(DODEBUG),y)
@@ -94,7 +94,7 @@ ifneq ($(strip $(HAVE_SHARED)),y)
 	LDFLAGS       += -static
 	HOST_LDFLAGS  += -static
 endif
-LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib
+LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib
 
 
 # Filter output