From e82ea96b133777fb0dc1f0b7be6784681915d320 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 24 Feb 2004 18:46:20 +0000
Subject: [PATCH] more makefile syncing

---
 Makefile.in         |  4 +++-
 include/Makefile.in | 10 +++++-----
 lib/Makefile.in     |  5 ++++-
 make.tmpl.in        |  8 ++++----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index bf7e8ae..407caa4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,9 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 kernelvsn = @kernelvsn@
 
-SUBDIRS = include lib dmsetup man
+SUBDIRS = include man
+
+SUBDIRS += lib dmsetup
 
 ifeq ($(MAKECMDGOALS),distclean)
   SUBDIRS += kernel
diff --git a/include/Makefile.in b/include/Makefile.in
index 903e4df..4a30411 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -34,13 +34,13 @@ ifeq ("@missingkernel@", "yes")
 	$(LN_S) ../../kernel/ioctl/dm-ioctl.h linux
 endif
 
-install:
-
-clean:
-
 distclean:
 	find . -maxdepth 2 -type l -exec $(RM) \{\} \;
 	$(RM) Makefile .include_symlinks .symlinks_created
 
-.PHONY: install clean distclean all
+clean:
+
+install:
+
+.PHONY: clean distclean all install
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8c1da08..cf9b2a4 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -13,7 +13,10 @@ SOURCES=libdm-common.c $(interface)/libdevmapper.c
 
 INCLUDES=-I$(interface)
 
-TARGETS=$(interface)/libdevmapper.so $(interface)/libdevmapper.a
+LIB_STATIC = $(interface)/libdevmapper.a
+LIB_SHARED = $(interface)/libdevmapper.so
+
+TARGETS = $(LIB_STATIC) $(LIB_SHARED)
 
 include ../make.tmpl
 
diff --git a/make.tmpl.in b/make.tmpl.in
index 925d80c..cc21094 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -143,12 +143,12 @@ $(TARGETS): $(OBJECTS)
 		[ -s $@ ] || $(RM) $@
 
 clean: $(SUBDIRS.clean)
-	$(RM) $(OBJECTS) $(TARGETS) $(SOURCES:%.c=%.d)
+	$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d)
 
 distclean: $(SUBDIRS.distclean)
-	$(RM) $(OBJECTS) $(TARGETS) $(SOURCES:%.c=%.d)
-	$(RM) config.cache config.log config.status
-	$(RM) Makefile make.tmpl
+	$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
+	      config.cache config.log config.status \
+	      Makefile make.tmpl core
 
 ifneq ($(MAKECMDGOALS),clean)
   ifneq ($(MAKECMDGOALS),distclean)
-- 
2.43.5