Skip to content

W
wine-winehq
Commit 27c3b591 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

configure.in: Remove unnecessary AC_PROG_RANLIB check

Make.rules.in: Add missing CXX variable Cosmetic changes
parent 4506673c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
tools/winemaker
View file @ 27c3b591
...@@ -1860,12 +1860,12 @@ sub generate_project_files ...@@ -1860,12 +1860,12 @@ sub generate_project_files
print FILEO "\n\n\n"; print FILEO "\n\n\n";
print FILEO "### Generic autoconf targets\n\n"; print FILEO "### Generic autoconf targets\n\n";
print FILEO "all: "; print FILEO "all:";
if (@$project[$P_PATH] eq "") { if (@$project[$P_PATH] eq "") {
print FILEO "\$(SUBDIRS)"; print FILEO " \$(SUBDIRS)";
} }
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "\$(DLLS) \$(EXES:%=%.so)"; print FILEO " \$(DLLS) \$(EXES:%=%.so)";
} }
print FILEO "\n\n"; print FILEO "\n\n";
print FILEO "\@MAKE_RULES\@\n"; print FILEO "\@MAKE_RULES\@\n";
...@@ -2262,7 +2262,6 @@ AC_PROG_CC ...@@ -2262,7 +2262,6 @@ AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CPP AC_PROG_CPP
AC_PATH_XTRA AC_PATH_XTRA
AC_PROG_RANLIB
AC_PROG_LN_S AC_PROG_LN_S
AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH) AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH)
...@@ -2843,8 +2842,6 @@ dnl End: ...@@ -2843,8 +2842,6 @@ dnl End:
# Global rules shared by all makefiles -*-Makefile-*- # Global rules shared by all makefiles -*-Makefile-*-
# #
# Each individual makefile must define the following variables: # Each individual makefile must define the following variables:
# WINE_INCLUDE_ROOT: Wine's headers location
# WINE_LIBRARY_ROOT: Wine's libraries location
# TOPOBJDIR : top-level object directory # TOPOBJDIR : top-level object directory
# SRCDIR : source directory for this module # SRCDIR : source directory for this module
# #
...@@ -2891,6 +2888,7 @@ MFC_LIBRARY_PATH = @MFC_LIBRARY_PATH@ ...@@ -2891,6 +2888,7 @@ MFC_LIBRARY_PATH = @MFC_LIBRARY_PATH@
SHELL = /bin/sh SHELL = /bin/sh
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@
WRC = @WRC@ WRC = @WRC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment