The MinGW.org Installation Manager Tool
| リビジョン | 48bce57bd29c140ccb32a81785949af224bd2d45 (tree) |
|---|---|
| 日時 | 2013-05-15 19:41:35 |
| 作者 | Keith Marshall <keithmarshall@user...> |
| コミッター | Keith Marshall |
Streamline build-time dependency tracking procedures.
ChangeLog (diff) Makefile.in (diff)| @@ -1,5 +1,16 @@ | ||
| 1 | 1 | 2013-05-15 Keith Marshall <keithmarshall@users.sourceforge.net> |
| 2 | 2 | |
| 3 | + Streamline build-time dependency tracking procedures. | |
| 4 | + | |
| 5 | + * Makefile.in (DEPFLAGS): Adjust for simultaneous .o/.d generation. | |
| 6 | + (RC_DEPFLAGS): New macro; define dependency generation flags for the | |
| 7 | + resource compiler, which can't handle the new DEPFLAGS methodology. | |
| 8 | + (%.c, %.cpp, %.rc): Simplify $OBJEXT generation procedures. | |
| 9 | + (%.time): Remove redundantly replicated build-time procedure from... | |
| 10 | + (%.tagged.time): ...this; just make it a prerequisite. | |
| 11 | + | |
| 12 | +2013-05-15 Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 13 | + | |
| 3 | 14 | Add resources for specification of product version. |
| 4 | 15 | |
| 5 | 16 | * src/verinfo.rc src/verinfo.h.in: New files; included by... |
| @@ -36,8 +36,8 @@ DEBUGLEVEL = @DEBUGLEVEL@ | ||
| 36 | 36 | # Establish the appropriate mechanism for invoking 'make' recursively, |
| 37 | 37 | # WITHOUT incurring the noise of its "Entering directory..." messages. |
| 38 | 38 | # |
| 39 | -@SET_MAKE@ | |
| 40 | 39 | QUIET_MAKE = $(MAKE)@NO_PRINT_DIRECTORY@ |
| 40 | +@SET_MAKE@ | |
| 41 | 41 | |
| 42 | 42 | # Establish source code directory organisation, and set reference |
| 43 | 43 | # paths for access to source files. |
| @@ -223,7 +223,8 @@ execute-command: | ||
| 223 | 223 | |
| 224 | 224 | # Compilation and dependency tracking... |
| 225 | 225 | # |
| 226 | -DEPFLAGS = -MM -MP -MD | |
| 226 | +DEPFLAGS = -MMD -MP | |
| 227 | +RC_DEPFLAGS = -MM -MP -MD -MF $*.res.x | |
| 227 | 228 | sinclude *.d |
| 228 | 229 | |
| 229 | 230 | %.c: %.l |
| @@ -235,19 +236,15 @@ sinclude *.d | ||
| 235 | 236 | || $(WITH_REQUEST)='rm -f $(LEX_OUTPUT)' execute-command |
| 236 | 237 | |
| 237 | 238 | %.$(OBJEXT): %.c |
| 238 | - $(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) $< | |
| 239 | - $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< | |
| 239 | + $(CC) $(DEPFLAGS) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< | |
| 240 | 240 | |
| 241 | 241 | %.$(OBJEXT): %.cpp |
| 242 | - $(CXX) $(DEPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $< | |
| 243 | - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< | |
| 242 | + $(CXX) $(DEPFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< | |
| 244 | 243 | |
| 245 | 244 | %.res.$(OBJEXT): %.rc |
| 246 | - test ! -f $*.d || mv $*.d $*.d.bak | |
| 247 | - $(CC) $(DEPFLAGS) $(RC_INCLUDES) -DRC_INVOKED -xc-header $< | |
| 248 | - sed 's,$*\.$(OBJEXT):,$@:,' $*.d > $*.res.d; rm -f $*.d | |
| 245 | + $(CC) $(RC_DEPFLAGS) $(RC_INCLUDES) -DRC_INVOKED -xc-header $< | |
| 246 | + sed 's,$*\.$(OBJEXT):,$@:,' $*.res.x > $*.res.d; rm -f $*.res.x | |
| 249 | 247 | $(RC_SCRIPT) $< | $(RC) $(RC_INCLUDES) -o $@ |
| 250 | - test ! -f $*.d.bak || mv $*.d.bak $*.d | |
| 251 | 248 | |
| 252 | 249 | %.$(OBJEXT): %.ico |
| 253 | 250 | echo $* ICON $*.ico | $(RC) -I ${srcdir}/icons -o $@ |
| @@ -258,8 +255,7 @@ time-stamp: | ||
| 258 | 255 | %.tagged.time: time-stamp |
| 259 | 256 | > $*.time |
| 260 | 257 | |
| 261 | -%.time: | |
| 262 | - > $*.time | |
| 258 | +%.time: %.tagged.time | |
| 263 | 259 | |
| 264 | 260 | %.tag: %.tagged.time |
| 265 | 261 | >> $@; tag=`date +%Y%m%d`; \ |
Fork