From b8112e34ccca7501bc32add471e05b926f509ad6 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 10 May 2012 22:05:37 +0200
Subject: Enable silent (kernel style) compile messages

---
 Make_global.am    |  6 ------
 Makefile.am       |  5 -----
 configure.ac      | 13 +------------
 lib/.gitignore    |  2 ++
 lib/Make_extra.am | 14 ++++++--------
 lib/Makefile.am   |  3 ---
 src/Makefile.am   |  3 ---
 7 files changed, 9 insertions(+), 37 deletions(-)
 create mode 100644 lib/.gitignore

diff --git a/Make_global.am b/Make_global.am
index 667436c..24a1a34 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -80,9 +80,3 @@ AM_CFLAGS += -g -g3 -ggdb -gdwarf-2 -DIPSET_DEBUG -Wall -Werror
 else
 AM_CFLAGS += -O2 -DNDEBUG
 endif
-
-if ! ENABLE_VERBOSE
-AM_LIBTOOL_SILENT = --silent
-AM_VERBOSE_CC     = @echo "  CC      " $@;
-AM_VERBOSE_CCLD   = @echo "  CCLD    " $@;
-endif
diff --git a/Makefile.am b/Makefile.am
index 42b9550..f4fd978 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,11 +14,6 @@ IP_SET_MAX=256
 else
 IP_SET_MAX=$(MAXSETS)
 endif
-if ENABLE_VERBOSE
-V=1
-else
-V=0
-endif
 
 SUBDIRS		= include/libipset lib src
 
diff --git a/configure.ac b/configure.ac
index af19bf4..728d7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_ENABLE_STATIC
 LT_INIT([dlopen])
@@ -91,18 +92,6 @@ AC_ARG_ENABLE([verbose],
 	       *) AC_MSG_ERROR([bad value ${enableval} for --enable-verbose]) ;;
 	       esac], [enable_verbose=no])
 	      
-AM_CONDITIONAL([ENABLE_VERBOSE], [test "x$enable_verbose" = xyes])
-
-dnl Enable debugging
-AC_ARG_ENABLE([debug],
-	      AS_HELP_STRING([--enable-debug],
-	                     [Enable compiling with debug support.]),
-	      [case "${enableval}" in
-	       yes)	enable_verbose=yes ;;
-	       no)	enable_verbose=no ;;
-	       *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
-	       esac], [enable_debug=no])
-	      
 AM_CONDITIONAL([ENABLE_DEBUG], [test "x$enable_debug" = xyes])
 
 dnl Enable type modules
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 0000000..ae3539d
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,2 @@
+/ipset_settype_check
+/types_init.c
diff --git a/lib/Make_extra.am b/lib/Make_extra.am
index 47da701..cd0eb99 100644
--- a/lib/Make_extra.am
+++ b/lib/Make_extra.am
@@ -26,26 +26,25 @@ BUILT_SOURCES = ipset_settype_check types_init.c ipset_settype_modules
 CLEANFILES = ipset_settype_check types_init.c $(IPSET_SETTYPE_ALL_MODULES)
 
 ipset_%.lo: ipset_%.c
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -D_INIT=ipset_$*_init \
 		$(if $(findstring ipset_$*.c,$(IPSET_SETTYPE_STATIC)), -DTYPE_INCLUSIVE,)\
 		-MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< && \
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -D_INIT=ipset_$*_init \
 		$(if $(findstring ipset_$*.c,$(IPSET_SETTYPE_STATIC)), -DTYPE_INCLUSIVE,)\
 		-c -o $@ $<
 
 ipset_%.la: $(lib_LTLIBRARIES) ipset_%.lo
-	lobj="$(patsubst %.la, %.lo, $@)"; \
-	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_V_CCLD)lobj="$(patsubst %.la, %.lo, $@)"; \
+	$(LIBTOOL) --silent --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 		$(CFLAGS) $(IPSET_SETTYPE_DYNAMIC_LTFLAGS) $(LDFLAGS) -o $@ \
 		-rpath $(IPSET_MODSDIR) $$lobj $(LIBS) $(top_builddir)/lib/libipset.la
 
 types_init.c: $(IPSET_SETTYPE_STATIC_OBJECTS)
-	@( \
-	static_list=`echo $(patsubst %.c,%,$(IPSET_SETTYPE_STATIC))`; \
+	$(AM_V_GEN)static_list=`echo $(patsubst %.c,%,$(IPSET_SETTYPE_STATIC))`; \
 	echo -n "" > $@; \
 	for i in $$static_list; do \
 		echo "extern void $${i}_init(void);" >> $@; \
@@ -56,8 +55,7 @@ types_init.c: $(IPSET_SETTYPE_STATIC_OBJECTS)
 	for i in $$static_list; do \
 		echo "	""$${i}_init();" >> $@; \
 	done; \
-	echo "}" >> $@; \
-	);
+	echo "}" >> $@;
 
 ipset_settype_check:
 	@list="$(IPSET_SETTYPE_MODULES) $(IPSET_SETTYPE_STATIC_OBJECTS)"; \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 90c73e0..fd853dd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,6 +35,3 @@ libipset_la_SOURCES = \
 	types_init.c
 
 EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map
-
-#%.o: %.c
-#	${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} ${CFLAGS} -o $@ -c $<
diff --git a/src/Makefile.am b/src/Makefile.am
index fcc4621..717fd14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,3 @@ endif
 endif
 
 dist_man_MANS = ipset.8
-
-#%.o: %.c
-#	${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} ${CFLAGS} -o $@ -c $<
-- 
cgit v1.2.3