libv4l: remove .orig and .rej files on make clean and simplify make export

From: Hans de Goede <hdegoede@redhat.com>

libv4l: remove .orig and .rej files on make clean and simplify make export

Priority: normal

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/lib/Makefile b/lib/Makefile
index a607bc7..79cc40b 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -13,10 +13,5 @@ clean:
        $(MAKE) -C libv4l1 V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
 
 export: clean
-       mkdir /tmp/libv4l-$(V4L2_LIB_VERSION)
-       cp -a . /tmp/libv4l-$(V4L2_LIB_VERSION)/
-       cd /tmp/ && \
-               tar cvf /tmp/libv4l-$(V4L2_LIB_VERSION).tar\
-               libv4l-$(V4L2_LIB_VERSION)
-       gzip /tmp/libv4l-$(V4L2_LIB_VERSION).tar
-       rm -rf /tmp/libv4l-$(V4L2_LIB_VERSION)
+       tar --transform s/^\./libv4l-$(V4L2_LIB_VERSION)/g -zcvf \
+               /tmp/libv4l-$(V4L2_LIB_VERSION).tar.gz .

diff --git a/lib/libv4l1/Makefile b/lib/libv4l1/Makefile
index 80ba282..9f30cbb 100644 (file)
--- a/lib/libv4l1/Makefile
+++ b/lib/libv4l1/Makefile
@@ -69,7 +69,7 @@ endif
        install -m 644 libv4l1.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 
 clean::
-       rm -f *.a *.so* *.o *.d libv4l1.pc log *~
+       rm -f *.a *.so* *.o *.d libv4l1.pc log *~ *.orig *.rej
 
 %.o: %.c
        $(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $<

diff --git a/lib/libv4l2/Makefile b/lib/libv4l2/Makefile
index bb9e407..614b36c 100644 (file)
--- a/lib/libv4l2/Makefile
+++ b/lib/libv4l2/Makefile
@@ -68,7 +68,7 @@ endif
        install -m 644 libv4l2.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 
 clean::
-       rm -f *.a *.so* *.o *.d libv4l2.pc log *~
+       rm -f *.a *.so* *.o *.d libv4l2.pc log *~ *.orig *.rej
 
 %.o: %.c
        $(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $<

diff --git a/lib/libv4lconvert/Makefile b/lib/libv4lconvert/Makefile
index 22c512c..16ff2e1 100644 (file)
--- a/lib/libv4lconvert/Makefile
+++ b/lib/libv4lconvert/Makefile
@@ -57,7 +57,7 @@ endif
        install -m 644 libv4lconvert.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 
 clean::
-       rm -f *.a *.so* *.o *.d libv4lconvert.pc log *~
+       rm -f *.a *.so* *.o *.d libv4lconvert.pc log *~ *.orig *.rej
 
 %.o: %.c
        $(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $<