equal
deleted
inserted
replaced
160 ifeq ($(TRACE_VER),new) |
160 ifeq ($(TRACE_VER),new) |
161 define trace_compile |
161 define trace_compile |
162 |
162 |
163 $(TRACE_SOURCE_LIST): |
163 $(TRACE_SOURCE_LIST): |
164 $(call startrule,sourcelist_combine) \ |
164 $(call startrule,sourcelist_combine) \ |
165 $(GNUCAT) $$^ | $(GNUSORT) -u > $$@.new && \ |
165 $(GNUCAT) $(TRACE_SOURCE_LIST) $$^ 2>/dev/null | $(GNUSORT) -u > $$@.new && \ |
166 $(GNUMD5SUM) -c $(TRACE_MARKER) 2>/dev/null || \ |
166 $(GNUMD5SUM) -c $(TRACE_MARKER) 2>/dev/null || \ |
167 $(GNUCP) $$@.new $$@ \ |
167 $(GNUCP) $$@.new $$@ \ |
168 $(call endrule,sourcelist_combine) |
168 $(call endrule,sourcelist_combine) |
169 |
169 |
170 $(TRACE_MARKER) : $(PROJECT_META) $(TRACE_SOURCE_LIST) |
170 $(TRACE_MARKER) : $(PROJECT_META) $(TRACE_SOURCE_LIST) |
183 |
183 |
184 define trace_compile |
184 define trace_compile |
185 |
185 |
186 $(TRACE_SOURCE_LIST): |
186 $(TRACE_SOURCE_LIST): |
187 $(call startrule,sourcelist_combine) \ |
187 $(call startrule,sourcelist_combine) \ |
188 $(GNUCAT) $$^ | $(GNUSORT) -u > $$@.new && \ |
188 $(GNUCAT) $(TRACE_SOURCE_LIST) $$^ 2>/dev/null | $(GNUSORT) -u > $$@.new && \ |
189 $(GNUMD5SUM) -c $(TRACE_MARKER) 2>/dev/null || \ |
189 $(GNUMD5SUM) -c $(TRACE_MARKER) 2>/dev/null || \ |
190 $(GNUCP) $$@.new $$@ \ |
190 $(GNUCP) $$@.new $$@ \ |
191 $(call endrule,sourcelist_combine) |
191 $(call endrule,sourcelist_combine) |
192 |
192 |
193 $(TRACE_MARKER) : $(PROJECT_META) $(TRACE_SOURCE_LIST) |
193 $(TRACE_MARKER) : $(PROJECT_META) $(TRACE_SOURCE_LIST) |