build: fix warnings

diff --git a/Makefile.in b/Makefile.in
index 1d680d706eec44cbaaf1f2df45f4b6edabf23e7c..afd8e7488dd7e9c3c3b0f2848c0a62e425c92809 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,8 @@ include $(MK)/dir.mk
 
 DISTNAME=      $(PACKAGE_NAME)-$(VERSION)
 
+DISTCLEAN_FILES= config.h config.log mk/defs.mk
+
 dist:
        @git archive --format=tar.gz --prefix=$(DISTNAME)/ -o $(DISTNAME).tar.gz HEAD
        @git archive --format=tar --prefix=$(DISTNAME)/ HEAD | xz > $(DISTNAME).tar.xz

diff --git a/mk/common.mk b/mk/common.mk
index 2eda6f63cae4ec9d6755dc9bc4d8b9882f767f63..b294cc3e794b5b9e2a4d08572f5a006879de097c 100644 (file)
--- a/mk/common.mk
+++ b/mk/common.mk
@@ -24,3 +24,13 @@ DEPFILES_NONEMPTY=   $(DEPFILES) /nonexistent
 .c.pico:
        $(CC) -Wall -Wextra -std=gnu17 -D_GNU_SOURCE=1 -MT $@ -MD -MP -MF $*.Tpico -o $@ -c $(CFLAGS) $(LOCAL_CFLAGS) $(SHOBJ_CFLAGS) $<
        mv $*.Tpico $*.Ppico
+
+clean: clean-files
+
+clean-files:
+       rm -f $(CLEAN_FILES)
+
+distclean: distclean-files
+
+distclean-files:
+       rm -r $(DISTCLEAN_FILES)

diff --git a/mk/defs.mk.in b/mk/defs.mk.in
index 211840c3fbb56d62a0ffadc2d0c5f078c5cd30e7..d47f8302e7e0ba25ace79129681b80a4a91d01aa 100644 (file)
--- a/mk/defs.mk.in
+++ b/mk/defs.mk.in
@@ -55,5 +55,6 @@ install:
 
 check:
 
+DISTCLEAN_FILES=       config.h config.log mk/defs.mk
+
 distclean: clean
-       rm -f config.h config.log mk/defs.mk

diff --git a/mk/prog.mk b/mk/prog.mk
index 83769ca42a39474b796cbc275547545344a82baf..63231dcef1571e655e3958cbaf96f1ea5af67758 100644 (file)
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -2,14 +2,13 @@ include $(MK)/common.mk
 
 PROGNAME=      $(PROG)$(EXEEXT)
 
+CLEAN_FILES+=  $(PROGNAME) $(OBJS) $(DEPFILES)
+
 all: $(PROGNAME)
 
 $(PROGNAME): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LOCAL_LDFLAGS)
 
-clean:
-       rm -f $(PROGNAME) $(OBJS) $(DEPFILES)
-
 install: $(PROGNAME)
        install -d -m 755 $(DESTDIR)$(bindir)
        install -m 755 $(PROGNAME) $(DESTDIR)$(bindir)/

diff --git a/mk/static-lib.mk b/mk/static-lib.mk
index 2d895742ddc290008512a62bd3ad9f5d082e7a84..e097d39b8a132c775f73086feae04f4b5d02034e 100644 (file)
--- a/mk/static-lib.mk
+++ b/mk/static-lib.mk
@@ -1,5 +1,7 @@
 include $(MK)/common.mk
 
+CLEAN_FILES+=  lib$(LIB).a lib$(LIB)_pic.a $(OBJS) $(SHOBJS) $(DEPFILES)
+
 all: lib$(LIB).a lib$(LIB)_pic.a
 
 lib$(LIB).a: $(OBJS)
@@ -10,10 +12,9 @@ lib$(LIB)_pic.a: $(SHOBJS)
        $(AR) cr $@ $(SHOBJS)
        $(RANLIB) $@
 
-clean:
-       rm -f lib$(LIB).a lib$(LIB)_pic.a $(OBJS) $(SHOBJS) $(DEPFILES)
+install: install-lib
 
-install: lib$(LIB).a
+install-lib: lib$(LIB).a
        install -d -m 755 $(DESTDIR)$(libdir)
        install -m 644 lib$(LIB).a $(DESTDIR)$(libdir)/
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 16ac252c75177e7083071d5429f801dbfbbda55f..4e862f02bad6d92215ca6dad43a024d5658a193e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -17,6 +17,8 @@ TESTS_SH= \
 
 TESTS_SHELL=   $(TESTS_SH:.sh=)
 
+CLEAN_FILES=   *.o *.Po fakesmtpd mlmmj $(TESTS_SHELL)
+
 all: mlmmj fakesmtpd $(TESTS_SHELL)
 
 mlmmj: mlmmj.o mlmmj_tests.o $(top_builddir)/src/libmlmmj.a
@@ -29,9 +31,6 @@ check: all
        kyua --config='$(top_builddir)/kyua.conf' test \
            --kyuafile='$(top_srcdir)/Kyuafile' --build-root='$(top_builddir)'
 
-clean:
-       rm -f mlmmj fakesmtpd *.o *.Po $(TESTS_SHELL)
-
 install:
 
 .sh: