aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2012-10-14 13:48:37 +0200
committerGregor Jasny <gjasny@googlemail.com>2012-10-14 13:50:01 +0200
commit6adf5f5adf800b6be43f945a298c3965398feb9f (patch)
tree42f49f87004fa8ddb81a8955a66967b757f74aee
parenta2c30c488607084e1aaa2ad6e0be3f61794f328c (diff)
buildsystem: Generate Makefile in lib and utils dir, too
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
-rw-r--r--Makefile.am34
-rw-r--r--configure.ac3
-rw-r--r--contrib/Makefile.am4
-rw-r--r--lib/Makefile.am7
-rw-r--r--utils/Makefile.am26
5 files changed, 42 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am
index d6aea36c..3a1fef18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,40 +1,10 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = \
- lib/libv4lconvert \
- lib/libv4l2 \
- lib/libv4l1 \
- lib/libdvbv5 \
- lib/libv4l2rds
+SUBDIRS = lib
if WITH_V4LUTILS
-SUBDIRS += \
- utils/dvb \
- utils/libv4l2util \
- utils/libmedia_dev \
- utils/decode_tm6000 \
- utils/keytable \
- utils/v4l2-compliance \
- utils/v4l2-ctl \
- utils/v4l2-dbg \
- utils/v4l2-sysfs-path \
- utils/rds-ctl
-
-if LINUX_OS
-SUBDIRS += \
- utils/xc3028-firmware \
- contrib/test
-
-if HAVE_LINUX_I2C_DEV
-SUBDIRS += \
- utils/rds
-endif
-endif
-
-if WITH_QV4L2
-SUBDIRS += utils/qv4l2
-endif
+SUBDIRS += utils contrib
endif
EXTRA_DIST = contrib include README.lib README.lib-multi-threading
diff --git a/configure.ac b/configure.ac
index c1068788..fc5d4e25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,12 +10,14 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([lib/libv4l2/libv4l2.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile
+ lib/Makefile
lib/libv4lconvert/Makefile
lib/libv4l2/Makefile
lib/libv4l1/Makefile
lib/libdvbv5/Makefile
lib/libv4l2rds/Makefile
+ utils/Makefile
utils/libv4l2util/Makefile
utils/libmedia_dev/Makefile
utils/decode_tm6000/Makefile
@@ -30,6 +32,7 @@ AC_CONFIG_FILES([Makefile
utils/qv4l2/Makefile
utils/rds-ctl/Makefile
+ contrib/Makefile
contrib/freebsd/Makefile
contrib/test/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 00000000..fb6d9b21
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,4 @@
+if LINUX_OS
+SUBDIRS = test
+endif
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 00000000..1bbf5c05
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = \
+ libv4lconvert \
+ libv4l2 \
+ libv4l1 \
+ libdvbv5 \
+ libv4l2rds
+
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 00000000..5ee99db6
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,26 @@
+SUBDIRS = \
+ dvb \
+ libv4l2util \
+ libmedia_dev \
+ decode_tm6000 \
+ keytable \
+ v4l2-compliance \
+ v4l2-ctl \
+ v4l2-dbg \
+ v4l2-sysfs-path \
+ rds-ctl
+
+if LINUX_OS
+SUBDIRS += \
+ xc3028-firmware
+
+if HAVE_LINUX_I2C_DEV
+SUBDIRS += \
+ rds
+endif
+endif
+
+if WITH_QV4L2
+SUBDIRS += qv4l2
+endif
+

Privacy Policy