ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Use the generic install flags for the tools directories.

This commit is contained in:
Alexandre Julliard 2011-06-12 12:13:17 +02:00
parent e492fcc833
commit 49c31e3bf8
9 changed files with 24 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
aclocal.m4 vendored
View File

@ -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

35
configure vendored
View File

@ -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 \

12
configure.ac
View File

@ -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 \

2
tools/widl/Makefile.in
View File

@ -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::

2
tools/winebuild/Makefile.in
View File

@ -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::

2
tools/winedump/Makefile.in
View File

@ -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

2
tools/winegcc/Makefile.in
View File

@ -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)

2
tools/wmc/Makefile.in
View File

@ -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::

2
tools/wrc/Makefile.in
View File

@ -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::