From: Damjan Marion <damarion@cisco.com>
Date: Fri, 8 Jul 2016 11:57:11 +0000 (+0200)
Subject: Remove unnecessary and obsolete configure.ac directives
X-Git-Tag: v16.09-rc1~182
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=bbae375ca20df350b26bb97cbe63835661379457;p=vpp.git

Remove unnecessary and obsolete configure.ac directives

Also enable silent rules where missing

Change-Id: Ia521886815c862b013f01df4cc18fd8a298aaaa1
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/g2/configure.ac b/g2/configure.ac
index cd6522fc2ae..c8af7747b89 100644
--- a/g2/configure.ac
+++ b/g2/configure.ac
@@ -1,13 +1,12 @@
 AC_INIT(g2, 3.0)
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 
 AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
         AC_MSG_ERROR([Please install the vpp-lib package]))
 AC_CHECK_HEADER([vppinfra/clib.h],,
         AC_MSG_ERROR([Please install the vpp-dev package]))
 
-AM_PROG_AS
-AM_PROG_CC_C_O
 PKG_CHECK_MODULES(g2, gtk+-2.0)
 
 AC_OUTPUT([Makefile])
diff --git a/gmod/configure.ac b/gmod/configure.ac
index a73fb315445..651b5746c0a 100644
--- a/gmod/configure.ac
+++ b/gmod/configure.ac
@@ -1,9 +1,8 @@
 AC_INIT(gmod, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_OUTPUT([Makefile])
diff --git a/perftool/configure.ac b/perftool/configure.ac
index 37a4174f1df..f4a986972c2 100644
--- a/perftool/configure.ac
+++ b/perftool/configure.ac
@@ -1,5 +1,6 @@
 AC_INIT(perftool, 2.0)
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 
 AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
         AC_MSG_ERROR([Please install the vpp-lib package]))
@@ -7,6 +8,5 @@ AC_CHECK_HEADER([vppinfra/clib.h],,
         AC_MSG_ERROR([Please install the vpp-dev package]))
 
 AM_PROG_LIBTOOL
-AM_PROG_CC_C_O
 
 AC_OUTPUT([Makefile])
diff --git a/plugins/configure.ac b/plugins/configure.ac
index f10d180324d..1c9febe2679 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -1,10 +1,9 @@
 AC_INIT(core_plugins, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_ARG_ENABLE(tests,
               AC_HELP_STRING([--enable-tests], [Build unit tests]),
diff --git a/plugins/ioam-plugin/configure.ac b/plugins/ioam-plugin/configure.ac
index 27fda7346b4..5b6fce32a09 100644
--- a/plugins/ioam-plugin/configure.ac
+++ b/plugins/ioam-plugin/configure.ac
@@ -2,6 +2,7 @@ AC_INIT(ioam_plugin, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT([/usr])
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 
diff --git a/svm/configure.ac b/svm/configure.ac
index b3948176232..40b09606477 100644
--- a/svm/configure.ac
+++ b/svm/configure.ac
@@ -4,7 +4,4 @@ AM_INIT_AUTOMAKE
 
 AM_SILENT_RULES([yes])
 
-AM_PROG_AS
-AC_PROG_CC_C_O
-
 AC_OUTPUT([Makefile])
diff --git a/vlib-api/configure.ac b/vlib-api/configure.ac
index ab21f894ea7..f0aa308346b 100644
--- a/vlib-api/configure.ac
+++ b/vlib-api/configure.ac
@@ -5,6 +5,5 @@ AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_OUTPUT([Makefile])
diff --git a/vlib/configure.ac b/vlib/configure.ac
index 4f32a21ca9c..6aa08f6f454 100644
--- a/vlib/configure.ac
+++ b/vlib/configure.ac
@@ -4,7 +4,6 @@ AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_ARG_WITH(dpdk,
             AC_HELP_STRING([--with-dpdk],[Use the Intel dpdk]),
diff --git a/vnet/configure.ac b/vnet/configure.ac
index 439e5c680ad..5d01acc96de 100644
--- a/vnet/configure.ac
+++ b/vnet/configure.ac
@@ -6,8 +6,6 @@ AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
 AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AS
 
 AC_ARG_WITH(dpdk,
             AC_HELP_STRING([--with-dpdk],[Use the Intel dpdk]),
diff --git a/vpp-api-test/configure.ac b/vpp-api-test/configure.ac
index 4d39bd896ef..250f74c562b 100644
--- a/vpp-api-test/configure.ac
+++ b/vpp-api-test/configure.ac
@@ -1,10 +1,9 @@
 AC_INIT(vpp-api-test, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_ARG_WITH(q-plugin-prefix,
             AC_HELP_STRING([--with-q-plugin-prefix],[vlib plugin prefix]),
diff --git a/vpp-api/configure.ac b/vpp-api/configure.ac
index 9f8c3ed3b21..0a052cf9c5d 100644
--- a/vpp-api/configure.ac
+++ b/vpp-api/configure.ac
@@ -5,9 +5,7 @@ AC_CONFIG_SUBDIRS([java])
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_OUTPUT([python/Makefile])
 AC_CONFIG_FILES([Makefile])
diff --git a/vpp-api/java/configure.ac b/vpp-api/java/configure.ac
index 797d8c4ab61..2b9f2587e53 100644
--- a/vpp-api/java/configure.ac
+++ b/vpp-api/java/configure.ac
@@ -4,9 +4,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 if test -f /usr/bin/lsb_release  && test `lsb_release -si` == "Ubuntu"  && test `lsb_release -sr` == "14.04"  && test -d /usr/lib/jvm/java-8-openjdk-amd64/ ; then
     JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
diff --git a/vpp/configure.ac b/vpp/configure.ac
index 3eb7bb7cc91..25de7773674 100644
--- a/vpp/configure.ac
+++ b/vpp/configure.ac
@@ -2,9 +2,7 @@ AC_INIT(vpp, 1.1)
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_ARG_WITH(dpdk,
             AC_HELP_STRING([--with-dpdk],[Use the Intel dpdk]),
diff --git a/vppapigen/configure.ac b/vppapigen/configure.ac
index 57065b890fb..16ad59d286d 100644
--- a/vppapigen/configure.ac
+++ b/vppapigen/configure.ac
@@ -5,10 +5,10 @@
 
 AC_INIT(vppapigen, 1.0)
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_YACC
-AM_PROG_CC_C_O
 
 AC_OUTPUT([Makefile])