From fa809c2636c7d061c598fe84bbc2aa6fcb0e32b1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 31 Jul 2014 21:26:06 -0500 Subject: [PATCH] build: clean nm-version.h Now that nm-version.h.in lives in libnm-util/, a stale nm-version.h from include/ messes up the build with errors about NM_VERSION_*. Clean both old & new nm-version.h on 'make clean' so that we can switch branches between nm-0-9-8, nm-0-9-10, and git master and just run 'make clean' and get things to work. --- include/Makefile.am | 2 ++ libnm-util/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/Makefile.am b/include/Makefile.am index b465d8b5aa..2e3d1d8136 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -5,3 +5,5 @@ EXTRA_DIST = \ nm-gvaluearray-compat.h \ nm-test-utils.h \ nm-settings-flags.h + +CLEANFILES=nm-version.h diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 79c3706b85..873e8547dc 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -154,7 +154,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnm-util.pc DISTCLEANFILES = libnm-util.pc -CLEANFILES = +CLEANFILES = nm-version.h EXTRA_DIST = libnm-util.pc.in libnm-util.ver nm-version.h.in