From: Vincent Bernat Date: Mon, 13 Jun 2016 06:46:57 +0000 (+0200) Subject: build: don't rely on GNU make $^ automatic variable X-Git-Tag: 0.9.4~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8ffca58d84d3b93b55e9ff0c52b68426402a81e;p=thirdparty%2Flldpd.git build: don't rely on GNU make $^ automatic variable Not supported by BSD make. And not really needed either. Fix #185. --- diff --git a/NEWS b/NEWS index bdbafddb..d8ffdf1b 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ lldpd (0.9.4) + lldpcli will now display chassis TTL when detailed view is enabled. * Fix: + Fix setting of local value for port ID. + + Fix compilation with BSD make. lldpd (0.9.3) * Change: diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 9fb3f5d3..4648893b 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -21,7 +21,7 @@ liblldpctl_la_LIBADD = $(top_builddir)/src/libcommon-daemon-lib.la libfixedpoin atom-glue.c: $(ATOM_FILES) Makefile $(AM_V_GEN)($(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(filter %.c,$^) | \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES) | \ $(SED) -n 's+^void init_atom_builder_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \ sort | \ $(AWK) '{ atoms[$$2] = 1 } \ @@ -31,7 +31,7 @@ atom-glue.c: $(ATOM_FILES) Makefile for (atom in atoms) { print " init_atom_builder_"atom"();" } \ print "}"; }' && \ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(filter %.c,$^) | \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES) | \ $(SED) -n 's+^void init_atom_map_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \ sort -n | \ $(AWK) '{ atoms[$$2] = 1 } \