v4l2-apps: move libraries around to make the directory tree flatter

From: Hans Verkuil <hverkuil@xs4all.nl>

Instead of having libv4l2util in v4l2-apps/lib and libv4l in v4l2-apps/lib/libv4l,
both are now moved to v4l2-apps/libv4l2util and v4l2-apps/libv4l.

This is much cleaner and less confusing.

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

1 files changed, 83 insertions, 0 deletions

diff --git a/v4l2-apps/libv4l/libv4l1/Makefile b/v4l2-apps/libv4l/libv4l1/Makefile
new file mode 100644
index 000000000..27848477e
--- /dev/null
+++ b/v4l2-apps/libv4l/libv4l1/Makefile
@@ -0,0 +1,83 @@
+override CPPFLAGS += -I../include -I../../../include -fvisibility=hidden
+
+CFLAGS := -g -O1
+CFLAGS += -Wall -Wno-unused -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
+
+LIBS = -lpthread
+
+V4L1_OBJS     = libv4l1.o log.o
+V4L1COMPAT    = v4l1compat.so
+V4L1COMPAT_O  = v4l1compat.o libv4l1.so
+TARGETS       = $(V4L1_LIB) libv4l1.pc
+INCLUDES      = ../include/libv4l1.h
+
+ifeq ($(LINKTYPE),static)
+V4L1_LIB      = libv4l1.a
+else
+V4L1_LIB      = libv4l1.so
+V4L1_OBJS    += ../libv4l2/libv4l2.so
+TARGETS      += $(V4L1COMPAT)
+override CPPFLAGS += -fPIC
+endif
+
+ifeq ($(LIB_RELEASE),)
+LIB_RELEASE = 0
+endif
+
+ifeq ($(PREFIX),)
+PREFIX = /usr/local
+endif
+
+ifeq ($(LIBDIR),)
+LIBDIR = $(PREFIX)/lib
+endif
+
+all: $(TARGETS)
+
+
+$(V4L1_LIB): $(V4L1_OBJS)
+
+$(V4L1COMPAT): $(V4L1COMPAT_O) $(V4L1_LIB)
+
+libv4l1.pc:
+	@echo prefix=$(PREFIX) > libv4l1.pc
+	@echo libdir=$(LIBDIR) >> libv4l1.pc
+	@echo >> libv4l1.pc
+	@echo 'Name: libv4l1' >> libv4l1.pc
+	@echo 'Description: v4l1 compatibility library' >> libv4l1.pc
+	@echo 'Version: '$(V4L2_LIB_VERSION) >> libv4l1.pc
+	@echo 'Requires: libv4l2' >> libv4l1.pc
+	@echo 'Libs: -L$${libdir} -lv4l1' >> libv4l1.pc
+	@echo 'Libs.private: -lpthread' >> libv4l1.pc
+	@echo 'Cflags: -I$${prefix}/include' >> libv4l1.pc
+
+install: all
+	mkdir -p $(DESTDIR)$(PREFIX)/include
+	install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include
+ifeq ($(LINKTYPE),static)
+	mkdir -p $(DESTDIR)$(LIBDIR)
+	install -m 644 $(V4L1_LIB) $(DESTDIR)$(LIBDIR)
+else
+	mkdir -p $(DESTDIR)$(LIBDIR)/libv4l
+	install -m 755 $(V4L1_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR)
+	cd $(DESTDIR)$(LIBDIR) && \
+	  ln -f -s $(V4L1_LIB).$(LIB_RELEASE) $(V4L1_LIB)
+	install -m 755 $(V4L1COMPAT).$(LIB_RELEASE) \
+	  $(DESTDIR)$(LIBDIR)/libv4l/$(V4L1COMPAT)
+endif
+	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+	install -m 644 libv4l1.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+
+clean::
+	rm -f *.a *.so* *.o *.d libv4l1.pc log *~
+
+%.o: %.c
+	$(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $<
+
+%.so:
+	$(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS)
+	ln -f -s $@.$(LIB_RELEASE) $@
+
+%.a:
+	$(AR) cqs $@ $^
+