From e1becc53b27976a358bf2c30d28be85df09a6f59 Mon Sep 17 00:00:00 2001
From: Alan Ott <alan@signal11.us>
Date: Wed, 4 Jul 2012 10:01:54 -0400
Subject: [PATCH] Reference all source files from $(top_srcdir) and built
 libraries from $(top_builddir)

---
 hidtest/Makefile.am | 2 +-
 libusb/Makefile.am  | 4 ++--
 linux/Makefile.am   | 4 ++--
 mac/Makefile.am     | 3 +--
 testgui/Makefile.am | 8 ++++----
 windows/Makefile.am | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/hidtest/Makefile.am b/hidtest/Makefile.am
index 364efe1..d278644 100644
--- a/hidtest/Makefile.am
+++ b/hidtest/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../hidapi/
+AM_CPPFLAGS = -I$(top_srcdir)/hidapi/
 
 ## Linux
 if OS_LINUX
diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index c821e38..f7c53a4 100644
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../hidapi $(CFLAGS_LIBUSB)
+AM_CPPFLAGS = -I$(top_srcdir)/hidapi $(CFLAGS_LIBUSB)
 
 if OS_LINUX
 lib_LTLIBRARIES = libhidapi-libusb.la
@@ -15,4 +15,4 @@ libhidapi_la_LIBADD = $(LIBS_LIBUSB)
 endif
 
 hdrdir = $(includedir)/hidapi
-hdr_HEADERS = $(srcdir)/../hidapi/hidapi.h
+hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
diff --git a/linux/Makefile.am b/linux/Makefile.am
index 4494710..640adc1 100644
--- a/linux/Makefile.am
+++ b/linux/Makefile.am
@@ -1,8 +1,8 @@
 lib_LTLIBRARIES = libhidapi-hidraw.la
 libhidapi_hidraw_la_SOURCES = hid.c
 libhidapi_hidraw_la_LDFLAGS = $(LTLDFLAGS)
-AM_CPPFLAGS = -I$(srcdir)/../hidapi/ $(CFLAGS_HIDRAW)
+AM_CPPFLAGS = -I$(top_srcdir)/hidapi/ $(CFLAGS_HIDRAW)
 libhidapi_hidraw_la_LIBADD = $(LIBS_HIDRAW)
 
 hdrdir = $(includedir)/hidapi
-hdr_HEADERS = $(srcdir)/../hidapi/hidapi.h
+hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
diff --git a/mac/Makefile.am b/mac/Makefile.am
index e9dcb6b..bf1f689 100644
--- a/mac/Makefile.am
+++ b/mac/Makefile.am
@@ -2,7 +2,6 @@ lib_LTLIBRARIES = libhidapi.la
 libhidapi_la_SOURCES = hid.c
 libhidapi_la_LDFLAGS = $(LTLDFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/hidapi/
-#libhidapi_la_LIBADD = $(LIBS_HIDRAW)
 
 hdrdir = $(includedir)/hidapi
-hdr_HEADERS = ../hidapi/hidapi.h
+hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
diff --git a/testgui/Makefile.am b/testgui/Makefile.am
index f59847d..6d2d006 100644
--- a/testgui/Makefile.am
+++ b/testgui/Makefile.am
@@ -1,21 +1,21 @@
 
-AM_CPPFLAGS = -I$(srcdir)/../hidapi/ $(CFLAGS_TESTGUI)
+AM_CPPFLAGS = -I$(top_srcdir)/hidapi/ $(CFLAGS_TESTGUI)
 
 if OS_LINUX
 ## Linux
 bin_PROGRAMS = hidapi-hidraw-testgui hidapi-libusb-testgui
 
 hidapi_hidraw_testgui_SOURCES = test.cpp
-hidapi_hidraw_testgui_LDADD = $(srcdir)/../linux/libhidapi-hidraw.la $(LIBS_TESTGUI)
+hidapi_hidraw_testgui_LDADD = $(top_builddir)/linux/libhidapi-hidraw.la $(LIBS_TESTGUI)
 
 hidapi_libusb_testgui_SOURCES = test.cpp
-hidapi_libusb_testgui_LDADD = $(srcdir)/../libusb/libhidapi-libusb.la $(LIBS_TESTGUI)
+hidapi_libusb_testgui_LDADD = $(top_builddir)/libusb/libhidapi-libusb.la $(LIBS_TESTGUI)
 else
 ## Other OS's
 bin_PROGRAMS = hidapi-testgui
 
 hidapi_testgui_SOURCES = test.cpp
-hidapi_testgui_LDADD = $(srcdir)/../$(backend)/libhidapi.la $(LIBS_TESTGUI)
+hidapi_testgui_LDADD = $(top_builddir)/$(backend)/libhidapi.la $(LIBS_TESTGUI)
 endif
 
 if OS_DARWIN
diff --git a/windows/Makefile.am b/windows/Makefile.am
index 025d595..947b529 100644
--- a/windows/Makefile.am
+++ b/windows/Makefile.am
@@ -1,11 +1,11 @@
 lib_LTLIBRARIES = libhidapi.la
 libhidapi_la_SOURCES = hid.c
 libhidapi_la_LDFLAGS = $(LTLDFLAGS)
-AM_CPPFLAGS = -I$(srcdir)/../hidapi/
+AM_CPPFLAGS = -I$(top_srcdir)/hidapi/
 libhidapi_la_LIBADD = $(LIBS)
 
 hdrdir = $(includedir)/hidapi
-hdr_HEADERS = $(srcdir)/../hidapi/hidapi.h
+hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
 
 EXTRA_DIST = \
   ddk_build \