1.1 --- a/tools/vtpm_manager/Makefile	Tue Mar 25 09:49:03 2008 +0000
     1.2 +++ b/tools/vtpm_manager/Makefile	Tue Mar 25 09:49:27 2008 +0000
     1.3 @@ -7,23 +7,13 @@ SUBDIRS		= crypto tcs util manager migra
     1.4  OPENSSL_HEADER	= /usr/include/openssl/crypto.h
     1.5  
     1.6  .PHONY: all
     1.7 -all: build
     1.8 -
     1.9 -.PHONY: build
    1.10 -build:
    1.11 -	@set -e; if [ -e $(OPENSSL_HEADER) ]; then            \
    1.12 -		if [ ! -e "migration/vtpm_ipc.c" ]; then        \
    1.13 -        		ln -s ../manager/vtpm_ipc.c migration;  \
    1.14 -		fi;                                    \
    1.15 -		for subdir in $(SUBDIRS); do          \
    1.16 -			$(MAKE) -C $$subdir $@;       \
    1.17 -		done;                                 \
    1.18 -	else \
    1.19 -		echo "*** Cannot build vtpm_manager: OpenSSL developement files missing."; \
    1.20 -	fi
    1.21 +all:
    1.22 +	for subdir in $(SUBDIRS); do          \
    1.23 +		$(MAKE) -C $$subdir $@;       \
    1.24 +	done
    1.25  
    1.26  .PHONY: install
    1.27 -install: build
    1.28 +install:
    1.29  	@set -e; for subdir in $(SUBDIRS); do \
    1.30  		$(MAKE) -C $$subdir $@; \
    1.31  	done
    1.32 @@ -37,7 +27,6 @@ clean:
    1.33  
    1.34  .PHONY: mrproper
    1.35  mrproper:
    1.36 -	rm -f migration/vtpm_ipc.c
    1.37  	@set -e; for subdir in $(SUBDIRS); do \
    1.38  		$(MAKE) -C $$subdir $@; \
    1.39  	done

     2.1 --- a/tools/vtpm_manager/manager/Makefile	Tue Mar 25 09:49:03 2008 +0000
     2.2 +++ b/tools/vtpm_manager/manager/Makefile	Tue Mar 25 09:49:27 2008 +0000
     2.3 @@ -21,11 +21,12 @@ install: build
     2.4  
     2.5  .PHONY: clean
     2.6  clean:
     2.7 +	rm -f $(BIN)
     2.8  	rm -f *.a *.so *.o *.rpm $(DEP_FILES)
     2.9  
    2.10  .PHONY: mrproper
    2.11  mrproper: clean
    2.12 -	rm -f $(BIN) *~
    2.13 +	rm -f *~
    2.14  
    2.15  $(BIN): $(OBJS)
    2.16  	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@

     3.1 --- a/tools/vtpm_manager/migration/Makefile	Tue Mar 25 09:49:03 2008 +0000
     3.2 +++ b/tools/vtpm_manager/migration/Makefile	Tue Mar 25 09:49:27 2008 +0000
     3.3 @@ -1,6 +1,8 @@
     3.4  XEN_ROOT = ../../..
     3.5  include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
     3.6  
     3.7 +VPATH = ../manager
     3.8 +
     3.9  BIND		= vtpm_migratord
    3.10  BINC		= vtpm_migrator
    3.11  
    3.12 @@ -23,11 +25,12 @@ install: build
    3.13  
    3.14  .PHONY: clean
    3.15  clean:
    3.16 +	rm -f $(BINC) $(BIND)
    3.17  	rm -f *.a *.so *.o *.rpm $(DEP_FILES)
    3.18  
    3.19  .PHONY: mrproper
    3.20  mrproper: clean
    3.21 -	rm -f $(BINC) $(BIND) *~
    3.22 +	rm -f *~
    3.23  
    3.24  $(BIND): $(OBJSD)
    3.25  	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@