]> git.ipfire.org Git - thirdparty/lldpd.git/commitdiff
build: don't rely on GNU make $^ automatic variable
authorVincent Bernat <vincent@bernat.im>
Mon, 13 Jun 2016 06:46:57 +0000 (08:46 +0200)
committerVincent Bernat <vincent@bernat.im>
Mon, 13 Jun 2016 06:49:25 +0000 (08:49 +0200)
Not supported by BSD make. And not really needed either.

Fix #185.

NEWS
src/lib/Makefile.am

diff --git a/NEWS b/NEWS
index bdbafddbf91fd02c8f5a075ce81192bf2dd0600e..d8ffdf1b5e247a8accefac9668e828f9dafb340e 100644 (file)
--- 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:
index 9fb3f5d31281905c6adcc0fe211c9207919aa7d4..4648893b8b0dd8c3b7898f2731e607ba5f6827f4 100644 (file)
@@ -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 } \