[devhelp] build: Use CLEANFILES for files built by make



commit 9ef71eb10daa7652914ee4a26d532548ed5ad1d2
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Nov 10 17:01:42 2016 -0600

    build: Use CLEANFILES for files built by make
    
    Best practice is to use CLEANFILES to clean stuff build by make, and
    DISTCLEANFILES only for stuff built by configure. Everyone has to run
    make and it's very unexpected for 'make clean' to not clean things it
    builds....
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774069

 data/Makefile.am |    6 ++----
 src/Makefile.am  |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index e0bbd14..00ecac3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -51,9 +51,7 @@ EXTRA_DIST =                  \
 
 CLEANFILES =                   \
        $(DESKTOP_FILES)        \
-       $(defaults_DATA)
-
-DISTCLEANFILES =               \
-       $(desktop_DATA) \
+       $(defaults_DATA)        \
+       $(desktop_DATA)         \
        $(dbusservice_DATA)     \
        $(app_data_files)
diff --git a/src/Makefile.am b/src/Makefile.am
index d49394c..5889d16 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -130,7 +130,7 @@ dh-enum-types.h: dh-enum-types.h.template $(libdevhelp_public_headers) $(GLIB_MK
 dh-enum-types.c: dh-enum-types.c.template $(libdevhelp_public_headers) $(GLIB_MKENUMS)
        $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template dh-enum-types.c.template 
$(libdevhelp_public_headers)) > $@
 
-DISTCLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
@@ -163,5 +163,5 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-DISTCLEANFILES += $(gir_DATA) $(typelib_DATA)
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]