Author: Andreas Beckmann <anbe@debian.org>
Description: we link against libpfm4.so, so don't embed a copy of libpfm4.a
Forwarded: not-needed

--- a/src/Rules.pfm4_pe
+++ b/src/Rules.pfm4_pe
@@ -26,7 +26,7 @@ MISCHDRS += linux-lock.h mb.h papi_libpf
 MISCSRCS += papi_libpfm4_events.c
 SHLIBDEPS = -Bdynamic -L$(PFM_LIB_PATH) -lpfm
 PFM_OBJS=$(shell $(AR) t $(PFM_LIB_PATH)/libpfm.a 2>/dev/null)
-MISCOBJS = $(PFM_OBJS) $(MISCSRCS:.c=.o)
+MISCOBJS = $(MISCSRCS:.c=.o)
 
 ifeq (yes,$(MIC))
 	FORCE_PFM_ARCH="CONFIG_PFMLIB_ARCH_X86=y"
@@ -63,6 +63,7 @@ papi_libpfm4_events.o: papi_libpfm4_even
 
 native_clean:
 	-rm -f $(MISCOBJS)
+	-rm -f $(PFM_OBJS)
 ifneq (,${PFM_ROOT})
 	$(MAKE) -C $(PFM_ROOT) ARCH="$(ARCH)" clean
 endif
--- a/src/components/sde/tests/Makefile
+++ b/src/components/sde/tests/Makefile
@@ -19,7 +19,7 @@ CFLAGS +=-g
 CXXFLAGS +=-g -std=c++11
 
 ifeq ($(BUILD_LIBSDE_SHARED),yes)
-	LDFLAGS += -Llib -L$(datadir) -L$(datadir)/libpfm4/lib -lpapi -lpfm -lsde
+	LDFLAGS += -Llib -L$(datadir) -lpapi -lpfm -lsde
 	LIBSDE=yes
 else ifeq ($(BUILD_LIBSDE_STATIC),yes)
 	LDFLAGS += -Llib $(datadir)/libsde.a -lpapi
@@ -115,7 +115,7 @@ Created_Counter_Test: $(prfx)/Created_Co
 Overflow_Test: $(prfx)/Overflow_Driver.c libCreated_Counter.so
 	$(CC) $< -o $@ $(INCLUDE) $(CFLAGS) $(UTILOBJS) -lCreated_Counter $(LDFLAGS) -lm
 Overflow_Static_Test: $(prfx)/Overflow_Driver.c libCreated_Counter_static.a
-	$(CC) $< -o $@ $(INCLUDE) $(CFLAGS) $(UTILOBJS) lib/libCreated_Counter_static.a $(datadir)/libpapi.a $(datadir)/libsde.a -ldl -lrt
+	$(CC) $< -o $@ $(INCLUDE) $(CFLAGS) $(UTILOBJS) lib/libCreated_Counter_static.a $(datadir)/libpapi.a $(datadir)/libsde.a -lpfm -ldl -lrt
 
 libCreated_Counter++.so: $(prfx)/Lib_With_Created_Counter++.cpp
 	$(CXX) -shared -Wall -fPIC $(CXXFLAGS) $(INCLUDE) -o lib/$@ $^
