[Xen-changelog] [xen-unstable] [TCGBIOS] Fix some makefile issues.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Date 1169829960 0
# Node ID 4dd3266e13a73e5ac1a5193beb4a6183df5133f2
# Parent  edbff1762a550277be45d1a65798203e05dd662f
[TCGBIOS] Fix some makefile issues.
Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/firmware/rombios/32bit/Makefile         |   30 +++++++++++---------------
 tools/firmware/rombios/32bit/tcgbios/Makefile |    4 ++-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff -r edbff1762a55 -r 4dd3266e13a7 tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile     Fri Jan 26 16:39:38 2007 +0000
+++ b/tools/firmware/rombios/32bit/Makefile     Fri Jan 26 16:46:00 2007 +0000
@@ -12,33 +12,29 @@ CFLAGS += -I../
 
 SUBDIRS = tcgbios
 
-MODULES := 32bitbios.o
-MODULES += tcgbios/tcgbiosext.o
-MODULES += util.o
+MODULES = tcgbios/tcgbiosext.o
 
-.PHONY: all subdirs
+.PHONY: all subdirs clean
 
 subdirs:
        @for subdir in $(SUBDIRS); do \
                $(MAKE) -C $$subdir all; \
        done;
 
-all: subdirs $(TARGET)
+all: $(TARGET)
 
-clean::
+clean:
        rm -rf *.o $(TARGET)
        @for subdir in $(SUBDIRS); do \
                $(MAKE) -C $$subdir $@; \
        done;
 
-$(TARGET): 32bitbios_all.o $(SOURCES)
-       unref=`nm -u 32bitbios_all.o`
-       @if [ "$$unref" != "" ]; then \
-               echo "There are unresolved symbols in the BIOS.";       \
-               echo $$unref ;                                          \
-       else                                                            \
-               bash mkhex highbios_array 32bitbios_all.o > $(TARGET); \
-       fi
-
-32bitbios_all.o: $(MODULES)
-       ld $(LDFLAGS_DIRECT) -r $(MODULES) -o 32bitbios_all.o
+$(TARGET): subdirs 32bitbios.o util.o
+       ld $(LDFLAGS_DIRECT) -r 32bitbios.o $(MODULES) util.o -o 32bitbios_all.o
+       @nm 32bitbios_all.o |                                \
+         grep -E -q '^ +U ' && {                            \
+           echo "There are undefined symbols in the BIOS:"; \
+           nm -u 32bitbios_all.o;                           \
+           exit 11;                                         \
+         } || :
+       bash mkhex highbios_array 32bitbios_all.o > $@
diff -r edbff1762a55 -r 4dd3266e13a7 
tools/firmware/rombios/32bit/tcgbios/Makefile
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile     Fri Jan 26 16:39:38 
2007 +0000
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile     Fri Jan 26 16:46:00 
2007 +0000
@@ -11,9 +11,11 @@ CFLAGS += -fno-builtin -O2 -msoft-float 
 CFLAGS += -fno-builtin -O2 -msoft-float -nostdlib
 CFLAGS += -I../ -I../../
 
+.PHONY: all clean
+
 all: $(TARGET)
 
-clean::
+clean:
        rm -rf *.o $(TARGET)
 
 $(TARGET): $(OBJECTS)

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