]> git.ipfire.org Git - thirdparty/ipset.git/commitdiff
Fix build failed on --disable-dependency-tracking
authorNeutron Soutmun <neo.neutron@gmail.com>
Thu, 10 May 2012 19:29:34 +0000 (21:29 +0200)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 10 May 2012 19:29:34 +0000 (21:29 +0200)
configure.ac
lib/Make_extra.am

index d9a71d344da7c26e0642cd296c74577a86dfdd5c..af19bf459224d02c91e2fb3d3e5b858e62b13f71 100644 (file)
@@ -222,7 +222,7 @@ if test "x$enable_settype_modules" != "xyes"; then
 else
        AC_MSG_RESULT([    Dynamic module loading: enabled])
 fi
-IPSET_ALL_MODULES="`ls lib/ipset_*.c|sed -e 's/lib\///' -e 's/\.c$//'`"
+IPSET_ALL_MODULES="`ls ${srcdir}/lib/ipset_*.c|sed -e 's/^.*lib\///' -e 's/\.c$//'`"
 AC_MSG_RESULT([    Static modules:])
 if test "x$SETTYPE_MODLIST" = "x"; then
        for mod in $IPSET_ALL_MODULES; do
index e5e498c399f54cc03b9de36fcc8abe21845d897b..47da7010173d675f0f7e7403c7a461af2acececf 100644 (file)
@@ -26,11 +26,16 @@ 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
-       depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-       $(LTCOMPILE) -D_INIT=ipset_$*_init \
-         $(if $(findstring ipset_$*.c,$(IPSET_SETTYPE_STATIC)), -DTYPE_INCLUSIVE,)\
-         -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< && \
-       $(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@   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@      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, $@)"; \