more makefile syncing

diff --git a/Makefile.in b/Makefile.in
index bf7e8ae1683c4021fb9f4caed0e50c041ece6639..407caa4b6e5b5711512e7082ed7f608bd898dcad 100644 (file)
--- 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 903e4dfb34d38451a5fe860f3b4b4463aa43b3d7..4a30411ca656ce7c1ef48e73ab4d3c4d14260b5f 100644 (file)
--- 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 8c1da08e5b2de8fb868800877fe8af96dfbd21de..cf9b2a4ce8f6341bfd42e4c039de268fd99e92d5 100644 (file)
--- 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 925d80c60da18794acb2ea1a8442ead062ebb8b0..cc210948196bca2a6d68fd12a7853c862a0915cc 100644 (file)
--- 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)