marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Include program files in the all: target.

oldstable
Alexandre Julliard 2013-12-31 19:07:49 +01:00
parent 1adaad4c89
commit 092f37fc2d
14 changed files with 22 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Make.rules.in
View File

@ -35,7 +35,7 @@ all: $(MANPAGES:.man.in=.man)
# Rules for cleaning # Rules for cleaning
clean:: clean::
$(RM) $(CLEAN_FILES) $(PROGRAMS) $(RM) $(CLEAN_FILES)
.PHONY: clean .PHONY: clean

3
aclocal.m4 vendored
View File

@ -644,9 +644,6 @@ wine_fn_config_tool ()
case $ac_dir in case $ac_dir in
tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;;
esac esac
case $ac_dir in
tools/*) wine_fn_ignore_file $ac_dir/`expr $ac_dir : tools/"\\(.*\\)"`$ac_exeext ;;
esac
} }
wine_fn_config_makerules () wine_fn_config_makerules ()

35
configure vendored
View File

@ -7049,10 +7049,6 @@ else
READELF="$ac_cv_prog_READELF" READELF="$ac_cv_prog_READELF"
fi fi
wine_binary="wine"
test "x$enable_win64" != "xyes" || wine_binary="wine64"
wine_rules_file=conf$$rules.make wine_rules_file=conf$$rules.make
rm -f $wine_rules_file rm -f $wine_rules_file
ALL_POT_FILES="" ALL_POT_FILES=""
@ -7521,9 +7517,6 @@ fi
case $ac_dir in case $ac_dir in
tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;;
esac esac
case $ac_dir in
tools/*) wine_fn_ignore_file $ac_dir/`expr $ac_dir : tools/"\\(.*\\)"`$ac_exeext ;;
esac
} }
wine_fn_config_makerules () wine_fn_config_makerules ()
@ -7556,13 +7549,12 @@ distclean::
test -n "$ac_linkdir" || return 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"
} }
wine_fn_ignore_file "loader/wine"
test "$wine_binary" = wine || wine_fn_ignore_file "loader/$wine_binary" wine_binary="wine"
wine_fn_ignore_file "loader/wine-installed" test "x$enable_win64" != "xyes" || wine_binary="wine64"
loader_programs="$wine_binary wine-installed"
LOADER_RULES=" LOADER_RULES="
all: $wine_binary wine-installed
install install-lib:: wine-installed install install-lib:: wine-installed
\$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary
@ -14409,11 +14401,9 @@ case $host_os in
linux*) linux*)
case $host_cpu in case $host_cpu in
*i[3456789]86*|x86_64*) *i[3456789]86*|x86_64*)
wine_fn_ignore_file "loader/wine-preloader" test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine-preloader"
test "$wine_binary" = wine || wine_fn_ignore_file "loader/$wine_binary-preloader" loader_programs="$loader_programs $wine_binary-preloader"
as_fn_append LOADER_RULES " as_fn_append LOADER_RULES "
all: $wine_binary-preloader
$wine_binary-preloader: preloader.o $wine_binary-preloader: preloader.o
\$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS)
@ -14426,6 +14416,9 @@ uninstall::
esac esac
;; ;;
esac esac
as_fn_append LOADER_RULES "
PROGRAMS = $loader_programs
"
ac_save_CFLAGS="$CFLAGS" 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_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.nfo"
test "x$enable_winetest" = xno || wine_fn_ignore_file "programs/winetest/build.rc" 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/makedep$ac_exeext"
test "x$enable_tools" = xno || wine_fn_ignore_file "tools/sfnt2fnt$ac_exeext" test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine"
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" ac_config_commands="$ac_config_commands Makefile"

27
configure.ac
View File

@ -682,17 +682,13 @@ DLLEXT=".so"
IMPLIBEXT="def" IMPLIBEXT="def"
STATIC_IMPLIBEXT="def.a" STATIC_IMPLIBEXT="def.a"
WINE_PATH_SONAME_TOOLS WINE_PATH_SONAME_TOOLS
WINE_CONFIG_HELPERS
wine_binary="wine" wine_binary="wine"
test "x$enable_win64" != "xyes" || wine_binary="wine64" test "x$enable_win64" != "xyes" || wine_binary="wine64"
loader_programs="$wine_binary wine-installed"
WINE_IGNORE_FILE("loader/wine")
test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/$wine_binary")
WINE_IGNORE_FILE("loader/wine-installed")
AC_SUBST(LOADER_RULES,[" AC_SUBST(LOADER_RULES,["
all: $wine_binary wine-installed
install install-lib:: wine-installed install install-lib:: wine-installed
\$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary
@ -2000,11 +1996,9 @@ case $host_os in
linux*) linux*)
case $host_cpu in case $host_cpu in
*i[[3456789]]86*|x86_64*) *i[[3456789]]86*|x86_64*)
WINE_IGNORE_FILE("loader/wine-preloader") test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader")
test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/$wine_binary-preloader") loader_programs="$loader_programs $wine_binary-preloader"
AS_VAR_APPEND([LOADER_RULES],[" AS_VAR_APPEND([LOADER_RULES],["
all: $wine_binary-preloader
$wine_binary-preloader: preloader.o $wine_binary-preloader: preloader.o
\$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS)
@ -2017,6 +2011,9 @@ uninstall::
esac esac
;; ;;
esac esac
AS_VAR_APPEND([LOADER_RULES],["
PROGRAMS = $loader_programs
"])
dnl **** Check for functions **** dnl **** Check for functions ****
@ -3446,16 +3443,8 @@ WINE_IGNORE_FILE("include/stamp-h")
WINE_IGNORE_FILE("fonts/*.fon",enable_fonts) WINE_IGNORE_FILE("fonts/*.fon",enable_fonts)
WINE_IGNORE_FILE("programs/winetest/build.nfo",enable_winetest) WINE_IGNORE_FILE("programs/winetest/build.nfo",enable_winetest)
WINE_IGNORE_FILE("programs/winetest/build.rc",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/makedep$ac_exeext",enable_tools)
WINE_IGNORE_FILE("tools/sfnt2fnt$ac_exeext",enable_tools) test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine")
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], AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile],
[wine_fn_output_makefile () [wine_fn_output_makefile ()

7
loader/Makefile.in
View File

@ -5,13 +5,6 @@ C_SRCS = \
main.c \ main.c \
preloader.c preloader.c
PROGRAMS = \
wine \
wine-installed \
wine-preloader \
wine64 \
wine64-preloader
MANPAGES = \ MANPAGES = \
wine.de.UTF-8.man.in \ wine.de.UTF-8.man.in \
wine.fr.UTF-8.man.in \ wine.fr.UTF-8.man.in \

2
server/Makefile.in
View File

@ -52,8 +52,6 @@ MANPAGES = \
wineserver.fr.UTF-8.man.in \ wineserver.fr.UTF-8.man.in \
wineserver.man.in wineserver.man.in
all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
wineserver: $(OBJS) wineserver: $(OBJS)

5
tools/Makefile.in
View File

@ -5,8 +5,7 @@ PROGRAMS = \
fnt2fon$(EXEEXT) \ fnt2fon$(EXEEXT) \
make_ctests$(EXEEXT) \ make_ctests$(EXEEXT) \
make_xftmpl$(EXEEXT) \ make_xftmpl$(EXEEXT) \
sfnt2fnt$(EXEEXT) \ sfnt2fnt$(EXEEXT)
wineapploader
MANPAGES = \ MANPAGES = \
winemaker.de.UTF-8.man.in \ winemaker.de.UTF-8.man.in \
@ -25,7 +24,7 @@ IN_SRCS = \
UPDATE_DESKTOP_DATABASE = update-desktop-database UPDATE_DESKTOP_DATABASE = update-desktop-database
all: $(PROGRAMS) all: wineapploader
@MAKE_RULES@ @MAKE_RULES@

2
tools/makedep.c
View File

@ -1379,9 +1379,9 @@ static struct strarray output_sources(void)
struct strarray implib_objs = empty_strarray; struct strarray implib_objs = empty_strarray;
struct strarray includes = empty_strarray; struct strarray includes = empty_strarray;
struct strarray subdirs = empty_strarray; struct strarray subdirs = empty_strarray;
struct strarray all_targets = empty_strarray;
struct strarray phony_targets = empty_strarray; struct strarray phony_targets = empty_strarray;
struct strarray imports = get_expanded_make_var_array( "IMPORTS" ); 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" ); struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" );
char *module = get_expanded_make_variable( "MODULE" ); char *module = get_expanded_make_variable( "MODULE" );
char *exeext = get_expanded_make_variable( "EXEEXT" ); char *exeext = get_expanded_make_variable( "EXEEXT" );

2
tools/widl/Makefile.in
View File

@ -21,8 +21,6 @@ BISON_SRCS = parser.y
EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\" EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\"
all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
widl$(EXEEXT): $(OBJS) $(LIBWPP) widl$(EXEEXT): $(OBJS) $(LIBWPP)

2
tools/winebuild/Makefile.in
View File

@ -12,8 +12,6 @@ C_SRCS = \
spec32.c \ spec32.c \
utils.c utils.c
all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
winebuild$(EXEEXT): $(OBJS) winebuild$(EXEEXT): $(OBJS)

2
tools/winedump/Makefile.in
View File

@ -23,8 +23,6 @@ C_SRCS = \
symbol.c \ symbol.c \
tlb.c tlb.c
all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
winedump$(EXEEXT): $(OBJS) winedump$(EXEEXT): $(OBJS)

2
tools/winegcc/Makefile.in
View File

@ -18,8 +18,6 @@ C_SRCS = \
utils.c \ utils.c \
winegcc.c winegcc.c
all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
winegcc$(EXEEXT): winegcc.o utils.o winegcc$(EXEEXT): winegcc.o utils.o

2
tools/wmc/Makefile.in
View File

@ -12,8 +12,6 @@ C_SRCS = \
BISON_SRCS = mcy.y BISON_SRCS = mcy.y
all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
wmc$(EXEEXT): $(OBJS) wmc$(EXEEXT): $(OBJS)

2
tools/wrc/Makefile.in
View File

@ -17,8 +17,6 @@ C_SRCS = \
LEX_SRCS = parser.l LEX_SRCS = parser.l
BISON_SRCS = parser.y BISON_SRCS = parser.y
all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc$(EXEEXT): $(OBJS) $(LIBWPP)