mirror of
https://github.com/RPCS3/hidapi.git
synced 2026-07-19 13:34:37 -04:00
Reference all source files from $(top_srcdir) and built libraries
from $(top_builddir)
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
AM_CPPFLAGS = -I$(srcdir)/../hidapi/
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/hidapi/
|
||||
|
||||
## Linux
|
||||
if OS_LINUX
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+1
-2
@@ -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
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
+2
-2
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user