[dm-devel] dmraid/tools Makefile.in

[zkabelac at sourceware.org]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac at sourceware.org	2010-05-30 17:39:02

Modified files:
	tools          : Makefile.in 

Log message:
	Add version.h to DISCLEAN_TARGETS
	Simplify install and remove targets

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/Makefile.in.diff?cvsroot=dm&r1=1.10&r2=1.11

--- dmraid/tools/Makefile.in	2010/05/28 08:37:37	1.10
+++ dmraid/tools/Makefile.in	2010/05/30 17:39:02	1.11
@@ -11,6 +11,7 @@
 DIETLIBC = @DIETLIBC@
 KLIBC = @KLIBC@
 
+DISTCLEAN_TARGETS += version.h
 INCLUDES += -I$(src_dir)
 
 SOURCES=\
@@ -24,14 +25,14 @@
 TARGETS=\
 	dmraid
 
-include $(top_builddir)/make.tmpl
-
 ifeq ("@KLIBC@", "no")
 	ifeq ("@STATIC_LINK@", "no")
 		TARGETS += dmevent_tool
 	endif
 endif
 
+include $(top_builddir)/make.tmpl
+
 DMRAIDLIBS=-ldmraid
 
 # FIXME: use pkg-config here to get the list of needed librarie
@@ -64,29 +65,20 @@
 	endif
 endif
 
-all: $(TARGETS)
-
-.PHONY: install_dmraid_tools remove_dmraid_tools
+.PHONY: install_dmraid_tools
 
-dmraid:	$(OBJECTS) $(top_builddir)/lib/libdmraid.a
+dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a
 	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS)
 
 dmevent_tool: $(OBJECTS2) $(top_builddir)/lib/libdmraid.a
 	$(CC) -o $@ $(OBJECTS2) $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib \
-	  $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(LIBS)
+		$(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS)
 
 install_dmraid_tools: $(TARGETS)
-	@echo "Installing $(TARGETS) in $(DESTDIR)$(sbindir)"; \
-	$(INSTALL_DIR) $(DESTDIR)$(sbindir); \
+	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	$(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)$(sbindir)
 
 install: install_dmraid_tools
 
-remove_dmraid_tools:
-	@echo "Removing $(TARGETS) from $(DESTDIR)$(sbindir)"; \
-	for f in $(TARGETS); \
-	do \
-		rm -f $(DESTDIR)$(sbindir)/$$f; \
-	done
-
-remove:	remove_dmraid_tools
+remove:
+	$(RM) $(addprefix $(DESTDIR)$(sbindir)/,$(TARGETS))