[ovs-dev] [PATCH] Makefile: Drop vestiges of support for non-GNU Make.
Ben Pfaff
blp at ovn.org
Wed Mar 8 04:48:08 UTC 2017
Open vSwitch has documented a requirement for GNU Make for a long time, yet
it had vestiges catering to other make implementations. This removes
those.
Signed-off-by: Ben Pfaff <blp at ovn.org>
---
Makefile.am | 6 ------
acinclude.m4 | 54 ++----------------------------------------------------
configure.ac | 3 +--
3 files changed, 3 insertions(+), 60 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 90f5c0353811..c853085b9ca9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -184,11 +184,6 @@ CLEAN_LOCAL += clean-pycov
# If we're checked out from a Git repository, make sure that every
# file that is in Git is distributed.
-#
-# We only enable this check when GNU make is in use because the
-# Makefile in datapath/linux, needed to get the list of files to
-# distribute, requires GNU make extensions.
-if GNU_MAKE
ALL_LOCAL += dist-hook-git
dist-hook-git: distfiles
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
@@ -220,7 +215,6 @@ distfiles: Makefile
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | \
LC_ALL=C sort -u > $@
CLEANFILES += distfiles
-endif
.PHONY: dist-hook-git
# Check that every .c file includes <config.h>.
diff --git a/acinclude.m4 b/acinclude.m4
index 19cffe08c894..5bbca0b22a9e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,6 @@
# -*- autoconf -*-
-# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
+# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -873,53 +873,6 @@ AC_DEFUN([OVS_CHECK_XENSERVER_VERSION],
;;
esac])
-dnl OVS_MAKE_HAS_IF([if-true], [if-false])
-dnl
-dnl Checks whether make has the GNU make $(if condition,then,else) extension.
-dnl Runs 'if-true' if so, 'if-false' otherwise.
-AC_DEFUN([OVS_CHECK_MAKE_IF],
- [AC_CACHE_CHECK(
- [whether ${MAKE-make} has GNU make \$(if) extension],
- [ovs_cv_gnu_make_if],
- [cat <<'EOF' > conftest.mk
-conftest.out:
- echo $(if x,y,z) > conftest.out
-.PHONY: all
-EOF
- rm -f conftest.out
- AS_ECHO(["$as_me:$LINENO: invoking ${MAKE-make} -f conftest.mk all:"]) >&AS_MESSAGE_LOG_FD 2>&1
- ${MAKE-make} -f conftest.mk conftest.out >&AS_MESSAGE_LOG_FD 2>&1
- AS_ECHO(["$as_me:$LINENO: conftest.out contains:"]) >&AS_MESSAGE_LOG_FD 2>&1
- cat conftest.out >&AS_MESSAGE_LOG_FD 2>&1
- result=`cat conftest.out`
- rm -f conftest.mk conftest.out
- if test "X$result" = "Xy"; then
- ovs_cv_gnu_make_if=yes
- else
- ovs_cv_gnu_make_if=no
- fi])])
-
-dnl OVS_CHECK_GNU_MAKE
-dnl
-dnl Checks whether make is GNU make (because Linux kernel Makefiles
-dnl only work with GNU make).
-AC_DEFUN([OVS_CHECK_GNU_MAKE],
- [AC_CACHE_CHECK(
- [whether ${MAKE-make} is GNU make],
- [ovs_cv_gnu_make],
- [rm -f conftest.out
- AS_ECHO(["$as_me:$LINENO: invoking ${MAKE-make} --version:"]) >&AS_MESSAGE_LOG_FD 2>&1
- ${MAKE-make} --version >conftest.out 2>&1
- cat conftest.out >&AS_MESSAGE_LOG_FD 2>&1
- result=`cat conftest.out`
- rm -f conftest.mk conftest.out
-
- case $result in # (
- GNU*) ovs_cv_gnu_make=yes ;; # (
- *) ovs_cv_gnu_make=no ;;
- esac])
- AM_CONDITIONAL([GNU_MAKE], [test $ovs_cv_gnu_make = yes])])
-
dnl OVS_CHECK_SPARSE_TARGET
dnl
dnl The "cgcc" script from "sparse" isn't very good at detecting the
@@ -951,14 +904,11 @@ AC_DEFUN([OVS_SPARSE_EXTRA_INCLUDES],
dnl OVS_ENABLE_SPARSE
AC_DEFUN([OVS_ENABLE_SPARSE],
[AC_REQUIRE([OVS_CHECK_SPARSE_TARGET])
- AC_REQUIRE([OVS_CHECK_MAKE_IF])
AC_REQUIRE([OVS_SPARSE_EXTRA_INCLUDES])
: ${SPARSE=sparse}
AC_SUBST([SPARSE])
AC_CONFIG_COMMANDS_PRE(
- [if test $ovs_cv_gnu_make_if = yes; then
- CC='$(if $(C),env REAL_CC="'"$CC"'" CHECK="$(SPARSE) -I $(top_srcdir)/include/sparse $(SPARSEFLAGS) $(SPARSE_EXTRA_INCLUDES) " cgcc $(CGCCFLAGS),'"$CC"')'
- fi])])
+ [CC='$(if $(C),env REAL_CC="'"$CC"'" CHECK="$(SPARSE) -I $(top_srcdir)/include/sparse $(SPARSEFLAGS) $(SPARSE_EXTRA_INCLUDES) " cgcc $(CGCCFLAGS),'"$CC"')'])])
dnl OVS_PTHREAD_SET_NAME
dnl
diff --git a/configure.ac b/configure.ac
index 6d75a57696f6..671fce7fbb52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
+# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -120,7 +120,6 @@ OVS_CHECK_VALGRIND
OVS_CHECK_SOCKET_LIBS
OVS_CHECK_XENSERVER_VERSION
OVS_CHECK_GROFF
-OVS_CHECK_GNU_MAKE
OVS_CHECK_TLS
OVS_CHECK_ATOMIC_LIBS
OVS_CHECK_GCC4_ATOMICS
--
2.10.2
More information about the dev
mailing list