Module: wine Branch: master Commit: 092f37fc2d20428930ca8dc058525cb9d45fc3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092f37fc2d20428930ca8dc058...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Dec 31 19:07:49 2013 +0100
makefiles: Include program files in the all: target.
---
Make.rules.in | 2 +- aclocal.m4 | 3 --- configure | 35 ++++++++++------------------------- configure.ac | 27 ++++++++------------------- loader/Makefile.in | 7 ------- server/Makefile.in | 2 -- tools/Makefile.in | 5 ++--- tools/makedep.c | 2 +- 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 -- 14 files changed, 22 insertions(+), 73 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in index 0a5a046..7cffd10 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -35,7 +35,7 @@ all: $(MANPAGES:.man.in=.man) # Rules for cleaning
clean:: - $(RM) $(CLEAN_FILES) $(PROGRAMS) + $(RM) $(CLEAN_FILES)
.PHONY: clean
diff --git a/aclocal.m4 b/aclocal.m4 index 7760a20..dff44af 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -644,9 +644,6 @@ 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 () diff --git a/configure b/configure index 19db3c3..24a470b 100755 --- a/configure +++ b/configure @@ -7049,10 +7049,6 @@ else READELF="$ac_cv_prog_READELF" 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="" @@ -7521,9 +7517,6 @@ fi 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 () @@ -7556,13 +7549,12 @@ distclean:: 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"
-LOADER_RULES=" -all: $wine_binary wine-installed +wine_binary="wine" +test "x$enable_win64" != "xyes" || wine_binary="wine64" +loader_programs="$wine_binary wine-installed"
+LOADER_RULES=" install install-lib:: wine-installed $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$wine_binary
@@ -14409,11 +14401,9 @@ 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" + test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine-preloader" + loader_programs="$loader_programs $wine_binary-preloader" as_fn_append LOADER_RULES " -all: $wine_binary-preloader - $wine_binary-preloader: preloader.o $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o $(LIBPORT) $(LDFLAGS)
@@ -14426,6 +14416,9 @@ uninstall:: esac ;; esac +as_fn_append LOADER_RULES " +PROGRAMS = $loader_programs +"
ac_save_CFLAGS="$CFLAGS" @@ -17400,16 +17393,8 @@ wine_fn_ignore_file "include/stamp-h" 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" +test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine"
ac_config_commands="$ac_config_commands Makefile"
diff --git a/configure.ac b/configure.ac index 9a37857..73eb820 100644 --- a/configure.ac +++ b/configure.ac @@ -682,17 +682,13 @@ DLLEXT=".so" IMPLIBEXT="def" STATIC_IMPLIBEXT="def.a" WINE_PATH_SONAME_TOOLS +WINE_CONFIG_HELPERS
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") +loader_programs="$wine_binary wine-installed"
AC_SUBST(LOADER_RULES,[" -all: $wine_binary wine-installed - install install-lib:: wine-installed $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$wine_binary
@@ -2000,11 +1996,9 @@ 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") + test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") + loader_programs="$loader_programs $wine_binary-preloader" AS_VAR_APPEND([LOADER_RULES],[" -all: $wine_binary-preloader - $wine_binary-preloader: preloader.o $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o $(LIBPORT) $(LDFLAGS)
@@ -2017,6 +2011,9 @@ uninstall:: esac ;; esac +AS_VAR_APPEND([LOADER_RULES],[" +PROGRAMS = $loader_programs +"])
dnl **** Check for functions ****
@@ -3446,16 +3443,8 @@ WINE_IGNORE_FILE("include/stamp-h") 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) +test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine")
AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () diff --git a/loader/Makefile.in b/loader/Makefile.in index de3d4f8..2c81e26 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -5,13 +5,6 @@ C_SRCS = \ main.c \ preloader.c
-PROGRAMS = \ - wine \ - wine-installed \ - wine-preloader \ - wine64 \ - wine64-preloader - MANPAGES = \ wine.de.UTF-8.man.in \ wine.fr.UTF-8.man.in \ diff --git a/server/Makefile.in b/server/Makefile.in index ea19dc4..3998f2f 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -52,8 +52,6 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in
-all: $(PROGRAMS) - @MAKE_RULES@
wineserver: $(OBJS) diff --git a/tools/Makefile.in b/tools/Makefile.in index 5cfa005..5863014 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -5,8 +5,7 @@ PROGRAMS = \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ make_xftmpl$(EXEEXT) \ - sfnt2fnt$(EXEEXT) \ - wineapploader + sfnt2fnt$(EXEEXT)
MANPAGES = \ winemaker.de.UTF-8.man.in \ @@ -25,7 +24,7 @@ IN_SRCS = \
UPDATE_DESKTOP_DATABASE = update-desktop-database
-all: $(PROGRAMS) +all: wineapploader
@MAKE_RULES@
diff --git a/tools/makedep.c b/tools/makedep.c index e113cf9..1216ff6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1379,9 +1379,9 @@ static struct strarray output_sources(void) struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; - struct strarray all_targets = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray imports = get_expanded_make_var_array( "IMPORTS" ); + struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); char *module = get_expanded_make_variable( "MODULE" ); char *exeext = get_expanded_make_variable( "EXEEXT" ); diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 01c22e6..4565f54 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,8 +21,6 @@ BISON_SRCS = parser.y
EXTRADEFS = -DDEFAULT_INCLUDE_DIR="$(includedir)/windows/"
-all: $(PROGRAMS) - @MAKE_RULES@
widl$(EXEEXT): $(OBJS) $(LIBWPP) diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index bcd7c8c..638e3e5 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -12,8 +12,6 @@ C_SRCS = \ spec32.c \ utils.c
-all: $(PROGRAMS) - @MAKE_RULES@
winebuild$(EXEEXT): $(OBJS) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 421baa1..d5f0e7b 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -23,8 +23,6 @@ C_SRCS = \ symbol.c \ tlb.c
-all: $(PROGRAMS) - @MAKE_RULES@
winedump$(EXEEXT): $(OBJS) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 074a972..6b72211 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -18,8 +18,6 @@ C_SRCS = \ utils.c \ winegcc.c
-all: $(PROGRAMS) - @MAKE_RULES@
winegcc$(EXEEXT): winegcc.o utils.o diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index fcf8212..e2adaf4 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -12,8 +12,6 @@ C_SRCS = \
BISON_SRCS = mcy.y
-all: $(PROGRAMS) - @MAKE_RULES@
wmc$(EXEEXT): $(OBJS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 8a74f64..9d956b8 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -17,8 +17,6 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y
-all: $(PROGRAMS) - @MAKE_RULES@
wrc$(EXEEXT): $(OBJS) $(LIBWPP)