Makefile: Automatically update config.h if configure changed.

This commit is contained in:
Alexandre Julliard 2006-09-22 09:33:00 +02:00
parent 44db04c01e
commit c4704c2d7e
4 changed files with 14 additions and 2 deletions

View File

@ -70,6 +70,10 @@ INSTALLDIRS = $(DESTDIR)$(datadir)/aclocal
config.status: configure config.status: configure
@./config.status --recheck @./config.status --recheck
include/config.h: include/stamp-h
include/stamp-h: include/config.h.in config.status
@./config.status include/config.h include/stamp-h
wine: $(WINEWRAPPER) wine: $(WINEWRAPPER)
$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
@ -114,7 +118,7 @@ RECURSE_TARGETS = \
$(TESTSUBDIRS:%=%/__test__) \ $(TESTSUBDIRS:%=%/__test__) \
$(TESTSUBDIRS:%=%/__testclean__) $(TESTSUBDIRS:%=%/__testclean__)
depend $(RECURSE_TARGETS): $(MAKEDEP) depend $(RECURSE_TARGETS): $(MAKEDEP) include/config.h
$(MAKEDEP): $(MAKEDEP):
@cd $(TOOLSDIR)/tools && $(MAKE) makedep @cd $(TOOLSDIR)/tools && $(MAKE) makedep
@ -139,7 +143,7 @@ clean::
$(RM) wine $(RM) wine
distclean:: clean distclean:: clean
$(RM) config.* configure.lineno TAGS tags include/config.h $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h
$(RM) -r autom4te.cache $(RM) -r autom4te.cache
.PHONY: manpages htmlpages sgmlpages distclean .PHONY: manpages htmlpages sgmlpages distclean

5
configure vendored
View File

@ -23778,6 +23778,9 @@ Makefile: dummy
ac_config_commands="$ac_config_commands include/stamp-h"
ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv" ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv"
ac_config_commands="$ac_config_commands dlls/gdi/mfdrv" ac_config_commands="$ac_config_commands dlls/gdi/mfdrv"
@ -24354,6 +24357,7 @@ for ac_config_target in $ac_config_targets
do do
case $ac_config_target in case $ac_config_target in
"include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
"include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;;
"dlls/gdi/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;; "dlls/gdi/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;;
"dlls/gdi/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;; "dlls/gdi/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;;
"dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;;
@ -25361,6 +25365,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in case $ac_file$ac_mode in
"include/stamp-h":C) echo timestamp > include/stamp-h ;;
"dlls/gdi/enhmfdrv":C) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5 "dlls/gdi/enhmfdrv":C) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5
echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;; echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;;
"dlls/gdi/mfdrv":C) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5 "dlls/gdi/mfdrv":C) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5

View File

@ -1482,6 +1482,8 @@ Makefile: dummy
AH_TOP([#define __WINE_CONFIG_H]) AH_TOP([#define __WINE_CONFIG_H])
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls) WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls)

1
include/.gitignore vendored
View File

@ -37,6 +37,7 @@
/shldisp.h /shldisp.h
/shobjidl.h /shobjidl.h
/shtypes.h /shtypes.h
/stamp-h
/strmif.h /strmif.h
/tom.h /tom.h
/unknwn.h /unknwn.h