Merge pull request #3502 from donaldsharp/socket_to_me_baby

[mirror_frr.git] / fpm / subdir.am

diff --git a/fpm/subdir.am b/fpm/subdir.am
index 795535596b6fd0a6ec5f4c06a6808059bc73f724..a0fa3d274f27436b28bcd86c50e71924140d0692 100644 (file)
--- a/fpm/subdir.am
+++ b/fpm/subdir.am
@@ -1,22 +1,24 @@
 if FPM
+if HAVE_PROTOBUF
 lib_LTLIBRARIES += fpm/libfrrfpm_pb.la
 endif
+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 \
        fpm/fpm_pb.c \
        # 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
+
 CLEANFILES += \
        fpm/fpm.pb-c.c \
        fpm/fpm.pb-c.h \
        # end
-endif
 
 EXTRA_DIST += fpm/fpm.proto