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 874e6b724e7040feaffc6b9299077f1238b48758..3f77adfee888f2e46aa6002d57c8ecf40e275915 100644 (file)
--- 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 aae9cb7eaf21b2f0e2089ce2345d210e13361de8..f9c34f9b0cadcb6cf62985df348f85bc22df2e56 100644 (file)
--- 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 4cc8ea8cb6518e5bbd506253b20750bee9e81b6b..938fdf85f75abb657147e044b703423c6814f513 100644 (file)
--- 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 $@