diff options
| author | Neutron Soutmun <neo.neutron@gmail.com> | 2012-05-10 21:29:34 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2012-05-10 21:29:34 +0200 |
| commit | 1c67aca41a9d7ff133c27f841d55721b1701f9ee (patch) | |
| tree | 4c433fcb1510192538059e325e3f494e4a41e98e | |
| parent | e693cf5e152ffa5dd3917a05856e9f10000eb37e (diff) | |
| download | ipset-1c67aca41a9d7ff133c27f841d55721b1701f9ee.tar.gz | |
Fix build failed on --disable-dependency-tracking
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/Make_extra.am | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d9a71d3..af19bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/lib/Make_extra.am b/lib/Make_extra.am index e5e498c..47da701 100644 --- a/lib/Make_extra.am +++ b/lib/Make_extra.am @@ -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, $@)"; \ |