diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-09-02 15:15:17 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-09-08 21:30:42 +0200 |
| commit | 2b2f275ee2ea2c204f27b94d5db62d2a7da87189 (patch) | |
| tree | 7a6a0ecf79696181151cbb828511f0c86e88f8c0 /fpm | |
| parent | build: use -export-dynamic (diff) | |
| download | frr-2b2f275ee2ea2c204f27b94d5db62d2a7da87189.tar.xz frr-2b2f275ee2ea2c204f27b94d5db62d2a7da87189.zip | |
build: clean up protobuf build integration
We were linking all libs and binaries against libprotobuf-c if the
option was enabled... that makes no sense at all.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'fpm')
| -rw-r--r-- | fpm/subdir.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fpm/subdir.am b/fpm/subdir.am index 795535596..05cec5a52 100644 --- a/fpm/subdir.am +++ b/fpm/subdir.am @@ -3,8 +3,7 @@ lib_LTLIBRARIES += fpm/libfrrfpm_pb.la endif fpm_libfrrfpm_pb_la_LDFLAGS = -version-info 0:0:0 -fpm_libfrrfpm_pb_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir) -I$(top_builddir)/lib \ - $(Q_PROTOBUF_C_CLIENT_INCLUDES) +fpm_libfrrfpm_pb_la_CPPFLAGS = $(AM_CPPFLAGS) $(PROTOBUF_C_CFLAGS) fpm_libfrrfpm_pb_la_SOURCES = \ fpm/fpm.h \ fpm/fpm_pb.h \ @@ -12,11 +11,14 @@ fpm_libfrrfpm_pb_la_SOURCES = \ # end if HAVE_PROTOBUF -nodist_fpm_libfrrfpm_pb_la_SOURCES = fpm/fpm.pb-c.c +nodist_fpm_libfrrfpm_pb_la_SOURCES = \ + fpm/fpm.pb-c.c \ + # end +endif + CLEANFILES += \ fpm/fpm.pb-c.c \ fpm/fpm.pb-c.h \ # end -endif EXTRA_DIST += fpm/fpm.proto |