4 files changed, 34 insertions, 30 deletions
diff --git a/fpm/.gitignore b/fpm/.gitignore
index b133c52a42..17e90443e9 100644
--- a/fpm/.gitignore
+++ b/fpm/.gitignore
@@ -1,4 +1,4 @@
-Makefile
+!Makefile
 Makefile.in
 *.o
 tags
diff --git a/fpm/Makefile b/fpm/Makefile
new file mode 100644
index 0000000000..1d280d176e
--- /dev/null
+++ b/fpm/Makefile
@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. fpm/libfrrfpm_pb.la
+%: ALWAYS
+	@$(MAKE) -s -C .. fpm/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:
diff --git a/fpm/Makefile.am b/fpm/Makefile.am
deleted file mode 100644
index 1f46ac6db2..0000000000
--- a/fpm/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-include ../common.am
-
-AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib $(Q_PROTOBUF_C_CLIENT_INCLUDES)
-
-PROTOBUF_INCLUDES=-I$(top_srcdir)
-PROTOBUF_PACKAGE = fpm
-
-lib_LTLIBRARIES = libfrrfpm_pb.la
-libfrrfpm_pb_la_LDFLAGS = -version-info 0:0:0
-
-if HAVE_PROTOBUF
-protobuf_srcs =
-
-protobuf_srcs_nodist =				\
-	fpm.pb-c.c
-endif
-
-libfrrfpm_pb_la_SOURCES =			\
-	fpm.h					\
-	fpm_pb.h				\
-	fpm_pb.c				\
-	$(protobuf_srcs)
-
-nodist_libfrrfpm_pb_la_SOURCES = $(protobuf_srcs_nodist)
-
-CLEANFILES = $(Q_CLEANFILES)
-
-BUILT_SOURCES = $(Q_PROTOBUF_SRCS)
-EXTRA_DIST = fpm.proto
diff --git a/fpm/subdir.am b/fpm/subdir.am
new file mode 100644
index 0000000000..f81a84222c
--- /dev/null
+++ b/fpm/subdir.am
@@ -0,0 +1,23 @@
+if FPM
+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_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
+BUILT_SOURCES += fpm/fpm.pb-c.c
+CLEANFILES += \
+	fpm/fpm.pb-c.c \
+	fpm/fpm.pb-c.h \
+	# end
+endif
+
+EXTRA_DIST += fpm/fpm.proto