Move include files to bmusb/.

diff --git a/Makefile b/Makefile
index a14717685bba25c761c1bc090c2f01d29f732f67..075aca8d8fc83837318e991f047371a03010c074 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS := -std=gnu++14 -O2 -Wall -g $(shell pkg-config libusb-1.0 --cflags) -pthread
+CXXFLAGS := -std=gnu++14 -O2 -Wall -I. -g $(shell pkg-config libusb-1.0 --cflags) -pthread
 LDFLAGS := $(shell pkg-config libusb-1.0 --libs) -pthread
 AR := ar
 RANLIB := ranlib
@@ -24,6 +24,6 @@ install: all
                $(DESTDIR)$(PREFIX)/lib/pkgconfig \
                $(DESTDIR)$(PREFIX)/include/bmusb
        $(INSTALL) -m 755 -o root -g root $(LIB) $(DESTDIR)$(PREFIX)/lib
-       $(INSTALL) -m 755 -o root -g root bmusb.h fake_capture.h $(DESTDIR)$(PREFIX)/include/bmusb
+       $(INSTALL) -m 755 -o root -g root bmusb/bmusb.h bmusb/fake_capture.h $(DESTDIR)$(PREFIX)/include/bmusb
        $(INSTALL) -m 644 -o root -g root bmusb.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig
 

diff --git a/bmusb.cpp b/bmusb.cpp
index c4758f5eaa7a0c9c5bb8fe1e74b81c17ee255c14..ec3eac2918313e36258649357f7f27385f42a111 100644 (file)
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -21,7 +21,7 @@
 #if HAS_MULTIVERSIONING
 #include <immintrin.h>
 #endif
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 
 #include <algorithm>
 #include <atomic>

diff --git a/bmusb.h b/bmusb/bmusb.h
similarity index 100%
rename from bmusb.h
rename to bmusb/bmusb.h

diff --git a/fake_capture.h b/bmusb/fake_capture.h
similarity index 99%
rename from fake_capture.h
rename to bmusb/fake_capture.h
index 93f1470fd88cedc86870cac4239d6cdf2c96c90b..48dca063ae7d6b18e21e3554478b4aa1532f1000 100644 (file)
--- a/fake_capture.h
+++ b/bmusb/fake_capture.h
@@ -5,7 +5,7 @@
 #include <functional>
 #include <string>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 
 namespace bmusb {
 

diff --git a/fake_capture.cpp b/fake_capture.cpp
index 9cb2afe5b3c8a03e31db562da632924b2e53189b..1410ef4b753960b3482920236e35c2a2c845109e 100644 (file)
--- a/fake_capture.cpp
+++ b/fake_capture.cpp
@@ -1,7 +1,7 @@
 // A fake capture device that sends single-color frames at a given rate.
 // Mostly useful for testing themes without actually hooking up capture devices.
 
-#include "fake_capture.h"
+#include "bmusb/fake_capture.h"
 
 #include <assert.h>
 #include <stdint.h>
@@ -15,7 +15,7 @@
 #endif
 #include <cstddef>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 
 #define FRAME_SIZE (8 << 20)  // 8 MB.
 

diff --git a/main.cpp b/main.cpp
index f1844cd2405b9ee6aeb58a592723a572dfceeefb..a50363ab8cab6286df19f4237786c5d510c0fe62 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <unistd.h>
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 
 using namespace std;
 using namespace bmusb;