diff --git a/.gitignore b/.gitignore deleted file mode 100644 index aba3b5459dc..00000000000 --- a/.gitignore +++ /dev/null @@ -1,53 +0,0 @@ -# Automatically generated by make_makefiles; DO NOT EDIT!! -*.a -*.exe -*.fake -*.so -/Make.rules -/TAGS -/autom4te.cache -/config.cache -/config.log -/config.status -/configure.lineno -/tags -/wine -/wine64 -Makefile -dlls/*/*.def -dlls/libd3dcompiler.def -dlls/libd3dx9.def -dlls/libhtmlhelp.def -dlls/libkernel.def -dlls/libwinspool.def -dlls/libxinput.def -fonts/*.fon -include/config.h -include/stamp-h -libs/wine/libwine*.dylib -libs/wine/libwine.so.* -libs/wine/version.c -loader/wine -loader/wine-installed -loader/wine-preloader -loader/wine64 -loader/wine64-preloader -po/*.mo -programs/winetest/build.nfo -programs/winetest/build.rc -server/wineserver -server/wineserver-installed -tools/fnt2fon -tools/make_ctests -tools/make_xftmpl -tools/makedep -tools/sfnt2fnt -tools/widl/widl -tools/wineapploader -tools/winebuild/winebuild -tools/winedump/winedump -tools/winegcc/winecpp -tools/winegcc/wineg++ -tools/winegcc/winegcc -tools/wmc/wmc -tools/wrc/wrc diff --git a/Makefile.in b/Makefile.in index c7889d00e0e..1a41d057cf1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,7 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status clean:: __clean__ distclean:: clean - $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp + $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp .gitignore $(RM) -r autom4te.cache # Rules for installing diff --git a/aclocal.m4 b/aclocal.m4 index 7832cd8b0a4..a40d9512617 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -196,6 +196,7 @@ AC_DEFUN([WINE_CONFIG_HELPERS], [wine_rules_file=conf$$rules.make rm -f $wine_rules_file ALL_POT_FILES="" +GITIGNORE="# Automatically generated by configure; DO NOT EDIT!!" AC_SUBST(ALL_TEST_RESOURCES,"") wine_fn_append_file () @@ -203,6 +204,15 @@ wine_fn_append_file () AS_VAR_APPEND($[1]," \\$as_nl $[2]") } +wine_fn_ignore_file () +{ + case "$[1]" in + */*) AS_VAR_APPEND([GITIGNORE],"$as_nl$[1]") ;; + \**) AS_VAR_APPEND([GITIGNORE],"$as_nl$[1]") ;; + *) AS_VAR_APPEND([GITIGNORE],"$as_nl/$[1]") ;; + esac +} + wine_fn_append_rule () { AS_ECHO("$[1]") >>$wine_rules_file @@ -500,6 +510,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$[@] clean:: \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" + wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" if test -n "$CROSSTARGET" then wine_fn_append_rule \ @@ -508,6 +519,7 @@ dlls/lib$ac_implib.cross.a: $ac_file.cross.a \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$[@] clean:: \$(RM) dlls/lib$ac_implib.cross.a" + wine_fn_ignore_file "dlls/lib$ac_implib.cross.a" fi fi fi @@ -632,6 +644,9 @@ wine_fn_config_tool () case $ac_dir in tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; esac + case $ac_dir in + tools/*) wine_fn_ignore_file $ac_dir/`expr $ac_dir : tools/"\\(.*\\)"`$ac_exeext ;; + esac } wine_fn_config_makerules () @@ -643,6 +658,7 @@ wine_fn_config_makerules () @./config.status $ac_rules distclean:: \$(RM) $ac_rules" + wine_fn_ignore_file $ac_rules } wine_fn_config_symlink () @@ -659,16 +675,10 @@ wine_fn_config_symlink () @./config.status \$[@] distclean:: \$(RM) $ac_links" + for f in $ac_links; do wine_fn_ignore_file $f; done test -n "$ac_linkdir" || return wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/depend: $ac_links" -} - -if test -z "$CROSSTARGET" -then - wine_fn_append_rule \ -"crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" -fi]) +}]) dnl **** Define helper function to append a file to a makefile file list **** dnl @@ -765,6 +775,13 @@ m4_append_uniq([_AC_USER_OPTS],[enable_tools],[ ])dnl wine_fn_config_tool [$1] [$2]]) +dnl **** Append a file to the .gitignore list **** +dnl +dnl Usage: WINE_IGNORE_FILE(file,enable) +dnl +AC_DEFUN([WINE_IGNORE_FILE],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +m4_ifval([$2],[test "x$[$2]" = xno || ])wine_fn_ignore_file $1]) + dnl **** Add a message to the list displayed at the end **** dnl dnl Usage: WINE_NOTICE(notice) diff --git a/configure b/configure index d65db7bfb7c..a9080f4af17 100755 --- a/configure +++ b/configure @@ -626,7 +626,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS PORCFLAGS LINGUAS -ALL_TEST_RESOURCES MAKE_TEST_RULES MAKE_PROG_RULES MAKE_DLL_RULES @@ -707,6 +706,7 @@ LIBWINE_RULES SOCKETLIBS DLLTOOL LOADER_RULES +ALL_TEST_RESOURCES READELF LDD LDRPATH_LOCAL @@ -7138,6 +7138,514 @@ fi wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" +wine_rules_file=conf$$rules.make +rm -f $wine_rules_file +ALL_POT_FILES="" +GITIGNORE="# Automatically generated by configure; DO NOT EDIT!!" +ALL_TEST_RESOURCES="" + + +wine_fn_append_file () +{ + as_fn_append $1 " \\$as_nl $2" +} + +wine_fn_ignore_file () +{ + case "$1" in + */*) as_fn_append GITIGNORE "$as_nl$1" ;; + \**) as_fn_append GITIGNORE "$as_nl$1" ;; + *) as_fn_append GITIGNORE "$as_nl/$1" ;; + esac +} + +wine_fn_append_rule () +{ + $as_echo "$1" >>$wine_rules_file +} + +wine_fn_has_flag () +{ + expr ",$ac_flags," : ".*,$1,.*" >/dev/null +} + +wine_fn_depend_rules () +{ + ac_alldeps=$1 + ac_makedep="\$(MAKEDEP)" + ac_input=Make.vars.in:$ac_dir/Makefile.in + case $1 in + *.in) + ac_input=$ac_input:$1 + test "$srcdir" = . || ac_alldeps="$srcdir/$ac_alldeps" ;; + *) + ac_makedep="$1 $ac_makedep" ;; + esac + + wine_fn_append_rule \ +"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status $ac_alldeps \$(MAKEDEP) + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend +depend: $ac_dir/depend +.PHONY: $ac_dir/depend +$ac_dir/depend: $ac_makedep dummy + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" +} + +wine_fn_pot_rules () +{ + test "x$with_gettextpo" = xyes || return + + if wine_fn_has_flag mc + then + wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot + wine_fn_append_rule \ +"$ac_dir/msg.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) msg.pot +$ac_dir/msg.pot: tools/wmc include" + fi + if wine_fn_has_flag po + then + wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot + wine_fn_append_rule \ +"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) rsrc.pot +$ac_dir/rsrc.pot: tools/wrc include" + fi +} + +wine_fn_all_rules () +{ + ac_rules=$1 + + wine_fn_depend_rules ${ac_rules:-Make.rules} + wine_fn_append_rule \ +"all: $ac_dir +.PHONY: $ac_dir +$ac_dir: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE)" +} + +wine_fn_install_rules () +{ + wine_fn_has_flag install-lib || wine_fn_has_flag install-dev || return + + wine_fn_append_rule \ +".PHONY: $ac_dir/install $ac_dir/uninstall +$ac_dir/install:: $ac_dir + @cd $ac_dir && \$(MAKE) install +$ac_dir/uninstall:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) uninstall +install:: $ac_dir/install +__uninstall__: $ac_dir/uninstall" + + if wine_fn_has_flag install-lib + then + wine_fn_append_rule \ +".PHONY: $ac_dir/install-lib +$ac_dir/install-lib:: $ac_dir + @cd $ac_dir && \$(MAKE) install-lib +install-lib:: $ac_dir/install-lib" + fi + + if wine_fn_has_flag install-dev + then + wine_fn_append_rule \ +".PHONY: $ac_dir/install-dev +$ac_dir/install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install-dev +install-dev:: $ac_dir/install-dev" + fi +} + +wine_fn_clean_rules () +{ + ac_clean=$@ + ac_extraclean="$ac_dir/Makefile" + test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" + + if wine_fn_has_flag clean + then + wine_fn_append_rule \ +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) clean + \$(RM) $ac_extraclean" + else + wine_fn_append_rule \ +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" + fi +} + +wine_fn_disabled_rules () +{ + ac_clean=$@ + ac_extraclean="$ac_dir/Makefile" + test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" + + wine_fn_append_rule \ +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" +} + +wine_fn_config_makefile () +{ + ac_dir=$1 + ac_enable=$2 + ac_flags=$3 + + if eval test \"x\$"$ac_enable"\" = x"no"; then : + wine_fn_disabled_rules; return +fi + wine_fn_all_rules + wine_fn_install_rules + wine_fn_clean_rules +} + +wine_fn_config_lib () +{ + ac_name=$1 + ac_flags=$2 + ac_dir=dlls/$ac_name + ac_deps="include" + + if test "x$enable_tools" = xno; then : + +else + ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" +fi + wine_fn_all_rules Make.rules.in + wine_fn_clean_rules + + wine_fn_append_rule \ +".PHONY: $ac_dir/install $ac_dir/uninstall +$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a +install install-dev:: $ac_dir/install +__uninstall__: $ac_dir/uninstall +__builddeps__: $ac_dir +$ac_dir: $ac_deps" +} + +wine_fn_config_dll () +{ + ac_name=$1 + ac_dir=dlls/$ac_name + ac_enable=$2 + ac_flags=$3 + ac_implib=${4:-$ac_name} + ac_file=$ac_dir/lib$ac_implib + ac_dll=$ac_name + ac_deps="include" + ac_implibflags="" + + if test "x$enable_tools" = xno; then : + +else + ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" +fi + case $ac_name in + *16) ac_implibflags=" -m16" ;; + *.*) ;; + *) ac_dll=$ac_dll.dll ;; + esac + + ac_clean= + wine_fn_has_flag implib && ac_clean="$ac_clean $ac_file.$IMPLIBEXT" + wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" + wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" + test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll" + + if eval test \"x\$"$ac_enable"\" = x"no"; then : + if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 + then + wine_fn_depend_rules Make.rules.in + wine_fn_clean_rules $ac_clean + else + wine_fn_disabled_rules $ac_clean + return + fi +else + wine_fn_all_rules Make.rules.in + wine_fn_clean_rules $ac_clean + wine_fn_append_rule \ +"$ac_dir: __builddeps__ +manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) \$@ +.PHONY: $ac_dir/install-lib $ac_dir/uninstall +install install-lib:: $ac_dir/install-lib +__uninstall__: $ac_dir/uninstall" + if test -n "$DLLEXT" + then + wine_fn_append_rule \ +"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + else + wine_fn_append_rule \ +"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" + fi + + wine_fn_pot_rules +fi + + if wine_fn_has_flag staticimplib + then + wine_fn_append_rule \ +"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT +$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec +$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT +.PHONY: $ac_dir/install-dev $ac_dir/uninstall +$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +install install-dev:: $ac_dir/install-dev +__uninstall__: $ac_dir/uninstall" + + if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT" + then + wine_fn_append_rule \ +"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__ + \$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" + fi + + if test -n "$CROSSTARGET" + then + wine_fn_append_rule \ +"__builddeps__: $ac_file.cross.a +$ac_file.cross.a: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a" + fi + + elif wine_fn_has_flag implib + then + wine_fn_append_rule \ +"__builddeps__: $ac_file.$IMPLIBEXT +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec +$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec +.PHONY: $ac_dir/install-dev $ac_dir/uninstall +$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +install install-dev:: $ac_dir/install-dev +__uninstall__: $ac_dir/uninstall" + if test -n "$CROSSTARGET" + then + wine_fn_append_rule \ +"__builddeps__: $ac_file.cross.a +$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) + \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" + fi + + if test "$ac_name" != "$ac_implib" + then + wine_fn_append_rule \ +"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT +dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT + \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$@ +clean:: + \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" + wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" + if test -n "$CROSSTARGET" + then + wine_fn_append_rule \ +"__builddeps__: dlls/lib$ac_implib.cross.a +dlls/lib$ac_implib.cross.a: $ac_file.cross.a + \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$@ +clean:: + \$(RM) dlls/lib$ac_implib.cross.a" + wine_fn_ignore_file "dlls/lib$ac_implib.cross.a" + fi + fi + fi +} + +wine_fn_config_program () +{ + ac_name=$1 + ac_dir=programs/$ac_name + ac_enable=$2 + ac_flags=$3 + ac_program=$ac_name + + case $ac_name in + *.*) ;; + *) ac_program=$ac_program.exe ;; + esac + + ac_clean= + wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" + wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" + wine_fn_has_flag manpage && ac_clean="$ac_clean $ac_dir/$ac_name.man" + test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_program" + + if eval test \"x\$"$ac_enable"\" = x"no"; then : + wine_fn_disabled_rules $ac_clean; return +fi + + wine_fn_all_rules Make.rules.in + wine_fn_clean_rules $ac_clean + wine_fn_append_rule "$ac_dir: __builddeps__" + wine_fn_pot_rules + + wine_fn_has_flag install || return + wine_fn_append_rule \ +".PHONY: $ac_dir/install $ac_dir/uninstall +install install-lib:: $ac_dir/install +__uninstall__: $ac_dir/uninstall" + + if test -n "$DLLEXT" + then + wine_fn_append_rule \ +"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + + if test -z "$with_wine64" && wine_fn_has_flag installbin + then + wine_fn_append_rule \ +"$ac_dir/install:: __tooldeps__ \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" + fi + else + wine_fn_append_rule \ +"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(bindir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" + fi + + if test -z "$with_wine64" && wine_fn_has_flag manpage + then + wine_fn_append_rule \ +"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) + \$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext) +$ac_dir/uninstall:: + \$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)" + fi +} + +wine_fn_config_test () +{ + ac_dir=$1 + ac_name=$2 + ac_flags=$3 + + ac_clean= + test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/${ac_name} : "\\(.*\\)_test"`_crosstest.exe + test -n "$DLLEXT" || ac_clean="$ac_dir/${ac_name}.exe $ac_dir/${ac_name}-stripped.exe" + ac_clean="$ac_clean $ac_dir/testlist.c" + + if test "x$enable_tests" = xno; then : + wine_fn_disabled_rules $ac_clean; return +fi + + wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res + wine_fn_all_rules Make.rules.in + wine_fn_clean_rules $ac_clean + + wine_fn_append_rule \ +"$ac_dir: programs/winetest/Makefile __builddeps__ +programs/winetest: $ac_dir +check test: $ac_dir/test +.PHONY: $ac_dir/test +$ac_dir/test: dummy + @cd $ac_dir && \$(MAKE) test +testclean:: + \$(RM) $ac_dir/*.ok" + + if test -n "$CROSSTARGET" + then + wine_fn_append_rule \ +"crosstest: $ac_dir/crosstest +.PHONY: $ac_dir/crosstest +$ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy + @cd $ac_dir && \$(MAKE) crosstest" + fi +} + +wine_fn_config_tool () +{ + ac_dir=$1 + ac_flags=$2 + if test "x$enable_tools" = xno; then : + return +fi + + wine_fn_all_rules + wine_fn_install_rules + wine_fn_clean_rules + + wine_fn_append_rule "__tooldeps__: $ac_dir" + wine_fn_append_rule "$ac_dir: libs/port" + case $ac_dir in + tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; + esac + case $ac_dir in + tools/*) wine_fn_ignore_file $ac_dir/`expr $ac_dir : tools/"\\(.*\\)"`$ac_exeext ;; + esac +} + +wine_fn_config_makerules () +{ + ac_rules=$1 + ac_deps=$2 + wine_fn_append_rule \ +"$ac_rules: $srcdir/$ac_rules.in $ac_deps config.status + @./config.status $ac_rules +distclean:: + \$(RM) $ac_rules" + wine_fn_ignore_file $ac_rules +} + +wine_fn_config_symlink () +{ + ac_linkdir= + if test "x$1" = "x-d" + then + ac_linkdir=$2 + shift; shift + fi + ac_links=$@ + wine_fn_append_rule \ +"$ac_links: + @./config.status \$@ +distclean:: + \$(RM) $ac_links" + for f in $ac_links; do wine_fn_ignore_file $f; done + test -n "$ac_linkdir" || return + wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/depend: $ac_links" +} +wine_fn_ignore_file "loader/wine" +test "$wine_binary" = wine || wine_fn_ignore_file "loader/$wine_binary" +wine_fn_ignore_file "loader/wine-installed" +wine_fn_ignore_file "libs/wine/version.c" + LOADER_RULES=" all: $wine_binary wine-installed @@ -7265,6 +7773,8 @@ fi ;; esac + wine_fn_ignore_file "libs/wine/libwine.dll" + wine_fn_ignore_file "libs/wine/libwine.a" LIBWINE_RULES=" all: libwine.dll libwine.a @@ -7460,6 +7970,7 @@ fi fi + wine_fn_ignore_file "libs/wine/libwine*.dylib" LIBWINE_RULES=" all: libwine.dylib @@ -7640,6 +8151,7 @@ fi ;; esac + wine_fn_ignore_file "libs/wine/libwine.so" LIBWINE_RULES=" all: libwine.so @@ -7991,6 +8503,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } LDSHARED="\$(CC) -Wl,-G,-h,libwine.so.\$(SOVERSION)" fi fi + wine_fn_ignore_file "libs/wine/libwine.so*" LIBWINE_RULES=" all: libwine.so @@ -13982,6 +14495,8 @@ case $host_os in linux*) case $host_cpu in *i[3456789]86*|x86_64*) + wine_fn_ignore_file "loader/wine-preloader" + test "$wine_binary" = wine || wine_fn_ignore_file "loader/$wine_binary-preloader" as_fn_append LOADER_RULES " all: $wine_binary-preloader @@ -16186,499 +16701,6 @@ crosstest: \$(CROSSTESTMODULE) fi -wine_rules_file=conf$$rules.make -rm -f $wine_rules_file -ALL_POT_FILES="" -ALL_TEST_RESOURCES="" - - -wine_fn_append_file () -{ - as_fn_append $1 " \\$as_nl $2" -} - -wine_fn_append_rule () -{ - $as_echo "$1" >>$wine_rules_file -} - -wine_fn_has_flag () -{ - expr ",$ac_flags," : ".*,$1,.*" >/dev/null -} - -wine_fn_depend_rules () -{ - ac_alldeps=$1 - ac_makedep="\$(MAKEDEP)" - ac_input=Make.vars.in:$ac_dir/Makefile.in - case $1 in - *.in) - ac_input=$ac_input:$1 - test "$srcdir" = . || ac_alldeps="$srcdir/$ac_alldeps" ;; - *) - ac_makedep="$1 $ac_makedep" ;; - esac - - wine_fn_append_rule \ -"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status $ac_alldeps \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend -depend: $ac_dir/depend -.PHONY: $ac_dir/depend -$ac_dir/depend: $ac_makedep dummy - @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" -} - -wine_fn_pot_rules () -{ - test "x$with_gettextpo" = xyes || return - - if wine_fn_has_flag mc - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule \ -"$ac_dir/msg.pot: $ac_dir/Makefile dummy - @cd $ac_dir && \$(MAKE) msg.pot -$ac_dir/msg.pot: tools/wmc include" - fi - if wine_fn_has_flag po - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule \ -"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy - @cd $ac_dir && \$(MAKE) rsrc.pot -$ac_dir/rsrc.pot: tools/wrc include" - fi -} - -wine_fn_all_rules () -{ - ac_rules=$1 - - wine_fn_depend_rules ${ac_rules:-Make.rules} - wine_fn_append_rule \ -"all: $ac_dir -.PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile dummy - @cd $ac_dir && \$(MAKE)" -} - -wine_fn_install_rules () -{ - wine_fn_has_flag install-lib || wine_fn_has_flag install-dev || return - - wine_fn_append_rule \ -".PHONY: $ac_dir/install $ac_dir/uninstall -$ac_dir/install:: $ac_dir - @cd $ac_dir && \$(MAKE) install -$ac_dir/uninstall:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall -install:: $ac_dir/install -__uninstall__: $ac_dir/uninstall" - - if wine_fn_has_flag install-lib - then - wine_fn_append_rule \ -".PHONY: $ac_dir/install-lib -$ac_dir/install-lib:: $ac_dir - @cd $ac_dir && \$(MAKE) install-lib -install-lib:: $ac_dir/install-lib" - fi - - if wine_fn_has_flag install-dev - then - wine_fn_append_rule \ -".PHONY: $ac_dir/install-dev -$ac_dir/install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install-dev -install-dev:: $ac_dir/install-dev" - fi -} - -wine_fn_clean_rules () -{ - ac_clean=$@ - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - - if wine_fn_has_flag clean - then - wine_fn_append_rule \ -"__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -$ac_dir/clean: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) clean - \$(RM) $ac_extraclean" - else - wine_fn_append_rule \ -"__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -$ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" - fi -} - -wine_fn_disabled_rules () -{ - ac_clean=$@ - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - - wine_fn_append_rule \ -"__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -$ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" -} - -wine_fn_config_makefile () -{ - ac_dir=$1 - ac_enable=$2 - ac_flags=$3 - - if eval test \"x\$"$ac_enable"\" = x"no"; then : - wine_fn_disabled_rules; return -fi - wine_fn_all_rules - wine_fn_install_rules - wine_fn_clean_rules -} - -wine_fn_config_lib () -{ - ac_name=$1 - ac_flags=$2 - ac_dir=dlls/$ac_name - ac_deps="include" - - if test "x$enable_tools" = xno; then : - -else - ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" -fi - wine_fn_all_rules Make.rules.in - wine_fn_clean_rules - - wine_fn_append_rule \ -".PHONY: $ac_dir/install $ac_dir/uninstall -$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a -install install-dev:: $ac_dir/install -__uninstall__: $ac_dir/uninstall -__builddeps__: $ac_dir -$ac_dir: $ac_deps" -} - -wine_fn_config_dll () -{ - ac_name=$1 - ac_dir=dlls/$ac_name - ac_enable=$2 - ac_flags=$3 - ac_implib=${4:-$ac_name} - ac_file=$ac_dir/lib$ac_implib - ac_dll=$ac_name - ac_deps="include" - ac_implibflags="" - - if test "x$enable_tools" = xno; then : - -else - ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" -fi - case $ac_name in - *16) ac_implibflags=" -m16" ;; - *.*) ;; - *) ac_dll=$ac_dll.dll ;; - esac - - ac_clean= - wine_fn_has_flag implib && ac_clean="$ac_clean $ac_file.$IMPLIBEXT" - wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" - wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" - test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll" - - if eval test \"x\$"$ac_enable"\" = x"no"; then : - if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 - then - wine_fn_depend_rules Make.rules.in - wine_fn_clean_rules $ac_clean - else - wine_fn_disabled_rules $ac_clean - return - fi -else - wine_fn_all_rules Make.rules.in - wine_fn_clean_rules $ac_clean - wine_fn_append_rule \ -"$ac_dir: __builddeps__ -manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) \$@ -.PHONY: $ac_dir/install-lib $ac_dir/uninstall -install install-lib:: $ac_dir/install-lib -__uninstall__: $ac_dir/uninstall" - if test -n "$DLLEXT" - then - wine_fn_append_rule \ -"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" - else - wine_fn_append_rule \ -"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" - fi - - wine_fn_pot_rules -fi - - if wine_fn_has_flag staticimplib - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT -$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT -.PHONY: $ac_dir/install-dev $ac_dir/uninstall -$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) - \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -install install-dev:: $ac_dir/install-dev -__uninstall__: $ac_dir/uninstall" - - if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT" - then - wine_fn_append_rule \ -"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__ - \$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" - fi - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $ac_dir/Makefile dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a" - fi - - elif wine_fn_has_flag implib - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec -.PHONY: $ac_dir/install-dev $ac_dir/uninstall -$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) - \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -install install-dev:: $ac_dir/install-dev -__uninstall__: $ac_dir/uninstall" - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" - fi - - if test "$ac_name" != "$ac_implib" - then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT -dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT - \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$@ -clean:: - \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.cross.a -dlls/lib$ac_implib.cross.a: $ac_file.cross.a - \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$@ -clean:: - \$(RM) dlls/lib$ac_implib.cross.a" - fi - fi - fi -} - -wine_fn_config_program () -{ - ac_name=$1 - ac_dir=programs/$ac_name - ac_enable=$2 - ac_flags=$3 - ac_program=$ac_name - - case $ac_name in - *.*) ;; - *) ac_program=$ac_program.exe ;; - esac - - ac_clean= - wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" - wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" - wine_fn_has_flag manpage && ac_clean="$ac_clean $ac_dir/$ac_name.man" - test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_program" - - if eval test \"x\$"$ac_enable"\" = x"no"; then : - wine_fn_disabled_rules $ac_clean; return -fi - - wine_fn_all_rules Make.rules.in - wine_fn_clean_rules $ac_clean - wine_fn_append_rule "$ac_dir: __builddeps__" - wine_fn_pot_rules - - wine_fn_has_flag install || return - wine_fn_append_rule \ -".PHONY: $ac_dir/install $ac_dir/uninstall -install install-lib:: $ac_dir/install -__uninstall__: $ac_dir/uninstall" - - if test -n "$DLLEXT" - then - wine_fn_append_rule \ -"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" - - if test -z "$with_wine64" && wine_fn_has_flag installbin - then - wine_fn_append_rule \ -"$ac_dir/install:: __tooldeps__ \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" - fi - else - wine_fn_append_rule \ -"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(bindir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" - fi - - if test -z "$with_wine64" && wine_fn_has_flag manpage - then - wine_fn_append_rule \ -"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) - \$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext) -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)" - fi -} - -wine_fn_config_test () -{ - ac_dir=$1 - ac_name=$2 - ac_flags=$3 - - ac_clean= - test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/${ac_name} : "\\(.*\\)_test"`_crosstest.exe - test -n "$DLLEXT" || ac_clean="$ac_dir/${ac_name}.exe $ac_dir/${ac_name}-stripped.exe" - ac_clean="$ac_clean $ac_dir/testlist.c" - - if test "x$enable_tests" = xno; then : - wine_fn_disabled_rules $ac_clean; return -fi - - wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res - wine_fn_all_rules Make.rules.in - wine_fn_clean_rules $ac_clean - - wine_fn_append_rule \ -"$ac_dir: programs/winetest/Makefile __builddeps__ -programs/winetest: $ac_dir -check test: $ac_dir/test -.PHONY: $ac_dir/test -$ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test -testclean:: - \$(RM) $ac_dir/*.ok" - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"crosstest: $ac_dir/crosstest -.PHONY: $ac_dir/crosstest -$ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest" - fi -} - -wine_fn_config_tool () -{ - ac_dir=$1 - ac_flags=$2 - if test "x$enable_tools" = xno; then : - return -fi - - wine_fn_all_rules - wine_fn_install_rules - wine_fn_clean_rules - - wine_fn_append_rule "__tooldeps__: $ac_dir" - wine_fn_append_rule "$ac_dir: libs/port" - case $ac_dir in - tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; - esac -} - -wine_fn_config_makerules () -{ - ac_rules=$1 - ac_deps=$2 - wine_fn_append_rule \ -"$ac_rules: $srcdir/$ac_rules.in $ac_deps config.status - @./config.status $ac_rules -distclean:: - \$(RM) $ac_rules" -} - -wine_fn_config_symlink () -{ - ac_linkdir= - if test "x$1" = "x-d" - then - ac_linkdir=$2 - shift; shift - fi - ac_links=$@ - wine_fn_append_rule \ -"$ac_links: - @./config.status \$@ -distclean:: - \$(RM) $ac_links" - test -n "$ac_linkdir" || return - wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/depend: $ac_links" -} - -if test -z "$CROSSTARGET" -then - wine_fn_append_rule \ -"crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" -fi wine_fn_append_rule " # Rules automatically generated by configure @@ -16688,6 +16710,13 @@ all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status @./config.status Make.tmp Makefile" +test "$srcdir" = . && wine_fn_append_rule "all: .gitignore +.gitignore: config.status + @./config.status .gitignore" + +test -n "$CROSSTARGET" || wine_fn_append_rule "crosstest: + @echo \"crosstest is not supported (mingw not installed?)\" && false" + if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" @@ -17478,6 +17507,37 @@ zh_TW" + +wine_fn_ignore_file "*.a" +wine_fn_ignore_file "*.exe" +test -n "$DLLEXT" && wine_fn_ignore_file "*$DLLEXT" +test -n "$DLLEXT" && wine_fn_ignore_file "*.fake" +wine_fn_ignore_file ".gitignore" +wine_fn_ignore_file "Makefile" +wine_fn_ignore_file "TAGS" +wine_fn_ignore_file "tags" +wine_fn_ignore_file "autom4te.cache" +wine_fn_ignore_file "config.cache" +wine_fn_ignore_file "config.log" +wine_fn_ignore_file "config.status" +wine_fn_ignore_file "configure.lineno" +wine_fn_ignore_file "include/config.h" +wine_fn_ignore_file "include/stamp-h" +wine_fn_ignore_file "dlls/*/*.def" +test "x$enable_fonts" = xno || wine_fn_ignore_file "fonts/*.fon" +test "x$enable_winetest" = xno || wine_fn_ignore_file "programs/winetest/build.nfo" +test "x$enable_winetest" = xno || wine_fn_ignore_file "programs/winetest/build.rc" +test "x$enable_server" = xno || wine_fn_ignore_file "server/wineserver" +test "x$enable_server" = xno || wine_fn_ignore_file "server/wineserver-installed" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/fnt2fon$ac_exeext" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/make_ctests$ac_exeext" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/make_xftmpl$ac_exeext" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/makedep$ac_exeext" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/sfnt2fnt$ac_exeext" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/wineapploader$ac_exeext" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/winegcc/winecpp$ac_exeext" +test "x$enable_tools" = xno || wine_fn_ignore_file "tools/winegcc/wineg++$ac_exeext" + ac_config_commands="$ac_config_commands Makefile" @@ -17517,6 +17577,7 @@ clean:: test "$srcdir" = . || posrc="$srcdir/po" for i in $LINGUAS do + wine_fn_ignore_file "po/$i.mo" wine_fn_append_rule "po/$i.mo: $posrc/$i.po \$(MSGFMT) -o \$@ $posrc/$i.po" done @@ -17561,6 +17622,12 @@ uninstall:: " fi +if test "$srcdir" = . +then + ac_config_commands="$ac_config_commands .gitignore" + +fi + $as_echo " done" >&6 cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18264,6 +18331,13 @@ wine_fn_output_makefile () _WINE_EOF as_fn_error $? "could not create Makefile" "$LINENO" 5 } +wine_fn_output_gitignore () +{ + sort <<\_WINE_EOF >\$tmp/gitignore && mv -f \$tmp/gitignore \$1 && return +$GITIGNORE +_WINE_EOF + as_fn_error $? "could not create .gitignore" "$LINENO" 5 +} _ACEOF @@ -18287,6 +18361,7 @@ do "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; "tools") CONFIG_COMMANDS="$CONFIG_COMMANDS tools" ;; + ".gitignore") CONFIG_COMMANDS="$CONFIG_COMMANDS .gitignore" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -18922,6 +18997,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} "include/stamp-h":C) echo timestamp > include/stamp-h ;; "Makefile":C) wine_fn_output_makefile Makefile ;; "tools":C) as_dir=tools; as_fn_mkdir_p ;; + ".gitignore":C) wine_fn_output_gitignore .gitignore ;; esac done # for ac_tag diff --git a/configure.ac b/configure.ac index fc6cdde3de2..ebf77e6dc63 100644 --- a/configure.ac +++ b/configure.ac @@ -682,6 +682,11 @@ WINE_PATH_SONAME_TOOLS wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" +WINE_IGNORE_FILE("loader/wine") +test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/$wine_binary") +WINE_IGNORE_FILE("loader/wine-installed") +WINE_IGNORE_FILE("libs/wine/version.c") + AC_SUBST(LOADER_RULES,[" all: $wine_binary wine-installed @@ -719,6 +724,8 @@ case $host_os in AC_SUBST(SOCKETLIBS,"-L\$(top_builddir)/dlls/ws2_32 -lws2_32") ;; esac + WINE_IGNORE_FILE("libs/wine/libwine.dll") + WINE_IGNORE_FILE("libs/wine/libwine.a") AC_SUBST(LIBWINE_RULES,[" all: libwine.dll libwine.a @@ -846,6 +853,7 @@ clean:: AC_MSG_RESULT([[cross-compiling, assuming yes]])) fi + WINE_IGNORE_FILE("libs/wine/libwine*.dylib") AC_SUBST(LIBWINE_RULES,[" all: libwine.dylib @@ -905,6 +913,7 @@ wine-installed: main.o wine_info.plist ;; esac + WINE_IGNORE_FILE("libs/wine/libwine.so") AC_SUBST(LIBWINE_RULES,[" all: libwine.so @@ -987,6 +996,7 @@ wine-installed: main.o LDSHARED="\$(CC) -Wl,-G,-h,libwine.so.\$(SOVERSION)" fi fi + WINE_IGNORE_FILE("libs/wine/libwine.so*") AC_SUBST(LIBWINE_RULES,[" all: libwine.so @@ -1987,6 +1997,8 @@ case $host_os in linux*) case $host_cpu in *i[[3456789]]86*|x86_64*) + WINE_IGNORE_FILE("loader/wine-preloader") + test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/$wine_binary-preloader") AS_VAR_APPEND([LOADER_RULES],[" all: $wine_binary-preloader @@ -2667,6 +2679,15 @@ all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status @./config.status Make.tmp Makefile]) +test "$srcdir" = . && WINE_APPEND_RULE( +[all: .gitignore +.gitignore: config.status + @./config.status .gitignore]) + +test -n "$CROSSTARGET" || WINE_APPEND_RULE( +[crosstest: + @echo \"crosstest is not supported (mingw not installed?)\" && false]) + WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) @@ -3442,6 +3463,38 @@ zh_TW"]) dnl End of auto-generated output commands +dnl Main ignore file + +WINE_IGNORE_FILE("*.a") +WINE_IGNORE_FILE("*.exe") +test -n "$DLLEXT" && WINE_IGNORE_FILE("*$DLLEXT") +test -n "$DLLEXT" && WINE_IGNORE_FILE("*.fake") +WINE_IGNORE_FILE(".gitignore") +WINE_IGNORE_FILE("Makefile") +WINE_IGNORE_FILE("TAGS") +WINE_IGNORE_FILE("tags") +WINE_IGNORE_FILE("autom4te.cache") +WINE_IGNORE_FILE("config.cache") +WINE_IGNORE_FILE("config.log") +WINE_IGNORE_FILE("config.status") +WINE_IGNORE_FILE("configure.lineno") +WINE_IGNORE_FILE("include/config.h") +WINE_IGNORE_FILE("include/stamp-h") +WINE_IGNORE_FILE("dlls/*/*.def") +WINE_IGNORE_FILE("fonts/*.fon",enable_fonts) +WINE_IGNORE_FILE("programs/winetest/build.nfo",enable_winetest) +WINE_IGNORE_FILE("programs/winetest/build.rc",enable_winetest) +WINE_IGNORE_FILE("server/wineserver",enable_server) +WINE_IGNORE_FILE("server/wineserver-installed",enable_server) +WINE_IGNORE_FILE("tools/fnt2fon$ac_exeext",enable_tools) +WINE_IGNORE_FILE("tools/make_ctests$ac_exeext",enable_tools) +WINE_IGNORE_FILE("tools/make_xftmpl$ac_exeext",enable_tools) +WINE_IGNORE_FILE("tools/makedep$ac_exeext",enable_tools) +WINE_IGNORE_FILE("tools/sfnt2fnt$ac_exeext",enable_tools) +WINE_IGNORE_FILE("tools/wineapploader$ac_exeext",enable_tools) +WINE_IGNORE_FILE("tools/winegcc/winecpp$ac_exeext",enable_tools) +WINE_IGNORE_FILE("tools/winegcc/wineg++$ac_exeext",enable_tools) + AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () { @@ -3489,6 +3542,7 @@ clean:: test "$srcdir" = . || posrc="$srcdir/po" for i in $LINGUAS do + WINE_IGNORE_FILE("po/$i.mo") WINE_APPEND_RULE( [po/$i.mo: $posrc/$i.po \$(MSGFMT) -o \$@ $posrc/$i.po]) @@ -3536,6 +3590,18 @@ uninstall:: "]) fi +if test "$srcdir" = . +then + AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore], +[wine_fn_output_gitignore () +{ + sort <<\_WINE_EOF >\$tmp/gitignore && mv -f \$tmp/gitignore \$[]1 && return +$GITIGNORE +_WINE_EOF + AS_ERROR([could not create .gitignore]) +}]) +fi + AS_ECHO(" done") >&AS_MESSAGE_FD AC_OUTPUT diff --git a/tools/make_makefiles b/tools/make_makefiles index 151d74d1f0e..9ebc47631ba 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -66,35 +66,6 @@ my %modules16 = "wow32.dll" => 1, ); -# Default patterns for top-level .gitignore -my @ignores = ( - "*.a", - "*.exe", - "*.fake", - "*.so", - "/autom4te.cache", - "/config.cache", - "/config.log", - "/config.status", - "/configure.lineno", - "/TAGS", - "/tags", - "/wine", - "/wine64", - "Makefile", - "dlls/*/*.def", - "fonts/*.fon", - "include/config.h", - "include/stamp-h", - "libs/wine/libwine*.dylib", - "libs/wine/libwine.so.*", - "libs/wine/version.c", - "po/*.mo", - "programs/winetest/build.nfo", - "programs/winetest/build.rc", - "tools/makedep", -); - my %exported_wine_headers = ( "wine/debug.h" => 1, "wine/exception.h" => 1, @@ -616,63 +587,6 @@ sub update_makefiles(@) } -################################################################ -# process ignore targets for generic source files - -sub update_ignores(@) -{ - my @ignores; - - foreach my $file (sort @_) - { - my %makefile = %{$makefiles{$file}}; - - if (defined $makefile{"IMPORTLIB"}) - { - if ($makefile{"IMPORTLIB"} =~ /^([a-zA-Z0-9_.]+)/) - { - if ("dlls/$1/" ne $makefile{"=dir"}) { push @ignores, "dlls/lib$1.def"; } - } - else - { - die "invalid importlib name $makefile{IMPORTLIB} in $file"; - } - } - } - return @ignores; -} - - -################################################################ -# update the main .gitignore - -sub update_gitignore(@) -{ - my @ignores = values %makerules; - - foreach my $make (@makefiles) - { - my %makefile = %{$makefiles{$make}}; - my $dir = $makefile{"=dir"}; - if (defined $makefile{"PROGRAMS"}) - { - push @ignores, map { s/\$\(EXEEXT\)//; $dir . $_; } @{$makefile{"PROGRAMS"}}; - } - } - - # prepend a slash to paths that don't have one - @ignores = map { $_ =~ s/^([^\/]+)$/\/$1/; $_; } @ignores; - - # get rid of duplicates - my %ignores = (); - foreach my $i (@ignores, @_) { $ignores{$i} = 1; } - - replace_in_file( ".gitignore", undef, undef, - "# Automatically generated by make_makefiles; DO NOT EDIT!!\n", - join("\n", sort keys %ignores), "\n" ); -} - - ################################################################ # update the LINGUAS file @@ -697,5 +611,3 @@ foreach my $file (sort values %makerules, @makefiles) assign_sources_to_makefiles( @all_files ); update_linguas( @linguas ); update_makefiles( @makefiles ); -push @ignores, update_ignores( @makefiles ); -update_gitignore( @ignores );