zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

makefiles: Remove some unused variables.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-12-05 10:47:05 +01:00
parent f98f01b368
commit 05fa21e188
4 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Makefile.in
View file

@ -34,8 +34,6 @@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
srcdir = @srcdir@
SHELL = /bin/sh
RM = rm -f
MV = mv
CC = @CC@
CXX = @CXX@
CPPBIN = @CPPBIN@
@ -55,7 +53,6 @@ EXEEXT = @EXEEXT@
TOOLSEXT = @TOOLSEXT@
DLLTOOL = @DLLTOOL@
AR = @AR@
ARFLAGS = @ARFLAGS@
RANLIB = @RANLIB@
STRIP = @STRIP@
LN_S = @LN_S@
@ -73,17 +70,11 @@ CROSSTARGET = @CROSSTARGET@
SUBDIRS = @SUBDIRS@
RUNTESTFLAGS = -q -P wine
MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
PACKAGE_VERSION = @PACKAGE_VERSION@
SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g'
LDRPATH_INSTALL = @LDRPATH_INSTALL@
LDRPATH_LOCAL = @LDRPATH_LOCAL@
INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS)
INSTALL_SCRIPT = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS)
INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS)
prog_manext = 1
api_manext = 3w
conf_manext = 5
WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@
WINELOADER_DEPENDS = @WINELOADER_DEPENDS@
WINELOADER_LDFLAGS = @WINELOADER_LDFLAGS@
@ -114,12 +105,12 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status
# Rules for cleaning
distclean:: clean
$(RM) -r autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext)
rm -rf autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext)
# Rules for API documentation
install-manpages:: manpages
for i in documentation/man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
for i in documentation/man$(api_manext)/*.$(api_manext); do $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) $$i $(DESTDIR)$(mandir)/$$i; done
.PHONY: install-manpages
@ -139,9 +130,9 @@ libs/port libs/wine libs/wpp: include/config.h
TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)'
TAGS etags:
$(RM) TAGS
rm -f TAGS
(test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS)
tags ctags:
$(RM) tags
rm -f tags
(test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS)

11
configure vendored
View file

@ -755,7 +755,6 @@ EGREP
GREP
LN_S
RANLIB
ARFLAGS
STRIP
ac_ct_AR
AR
@ -5999,8 +5998,6 @@ else
STRIP="$ac_cv_prog_STRIP"
fi
ARFLAGS=rc
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@ -20223,13 +20220,13 @@ then
rm -f fonts server 2>/dev/null
wine_fn_append_rule "all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader
loader/wine64 loader/wine64-preloader:
\$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@
rm -f \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@
$with_wine64/loader/wine:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
rm -f \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
$with_wine64/loader/wine-preloader:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
rm -f \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
clean::
\$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
rm -f loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
else
TOP_INSTALL_DEV="$TOP_INSTALL_DEV include"
TOP_INSTALL_LIB="$TOP_INSTALL_LIB \

9
configure.ac
View file

@ -292,7 +292,6 @@ fi
AC_CHECK_TOOLS(AR,[ar gar],ar)
AC_CHECK_TOOL(STRIP,strip,strip)
AC_SUBST(ARFLAGS,rc)
AC_PROG_RANLIB
AC_PROG_LN_S
AC_PROG_EGREP
@ -4078,13 +4077,13 @@ then
WINE_APPEND_RULE(
[all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader
loader/wine64 loader/wine64-preloader:
\$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@]
rm -f \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@]
$with_wine64/loader/wine:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
rm -f \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
$with_wine64/loader/wine-preloader:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
rm -f \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
clean::
\$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
rm -f loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
else
TOP_INSTALL_DEV="$TOP_INSTALL_DEV include"
TOP_INSTALL_LIB="$TOP_INSTALL_LIB \

2
libs/wine/Makefile.in
View file

@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
libwine_DEPS = $(LIBWINE_DEPENDS)
version.c: dummy
version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
dummy:
.PHONY: dummy