From 07a6b2968e9090575c6d34fe6e5333b01e89a074 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 28 Aug 2012 15:27:31 +0200 Subject: [PATCH] unbreak "make depend" for shadow builds Change-Id: Ib79ba79e41cfeac9350852395b03c331dc4fe2a3 Reviewed-by: Daniel Teske Reviewed-by: Joerg Bornemann --- qmake/Makefile.unix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 29d1e79..2b76638 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -7,6 +7,7 @@ QMAKESPEC = @QMAKESPEC@ LFLAGS = @QMAKE_LFLAGS@ QMKSRC = $(SOURCE_PATH)/qmake +QMKGENSRC = $(QMKSRC)/generators #qmake code OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ @@ -31,12 +32,18 @@ QOBJS=qtextcodec.o qutfcodec.o qstring.o qstringbuilder.o qtextstream.o qiodevic #all sources, used for the depend target -DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ - generators/unix/unixmake.cpp generators/win32/winmakefile.cpp generators/projectgenerator.cpp \ - generators/mac/pbuilder_pbx.cpp generators/mac/xmloutput.cpp generators/metamakefile.cpp \ - generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \ - generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcxproj.cpp generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msvc_nmake.cpp \ - generators/integrity/gbuild.cpp generators/win32/cesdkhandler.cpp \ +DEPEND_SRC = \ + $(QMKSRC)/main.cpp $(QMKSRC)/project.cpp $(QMKSRC)/option.cpp $(QMKSRC)/property.cpp \ + $(QMKSRC)/meta.cpp \ + $(QMKGENSRC)/makefiledeps.cpp $(QMKGENSRC)/metamakefile.cpp \ + $(QMKGENSRC)/projectgenerator.cpp $(QMKGENSRC)/makefile.cpp \ + $(QMKGENSRC)/unix/unixmake.cpp $(QMKGENSRC)/unix/unixmake2.cpp \ + $(QMKGENSRC)/mac/pbuilder_pbx.cpp $(QMKGENSRC)/integrity/gbuild.cpp \ + $(QMKGENSRC)/win32/winmakefile.cpp \ + $(QMKGENSRC)/win32/mingw_make.cpp $(QMKGENSRC)/win32/msvc_nmake.cpp \ + $(QMKGENSRC)/win32/cesdkhandler.cpp $(QMKGENSRC)/mac/xmloutput.cpp \ + $(QMKGENSRC)/win32/msvc_vcproj.cpp $(QMKGENSRC)/win32/msvc_vcxproj.cpp \ + $(QMKGENSRC)/win32/msvc_objectmodel.cpp $(QMKGENSRC)/win32/msbuild_objectmodel.cpp \ $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \ $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \ $(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp \ -- 2.7.4