From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 25 Mar 2008 09:49:27 +0000 (+0000)
Subject: tools/vtpm_manager build: Cleanup makefiles.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14240^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=663966a277a21e84c56e973e83be202d68c3e263;p=xen.git

tools/vtpm_manager build: Cleanup makefiles.

Remove unnecessary openssl check. Use VPATH. Make clean remove all
generated files.

Signed-off-by: Bastian Blank <waldi@debian.org>
---

diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile
index 874e6b724e..3f77adfee8 100644
--- a/tools/vtpm_manager/Makefile
+++ b/tools/vtpm_manager/Makefile
@@ -7,23 +7,13 @@ SUBDIRS		= crypto tcs util manager migration
 OPENSSL_HEADER	= /usr/include/openssl/crypto.h
 
 .PHONY: all
-all: build
-
-.PHONY: build
-build:
-	@set -e; if [ -e $(OPENSSL_HEADER) ]; then            \
-		if [ ! -e "migration/vtpm_ipc.c" ]; then        \
-        		ln -s ../manager/vtpm_ipc.c migration;  \
-		fi;                                    \
-		for subdir in $(SUBDIRS); do          \
-			$(MAKE) -C $$subdir $@;       \
-		done;                                 \
-	else \
-		echo "*** Cannot build vtpm_manager: OpenSSL developement files missing."; \
-	fi
+all:
+	for subdir in $(SUBDIRS); do          \
+		$(MAKE) -C $$subdir $@;       \
+	done
 
 .PHONY: install
-install: build
+install:
 	@set -e; for subdir in $(SUBDIRS); do \
 		$(MAKE) -C $$subdir $@; \
 	done
@@ -37,7 +27,6 @@ clean:
 
 .PHONY: mrproper
 mrproper:
-	rm -f migration/vtpm_ipc.c
 	@set -e; for subdir in $(SUBDIRS); do \
 		$(MAKE) -C $$subdir $@; \
 	done
diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile
index aae9cb7eaf..f9c34f9b0c 100644
--- a/tools/vtpm_manager/manager/Makefile
+++ b/tools/vtpm_manager/manager/Makefile
@@ -21,11 +21,12 @@ install: build
 
 .PHONY: clean
 clean:
+	rm -f $(BIN)
 	rm -f *.a *.so *.o *.rpm $(DEP_FILES)
 
 .PHONY: mrproper
 mrproper: clean
-	rm -f $(BIN) *~
+	rm -f *~
 
 $(BIN): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile
index 4cc8ea8cb6..938fdf85f7 100644
--- a/tools/vtpm_manager/migration/Makefile
+++ b/tools/vtpm_manager/migration/Makefile
@@ -1,6 +1,8 @@
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
+VPATH = ../manager
+
 BIND		= vtpm_migratord
 BINC		= vtpm_migrator
 
@@ -23,11 +25,12 @@ install: build
 
 .PHONY: clean
 clean:
+	rm -f $(BINC) $(BIND)
 	rm -f *.a *.so *.o *.rpm $(DEP_FILES)
 
 .PHONY: mrproper
 mrproper: clean
-	rm -f $(BINC) $(BIND) *~
+	rm -f *~
 
 $(BIND): $(OBJSD)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@