From bedf4757a8b11ce55940bb97289005a79e005cbb Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 5 Oct 2013 19:35:07 +0200 Subject: [PATCH] configure: Use more user-friendly names for subdirectory targets. --- Make.rules.in | 6 +-- aclocal.m4 | 118 +++++++++++++++++++++++++------------------------- configure | 118 +++++++++++++++++++++++++------------------------- 3 files changed, 121 insertions(+), 121 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index ec8d4d2afaf..2f3f29ab61f 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -170,13 +170,13 @@ uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages) # Rules for cleaning -$(EXTRASUBDIRS:%=%/__clean__): dummy +$(EXTRASUBDIRS:%=%/clean): dummy -cd `dirname $@` && $(RM) $(CLEAN_FILES) -clean:: $(EXTRASUBDIRS:%=%/__clean__) +clean:: $(EXTRASUBDIRS:%=%/clean) $(RM) $(CLEAN_FILES) $(CLEAN_TARGETS) $(PROGRAMS) $(MANPAGES) -.PHONY: clean $(EXTRASUBDIRS:%=%/__clean__) +.PHONY: clean $(EXTRASUBDIRS:%=%/clean) # Rules for installing diff --git a/aclocal.m4 b/aclocal.m4 index 3de919946e3..5b5cc94901f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -234,9 +234,9 @@ wine_fn_depend_rules () wine_fn_append_rule \ "$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps @./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 +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" } @@ -286,30 +286,30 @@ wine_fn_install_rules () wine_fn_has_flag install-lib $ac_flags || wine_fn_has_flag install-dev $ac_flags || return wine_fn_append_rule \ -".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -$ac_dir/__install__:: $ac_dir +".PHONY: $ac_dir/install $ac_dir/uninstall +$ac_dir/install:: $ac_dir @cd $ac_dir && \$(MAKE) install -$ac_dir/__uninstall__:: $ac_dir/Makefile +$ac_dir/uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall -install:: $ac_dir/__install__ -__uninstall__: $ac_dir/__uninstall__" +install:: $ac_dir/install +__uninstall__: $ac_dir/uninstall" if wine_fn_has_flag install-lib $ac_flags then wine_fn_append_rule \ -".PHONY: $ac_dir/__install-lib__ -$ac_dir/__install-lib__:: $ac_dir +".PHONY: $ac_dir/install-lib +$ac_dir/install-lib:: $ac_dir @cd $ac_dir && \$(MAKE) install-lib -install-lib:: $ac_dir/__install-lib__" +install-lib:: $ac_dir/install-lib" fi if wine_fn_has_flag install-dev $ac_flags then wine_fn_append_rule \ -".PHONY: $ac_dir/__install-dev -$ac_dir/__install-dev__:: $ac_dir +".PHONY: $ac_dir/install-dev +$ac_dir/install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install-dev -install-dev:: $ac_dir/__install-dev__" +install-dev:: $ac_dir/install-dev" fi } @@ -323,9 +323,9 @@ wine_fn_clean_rules () if wine_fn_has_flag clean $ac_flags then wine_fn_append_rule \ -"__clean__: $ac_dir/__clean__ -.PHONY: $ac_dir/__clean__ -$ac_dir/__clean__: $ac_dir/Makefile +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) clean \$(RM) $ac_dir/Makefile" else @@ -368,13 +368,13 @@ wine_fn_config_lib () wine_fn_clean_rules $ac_dir $ac_flags wine_fn_append_rule \ -".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) +".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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a -install install-dev:: $ac_dir/__install__ -__uninstall__: $ac_dir/__uninstall__ +install install-dev:: $ac_dir/install +__uninstall__: $ac_dir/uninstall __builddeps__: $ac_dir $ac_dir: tools/widl tools/winebuild tools/winegcc include" } @@ -419,22 +419,22 @@ wine_fn_config_dll () "$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__" +.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) +"$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__:: +$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) +"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll -$ac_dir/__uninstall__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" fi @@ -449,20 +449,20 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile @cd $ac_dir && \$(MAKE) lib$ac_implib.def $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) +.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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -install install-dev:: $ac_dir/__install-dev__ -__uninstall__: $ac_dir/__uninstall__" +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__ +"$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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" fi @@ -482,13 +482,13 @@ $ac_file.def: $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: $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) +.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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -install install-dev:: $ac_dir/__install-dev__ -__uninstall__: $ac_dir/__uninstall__" +install install-dev:: $ac_dir/install-dev +__uninstall__: $ac_dir/uninstall" if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule \ @@ -544,41 +544,41 @@ wine_fn_config_program () wine_fn_has_flag install $ac_flags || return wine_fn_append_rule \ -".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -install install-lib:: $ac_dir/__install__ -__uninstall__: $ac_dir/__uninstall__" +".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) +"$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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) +"$ac_dir/install:: __tooldeps__ \$(DESTDIR)\$(bindir) \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name -$ac_dir/__uninstall__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) +"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(bindir) \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program -$ac_dir/__uninstall__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) +"$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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)" fi } @@ -603,9 +603,9 @@ wine_fn_config_test () 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 +check test: $ac_dir/test +.PHONY: $ac_dir/test +$ac_dir/test: dummy @cd $ac_dir && \$(MAKE) test testclean:: \$(RM) $ac_dir/*.ok" @@ -613,9 +613,9 @@ testclean:: if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule \ -"crosstest: $ac_dir/__crosstest__ -.PHONY: $ac_dir/__crosstest__ -$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy +"crosstest: $ac_dir/crosstest +.PHONY: $ac_dir/crosstest +$ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) crosstest" fi } @@ -663,7 +663,7 @@ wine_fn_config_symlink () distclean:: \$(RM) $ac_links" test -n "$ac_linkdir" || return - wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links" + wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/depend: $ac_links" } if test "x$CROSSTEST_DISABLE" != x diff --git a/configure b/configure index 56f2fabc4b2..f3c9b5f69d5 100755 --- a/configure +++ b/configure @@ -16147,9 +16147,9 @@ wine_fn_depend_rules () wine_fn_append_rule \ "$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps @./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 +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" } @@ -16199,30 +16199,30 @@ wine_fn_install_rules () wine_fn_has_flag install-lib $ac_flags || wine_fn_has_flag install-dev $ac_flags || return wine_fn_append_rule \ -".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -$ac_dir/__install__:: $ac_dir +".PHONY: $ac_dir/install $ac_dir/uninstall +$ac_dir/install:: $ac_dir @cd $ac_dir && \$(MAKE) install -$ac_dir/__uninstall__:: $ac_dir/Makefile +$ac_dir/uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall -install:: $ac_dir/__install__ -__uninstall__: $ac_dir/__uninstall__" +install:: $ac_dir/install +__uninstall__: $ac_dir/uninstall" if wine_fn_has_flag install-lib $ac_flags then wine_fn_append_rule \ -".PHONY: $ac_dir/__install-lib__ -$ac_dir/__install-lib__:: $ac_dir +".PHONY: $ac_dir/install-lib +$ac_dir/install-lib:: $ac_dir @cd $ac_dir && \$(MAKE) install-lib -install-lib:: $ac_dir/__install-lib__" +install-lib:: $ac_dir/install-lib" fi if wine_fn_has_flag install-dev $ac_flags then wine_fn_append_rule \ -".PHONY: $ac_dir/__install-dev -$ac_dir/__install-dev__:: $ac_dir +".PHONY: $ac_dir/install-dev +$ac_dir/install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install-dev -install-dev:: $ac_dir/__install-dev__" +install-dev:: $ac_dir/install-dev" fi } @@ -16236,9 +16236,9 @@ wine_fn_clean_rules () if wine_fn_has_flag clean $ac_flags then wine_fn_append_rule \ -"__clean__: $ac_dir/__clean__ -.PHONY: $ac_dir/__clean__ -$ac_dir/__clean__: $ac_dir/Makefile +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) clean \$(RM) $ac_dir/Makefile" else @@ -16283,13 +16283,13 @@ wine_fn_config_lib () wine_fn_clean_rules $ac_dir $ac_flags wine_fn_append_rule \ -".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) +".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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a -install install-dev:: $ac_dir/__install__ -__uninstall__: $ac_dir/__uninstall__ +install install-dev:: $ac_dir/install +__uninstall__: $ac_dir/uninstall __builddeps__: $ac_dir $ac_dir: tools/widl tools/winebuild tools/winegcc include" } @@ -16333,22 +16333,22 @@ else "$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__" +.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) +"$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__:: +$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) +"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll -$ac_dir/__uninstall__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" fi @@ -16364,20 +16364,20 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile @cd $ac_dir && \$(MAKE) lib$ac_implib.def $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) +.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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -install install-dev:: $ac_dir/__install-dev__ -__uninstall__: $ac_dir/__uninstall__" +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__ +"$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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" fi @@ -16397,13 +16397,13 @@ $ac_file.def: $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: $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) +.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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT -install install-dev:: $ac_dir/__install-dev__ -__uninstall__: $ac_dir/__uninstall__" +install install-dev:: $ac_dir/install-dev +__uninstall__: $ac_dir/uninstall" if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule \ @@ -16461,41 +16461,41 @@ fi wine_fn_has_flag install $ac_flags || return wine_fn_append_rule \ -".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -install install-lib:: $ac_dir/__install__ -__uninstall__: $ac_dir/__uninstall__" +".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) +"$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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) +"$ac_dir/install:: __tooldeps__ \$(DESTDIR)\$(bindir) \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name -$ac_dir/__uninstall__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) +"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(bindir) \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program -$ac_dir/__uninstall__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) +"$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__:: +$ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)" fi } @@ -16522,9 +16522,9 @@ fi 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 +check test: $ac_dir/test +.PHONY: $ac_dir/test +$ac_dir/test: dummy @cd $ac_dir && \$(MAKE) test testclean:: \$(RM) $ac_dir/*.ok" @@ -16532,9 +16532,9 @@ testclean:: if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule \ -"crosstest: $ac_dir/__crosstest__ -.PHONY: $ac_dir/__crosstest__ -$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy +"crosstest: $ac_dir/crosstest +.PHONY: $ac_dir/crosstest +$ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) crosstest" fi } @@ -16584,7 +16584,7 @@ wine_fn_config_symlink () distclean:: \$(RM) $ac_links" test -n "$ac_linkdir" || return - wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links" + wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/depend: $ac_links" } if test "x$CROSSTEST_DISABLE" != x