[Xen-changelog] [xen-unstable] tools/vtpm_manager build: Cleanup makefiles.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206438567 0
# Node ID 4492f6e2bcb3d326d6fd0e92ef44f9f7cedcf0e0
# Parent  b726d80d821134f8fd83dbc7791859aef292d115
tools/vtpm_manager build: Cleanup makefiles.

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

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 tools/vtpm_manager/Makefile           |   21 +++++----------------
 tools/vtpm_manager/manager/Makefile   |    3 ++-
 tools/vtpm_manager/migration/Makefile |    5 ++++-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff -r b726d80d8211 -r 4492f6e2bcb3 tools/vtpm_manager/Makefile
--- a/tools/vtpm_manager/Makefile       Tue Mar 25 09:49:03 2008 +0000
+++ b/tools/vtpm_manager/Makefile       Tue Mar 25 09:49:27 2008 +0000
@@ -7,23 +7,13 @@ OPENSSL_HEADER        = /usr/include/openssl/cr
 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 -r b726d80d8211 -r 4492f6e2bcb3 tools/vtpm_manager/manager/Makefile
--- a/tools/vtpm_manager/manager/Makefile       Tue Mar 25 09:49:03 2008 +0000
+++ b/tools/vtpm_manager/manager/Makefile       Tue Mar 25 09:49:27 2008 +0000
@@ -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 -r b726d80d8211 -r 4492f6e2bcb3 tools/vtpm_manager/migration/Makefile
--- a/tools/vtpm_manager/migration/Makefile     Tue Mar 25 09:49:03 2008 +0000
+++ b/tools/vtpm_manager/migration/Makefile     Tue Mar 25 09:49:27 2008 +0000
@@ -1,5 +1,7 @@ XEN_ROOT = ../../..
 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 $@

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog