diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-15 15:00:49 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-15 15:00:49 +0000 |
| commit | 52a8efe1a7bd2e9896d7769347eb3611e36e5052 (patch) | |
| tree | e951c36a1a6f85ca8f42b477355682e57c372e31 /tools/misc | |
| parent | 74851d00abd8170a7b8482f7075ea3f6ea7c49b6 (diff) | |
| download | xen-52a8efe1a7bd2e9896d7769347eb3611e36e5052.tar.gz xen-52a8efe1a7bd2e9896d7769347eb3611e36e5052.tar.bz2 xen-52a8efe1a7bd2e9896d7769347eb3611e36e5052.zip | |
bitkeeper revision 1.797 (4055c521Ophk9zIrp59mxPKyKg_0MA)
Makefile:
Rationalise makefiles by folding dist option into install with a prefined prefix.
Diffstat (limited to 'tools/misc')
| -rw-r--r-- | tools/misc/Makefile | 15 | ||||
| -rw-r--r-- | tools/misc/miniterm/Makefile | 16 |
2 files changed, 12 insertions, 19 deletions
diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 59fa4c1c93..8756881c07 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -1,3 +1,4 @@ + CC = gcc CFLAGS = -Wall -O3 EXTRA_INC = -I../../xen/include/hypervisor-ifs @@ -12,24 +13,16 @@ TARGETS = xen_cpuperf INSTALL = $(TARGETS) xen-mkdevnodes xen_nat_enable xen-clone all: $(TARGETS) - $(MAKE) -C miniterm + $(MAKE) -C miniterm install: all mkdir -p $(prefix)/usr/bin - cp $(INSTALL) $(prefix)/usr/bin - for i in $(INSTALL); do chmod 755 $(prefix)/usr/bin/$i ; done + install -m0755 $(INSTALL) $(prefix)/usr/bin $(MAKE) -C miniterm install -dist: all - mkdir -p ../../../install/bin - cp $(INSTALL) ../../../install/bin - for i in $(INSTALL); do chmod 755 ../../../install/bin/$i ; done - $(MAKE) -C miniterm dist - clean: - $(RM) *.o $(TARGETS) + $(RM) *.o $(TARGETS) *~ $(MAKE) -C miniterm clean %: %.c $(HDRS) Makefile $(CC) $(CFLAGS) $(EXTRA_INC) -o $@ $< - diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile index 993c156d5e..86e1bf0ccf 100644 --- a/tools/misc/miniterm/Makefile +++ b/tools/misc/miniterm/Makefile @@ -1,13 +1,13 @@ -CC = gcc -CFLAGS = -O3 -march=i686 -Wall -all: miniterm +CC = gcc +CFLAGS = -Wall -O3 +TARGET = miniterm -install: all - cp -a miniterm $(prefix)/usr/bin/ +all: $(TARGET) -dist: all - cp -a miniterm ../../../../install/bin/ +install: all + mkdir -p $(prefix)/usr/bin + install -m0755 $(TARGET) $(prefix)/usr/bin clean: - rm -f *.o miniterm *~ + $(RM) *.o $(TARGET) *~ |