diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-04-07 15:25:44 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-04-07 15:25:44 +0000 |
commit | 4a008047988954e8ab80c74ab18f4e7b2ba4d478 (patch) | |
tree | 0bab402e9ea0316c32f192c84ea53c49f8847337 | |
parent | cfc2ab9cff9f7ef281293efeeb8cdbe1e03ac499 (diff) | |
download | build-4a008047988954e8ab80c74ab18f4e7b2ba4d478.tar.gz build-4a008047988954e8ab80c74ab18f4e7b2ba4d478.tar.bz2 build-4a008047988954e8ab80c74ab18f4e7b2ba4d478.tar.xz build-4a008047988954e8ab80c74ab18f4e7b2ba4d478.zip |
Two minor changes, first off the c and cpp requires rules both ignore missing
files and treat them as inputs that we just haven't generated yet. I think this
is a better assumption overall and will prevent most files from dying on deps.
Second, a change to the qt4 include overrides the normal exe rule and
substitutes one that also includes all .h files in it's inputs, only to ignore
them in the build profile at the last second. This means that all generated
.h files will also be deleted. It's the best solution until I figure out a
way to fix this in the build core.
-rw-r--r-- | share/autoinclude/general-rules.bld | 4 | ||||
-rw-r--r-- | share/include/qt4.bld | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/share/autoinclude/general-rules.bld b/share/autoinclude/general-rules.bld index 0e6c735..d568e11 100644 --- a/share/autoinclude/general-rules.bld +++ b/share/autoinclude/general-rules.bld | |||
@@ -86,7 +86,7 @@ rule "cpp" | |||
86 | { | 86 | { |
87 | input "*.cpp"; | 87 | input "*.cpp"; |
88 | output INPUT.cppToObj(); | 88 | output INPUT.cppToObj(); |
89 | requires getMakeDeps("${CXX} ${CXXFLAGS} -M ${INPUT}"); | 89 | requires getMakeDeps("${CXX} ${CXXFLAGS} -M -MG ${INPUT}"); |
90 | profile "build" | 90 | profile "build" |
91 | { | 91 | { |
92 | execute("${CXX} ${CXXFLAGS} -c -o ${OUTPUT} ${INPUT}", "g++"); | 92 | execute("${CXX} ${CXXFLAGS} -c -o ${OUTPUT} ${INPUT}", "g++"); |
@@ -98,7 +98,7 @@ rule "c" | |||
98 | { | 98 | { |
99 | input "*.c"; | 99 | input "*.c"; |
100 | output INPUT.cToObj(); | 100 | output INPUT.cToObj(); |
101 | requires getMakeDeps("${CC} ${CFLAGS} -M ${INPUT}"); | 101 | requires getMakeDeps("${CC} ${CFLAGS} -M -MG ${INPUT}"); |
102 | profile "build" | 102 | profile "build" |
103 | { | 103 | { |
104 | execute("${CC} ${CFLAGS} -c -o ${OUTPUT} ${INPUT}"); | 104 | execute("${CC} ${CFLAGS} -c -o ${OUTPUT} ${INPUT}"); |
diff --git a/share/include/qt4.bld b/share/include/qt4.bld index a5a7867..6d95ac8 100644 --- a/share/include/qt4.bld +++ b/share/include/qt4.bld | |||
@@ -151,3 +151,15 @@ rule "qt_moc" | |||
151 | } | 151 | } |
152 | } | 152 | } |
153 | 153 | ||
154 | rule "exe" | ||
155 | { | ||
156 | input regex(".*\\.(h|o)"); | ||
157 | profile "build" | ||
158 | { | ||
159 | INPUT = INPUT.matches("*.o"); | ||
160 | // execute("echo ${INPUT}"); | ||
161 | // execute("echo ${MYIN}"); | ||
162 | execute("${CXX} -o ${OUTPUT} ${INPUT} ${LDFLAGS}"); | ||
163 | } | ||
164 | } | ||
165 | |||