blob: 3387dbdcfd6d9680d830f7cbbc30a417b7fc4611 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
This kludgetastic piece of shit solves an out-of-tree-building problem
where qt wants to generate source files into directories that configure
does not create.
I'm not happy with it at all but the other ideas I had were even worse.
Anyone have a better idea of how these directories ought to be
created? I guess the problem is I'm too lazy to try to understand how the
autotools framework hangs together and afraid I'll break stuff that works
if I go after the fundamental problem.
-gmt 1.20.14
diff -urpN vlc-2.1.2.orig/modules/gui/qt4/Modules.am vlc-2.1.2/modules/gui/qt4/Modules.am
--- vlc-2.1.2.orig/modules/gui/qt4/Modules.am 2014-01-20 02:06:35.373304209 -0800
+++ vlc-2.1.2/modules/gui/qt4/Modules.am 2014-01-20 02:06:57.546596397 -0800
@@ -256,11 +256,14 @@ resources.cpp: vlc.qrc $(DEPS_res)
.hpp.moc.cpp:
if HAVE_DARWIN
+ [[ -d $$( dirname $@ ) ]] || mkdir -p $$( dirname $@ ) &> /dev/null ; \
$(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
else
if HAVE_WIN32
+ [[ -d $$( dirname $@ ) ]] || mkdir -p $$( dirname $@ ) &> /dev/null ; \
$(moc_verbose)$(MOC) -D_WIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
else
+ [[ -d $$( dirname $@ ) ]] || mkdir -p $$( dirname $@ ) &> /dev/null ; \
$(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
endif
endif
|
GitWeb
