summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-04-27 08:40:30 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-04-27 08:40:30 +0200
commit45cd588f12f485d4b3a44b425dcbbcdec5f833db (patch)
tree4a4405a9dcfc2a1118da5384613484830bc06f6b
parentbf265341fea65c31992497338eccfab5bfdf217f (diff)
downloaduca-45cd588f12f485d4b3a44b425dcbbcdec5f833db.tar.gz
uca-45cd588f12f485d4b3a44b425dcbbcdec5f833db.tar.bz2
uca-45cd588f12f485d4b3a44b425dcbbcdec5f833db.tar.xz
uca-45cd588f12f485d4b3a44b425dcbbcdec5f833db.zip
Users don't need uca-cam.h and uca-grabber.h anymore.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--test/benchmark.c3
-rw-r--r--test/control.c1
-rw-r--r--test/enum.c1
-rw-r--r--test/grab-async.c1
-rw-r--r--test/grab.c1
6 files changed, 2 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 39f4ce7..d17e098 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -117,7 +117,7 @@ target_link_libraries(uca ${uca_LIBS})
install(TARGETS uca
LIBRARY DESTINATION lib${LIB_SUFFIX})
-install(FILES ${uca_HDRS}
+install(FILES uca.h
DESTINATION include/uca)
# --- install pkg-config file
diff --git a/test/benchmark.c b/test/benchmark.c
index ae7593a..7a6b6e0 100644
--- a/test/benchmark.c
+++ b/test/benchmark.c
@@ -5,9 +5,8 @@
#include <sys/time.h>
#include <stdio.h>
#include <stdlib.h>
-#include "uca.h"
-#include "uca-cam.h"
+#include "uca.h"
static __suseconds_t time_diff(struct timeval *start, struct timeval *stop)
{
diff --git a/test/control.c b/test/control.c
index ee6d6e7..00bda8c 100644
--- a/test/control.c
+++ b/test/control.c
@@ -4,7 +4,6 @@
#include <string.h>
#include "uca.h"
-#include "uca-cam.h"
typedef struct {
diff --git a/test/enum.c b/test/enum.c
index e9395a5..3a9c59d 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -1,7 +1,6 @@
#include <stdio.h>
#include "uca.h"
-#include "uca-cam.h"
int count_dots(const char *s)
{
diff --git a/test/grab-async.c b/test/grab-async.c
index a6e6e65..c4c270d 100644
--- a/test/grab-async.c
+++ b/test/grab-async.c
@@ -3,7 +3,6 @@
#include <stdlib.h>
#include <unistd.h>
#include "uca.h"
-#include "uca-cam.h"
struct image_props {
uint32_t width;
diff --git a/test/grab.c b/test/grab.c
index b0bd0ee..9f86069 100644
--- a/test/grab.c
+++ b/test/grab.c
@@ -2,7 +2,6 @@
#include <stdio.h>
#include <stdlib.h>
#include "uca.h"
-#include "uca-cam.h"
#define handle_error(errno) {if ((errno) != UCA_NO_ERROR) printf("error at <%s:%i>\n", \
__FILE__, __LINE__);}