From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 26 Jul 2016 15:42:51 +0000 (+0200)
Subject: Move include files to bmusb/.
X-Git-Tag: 0.4.1
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=refs%2Ftags%2F0.4.1;p=bmusb

Move include files to bmusb/.
---

diff --git a/Makefile b/Makefile
index a147176..075aca8 100644
--- 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 c4758f5..ec3eac2 100644
--- 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 93f1470..48dca06 100644
--- 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 9cb2afe..1410ef4 100644
--- 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 f1844cd..a50363a 100644
--- 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;