summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2012-05-10 22:05:37 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2012-05-10 22:05:37 +0200
commitb8112e34ccca7501bc32add471e05b926f509ad6 (patch)
tree0e2a8c4a112ef9df9b87e10dcafc3e4f9b3ac715 /lib
parent1c67aca41a9d7ff133c27f841d55721b1701f9ee (diff)
Enable silent (kernel style) compile messages
Diffstat (limited to 'lib')
-rw-r--r--lib/.gitignore2
-rw-r--r--lib/Make_extra.am14
-rw-r--r--lib/Makefile.am3
3 files changed, 8 insertions, 11 deletions
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 $<