configure.in: Remove unnecessary AC_PROG_RANLIB check

Make.rules.in: Add missing CXX variable
Cosmetic changes
oldstable
Francois Gouget 2001-05-29 20:50:58 +00:00 committed by Alexandre Julliard
parent 4506673cda
commit 27c3b59124
1 changed files with 4 additions and 6 deletions

View File

@ -1860,12 +1860,12 @@ sub generate_project_files
print FILEO "\n\n\n";
print FILEO "### Generic autoconf targets\n\n";
print FILEO "all: ";
print FILEO "all:";
if (@$project[$P_PATH] eq "") {
print FILEO "\$(SUBDIRS)";
print FILEO " \$(SUBDIRS)";
}
if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "\$(DLLS) \$(EXES:%=%.so)";
print FILEO " \$(DLLS) \$(EXES:%=%.so)";
}
print FILEO "\n\n";
print FILEO "\@MAKE_RULES\@\n";
@ -2262,7 +2262,6 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
AC_PATH_XTRA
AC_PROG_RANLIB
AC_PROG_LN_S
AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH)
@ -2843,8 +2842,6 @@ dnl End:
# Global rules shared by all makefiles -*-Makefile-*-
#
# 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
# SRCDIR : source directory for this module
#
@ -2891,6 +2888,7 @@ MFC_LIBRARY_PATH = @MFC_LIBRARY_PATH@
SHELL = /bin/sh
CC = @CC@
CPP = @CPP@
CXX = @CXX@
WRC = @WRC@
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@