1From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001
2From: Daniel Gomez <dagmcr@gmail.com>
3Date: Sun, 17 Jan 2021 23:33:19 +0100
4Subject: [PATCH 2/2] zbarcam: Create subdir in Makefile
5
6Create builddir/zbarcam when --with-qt5 is enabled.
7
8Fixes the following error:
9
10moc -i -Izbarcam -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB
11-DQT_CORE_LIB
12-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets
13-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtX11Extras
14-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui
15-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore
16-I../git/include ../git/zbarcam/zbarcam-qt.cpp -o
17zbarcam/moc_zbarcam_qt.h
18moc: Cannot create zbarcam/moc_zbarcam_qt.h
19make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1
20
21Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
22---
23Upstream-Status: Pending
24
25 zbarcam/Makefile.am.inc | 1 +
26 1 file changed, 1 insertion(+)
27
28diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc
29index b6de82c..e90c50c 100644
30--- a/zbarcam/Makefile.am.inc
31+++ b/zbarcam/Makefile.am.inc
32@@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h
33
34
35 zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp
36+	@$(mkdir_p) zbarcam 2>/dev/null
37 	$(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@
38 endif
39
40--
412.29.2
42
43