Module: wine Branch: master Commit: 49c31e3bf8d083388ca50d5acb76274e86a00a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c31e3bf8d083388ca50d5acb...
Author: Alexandre Julliard julliard@winehq.org Date: Sun Jun 12 12:13:17 2011 +0200
makefiles: Use the generic install flags for the tools directories.
---
aclocal.m4 | 24 +++--------------------- configure | 35 +++++++++-------------------------- configure.ac | 12 ++++++------ tools/widl/Makefile.in | 2 +- tools/winebuild/Makefile.in | 2 +- tools/winedump/Makefile.in | 2 +- tools/winegcc/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 9 files changed, 24 insertions(+), 59 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4 index 781e627..6dd0361 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -439,28 +439,10 @@ wine_fn_config_tool () ac_flags=$[2] AS_VAR_IF([enable_tools],[no],[return 0])
- wine_fn_all_dir_rules $ac_dir Make.rules + wine_fn_config_makefile $ac_dir enable_tools $ac_flags
- case $ac_dir in - dnl tools directory has both install-lib and install-dev - tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install:: $ac_dir - @cd $ac_dir && $(MAKE) install -install-lib:: $ac_dir - @cd $ac_dir && $(MAKE) install-lib -install-dev:: $ac_dir - @cd $ac_dir && $(MAKE) install-dev" ;; - *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-dev:: $ac_dir - @cd $ac_dir && $(MAKE) install" ;; - esac - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"uninstall:: $ac_dir/Makefile - @cd $ac_dir && $(MAKE) uninstall -all __tooldeps__: $ac_dir -.PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile libs/port dummy - @cd $ac_dir && $(MAKE)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__tooldeps__: $ac_dir" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: libs/port" case $ac_dir in tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$(WINEBUILD): $ac_dir" ;; esac diff --git a/configure b/configure index 36692f7..e0afaa6 100755 --- a/configure +++ b/configure @@ -14817,27 +14817,10 @@ wine_fn_config_tool () return 0 fi
- wine_fn_all_dir_rules $ac_dir Make.rules + wine_fn_config_makefile $ac_dir enable_tools $ac_flags
- case $ac_dir in - tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install:: $ac_dir - @cd $ac_dir && $(MAKE) install -install-lib:: $ac_dir - @cd $ac_dir && $(MAKE) install-lib -install-dev:: $ac_dir - @cd $ac_dir && $(MAKE) install-dev" ;; - *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-dev:: $ac_dir - @cd $ac_dir && $(MAKE) install" ;; - esac - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"uninstall:: $ac_dir/Makefile - @cd $ac_dir && $(MAKE) uninstall -all __tooldeps__: $ac_dir -.PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile libs/port dummy - @cd $ac_dir && $(MAKE)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__tooldeps__: $ac_dir" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: libs/port" case $ac_dir in tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$(WINEBUILD): $ac_dir" ;; esac @@ -15560,12 +15543,12 @@ wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_makefile server enable_server install-lib wine_fn_config_tool tools install-dev,install-lib -wine_fn_config_tool tools/widl -wine_fn_config_tool tools/winebuild -wine_fn_config_tool tools/winedump -wine_fn_config_tool tools/winegcc -wine_fn_config_tool tools/wmc -wine_fn_config_tool tools/wrc +wine_fn_config_tool tools/widl install-dev +wine_fn_config_tool tools/winebuild install-dev +wine_fn_config_tool tools/winedump install-dev +wine_fn_config_tool tools/winegcc install-dev +wine_fn_config_tool tools/wmc install-dev +wine_fn_config_tool tools/wrc install-dev
LINGUAS="\ ar \ diff --git a/configure.ac b/configure.ac index 81a32f5..9db37c7 100644 --- a/configure.ac +++ b/configure.ac @@ -3011,12 +3011,12 @@ WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_MAKEFILE([server],,[install-lib]) WINE_CONFIG_TOOL(tools,[install-dev,install-lib]) -WINE_CONFIG_TOOL(tools/widl) -WINE_CONFIG_TOOL(tools/winebuild) -WINE_CONFIG_TOOL(tools/winedump) -WINE_CONFIG_TOOL(tools/winegcc) -WINE_CONFIG_TOOL(tools/wmc) -WINE_CONFIG_TOOL(tools/wrc) +WINE_CONFIG_TOOL(tools/widl,[install-dev]) +WINE_CONFIG_TOOL(tools/winebuild,[install-dev]) +WINE_CONFIG_TOOL(tools/winedump,[install-dev]) +WINE_CONFIG_TOOL(tools/winegcc,[install-dev]) +WINE_CONFIG_TOOL(tools/wmc,[install-dev]) +WINE_CONFIG_TOOL(tools/wrc,[install-dev])
AC_SUBST([LINGUAS],["\ ar \ diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 72cb1c0..f2bd3f3 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -30,7 +30,7 @@ all: $(PROGRAMS) widl$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LDFLAGS)
-install:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT)
uninstall:: diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index d10ede5..2017129 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -23,7 +23,7 @@ all: $(PROGRAMS) winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS)
-install:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT)
uninstall:: diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index d4210c1..c61096a 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -33,7 +33,7 @@ all: $(PROGRAMS) winedump$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS)
-install:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index db869fb..85e8002 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -32,7 +32,7 @@ winegcc$(EXEEXT): winegcc.o utils.o winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@
-install:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) winegcc$(EXEEXT) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index a6400b7..a3ba3dd 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -25,7 +25,7 @@ wmc$(EXEEXT): $(OBJS) wmc-installed: $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL)
-install:: wmc-installed $(DESTDIR)$(bindir) +install install-dev:: wmc-installed $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT)
uninstall:: diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index ff4f086..5092adb 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -29,7 +29,7 @@ wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc-installed: $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL)
-install:: wrc-installed $(DESTDIR)$(bindir) +install install-dev:: wrc-installed $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT)
uninstall::