Skip to contentSkip to conversation

tools top level makefile cleanup

PATCH In review Jerone Young 3 participants 8 messages Mar 25, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools top level makefile cleanup

A lot of good discussion on the how the makefile should be for the past week. I waited to see how everything would pan out. So I left things simple and fixed up the patch.

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +30 -12
@@ -1,37 +1,36 @@
+XEN_ROOT = ../
+include $(XEN_ROOT)/tools/Rules.mk
 
-all: 
- $(MAKE) -C check
- $(MAKE) -C libxutil
- $(MAKE) -C libxc
- $(MAKE) -C misc
- $(MAKE) -C examples
- $(MAKE) -C xentrace
- $(MAKE) -C python
- $(MAKE) -C xfrd
- $(MAKE) -C xcs
- $(MAKE) -C ioemu
+SUBDIRS :=
+SUBDIRS += libxutil
+SUBDIRS += libxc
+SUBDIRS += misc
+SUBDIRS += examples
+SUBDIRS += xentrace
+SUBDIRS += python
+SUBDIRS += xfrd
+SUBDIRS += xcs
+SUBDIRS += ioemu
+
+.PHONY: all install clean check check_clean
+
+all: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done
 
-install: 
+install: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done
+
+clean: check_clean
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done
+
+check:

$(MAKE) -C check
- $(MAKE) -C libxutil install
- $(MAKE) -C libxc install
- $(MAKE) -C misc install
- $(MAKE) -C examples install
- $(MAKE) -C xentrace install
- $(MAKE) -C python install
- $(MAKE) -C xfrd install
- $(MAKE) -C sv install
- $(MAKE) -C xcs install
- $(MAKE) -C ioemu install
-
-clean build:
- $(MAKE) -C check $@
- $(MAKE) -C libxutil $@
- $(MAKE) -C libxc $@
- $(MAKE) -C misc $@
- $(MAKE) -C examples $@
- $(MAKE) -C xentrace $@
- $(MAKE) -C python $@
- $(MAKE) -C xfrd $@
- $(MAKE) -C xcs clean
- $(MAKE) -C ioemu clean
+
+check_clean:
+ $(MAKE) -C check clean

Signature · 12 lines
Jerone Young
IBM Linux Technology Center
[email protected]
512-838-1157 (T/L: 678-1157)



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
#1 lore raw
Quoted 30 lines · Jerone Young

A lot of good discussion on the how the makefile should be for the past week. I waited to see how everything would pan out. So I left things simple and fixed up the patch.

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +9 -11
@@ -1,37 +1,36 @@
+XEN_ROOT = ../
+include $(XEN_ROOT)/tools/Rules.mk
 
-all:
- $(MAKE) -C check
- $(MAKE) -C libxutil
- $(MAKE) -C libxc
- $(MAKE) -C misc
- $(MAKE) -C examples
- $(MAKE) -C xentrace
- $(MAKE) -C python
- $(MAKE) -C xfrd
- $(MAKE) -C xcs
- $(MAKE) -C ioemu
+SUBDIRS :=
+SUBDIRS += libxutil
+SUBDIRS += libxc
+SUBDIRS += misc
+SUBDIRS += examples
+SUBDIRS += xentrace
+SUBDIRS += python

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 line 20

Quoted 10 lines
tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +10 -0
+SUBDIRS += xfrd
+SUBDIRS += xcs
+SUBDIRS += ioemu
+
+.PHONY: all install clean check check_clean
+
+all: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done

How is this a valid makefile? Where's the tab?

Quoted 29 lines
tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +11 -1
-install:
+install: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done
+
+clean: check_clean
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done
+
+check:

$(MAKE) -C check
- $(MAKE) -C libxutil install
- $(MAKE) -C libxc install
- $(MAKE) -C misc install
- $(MAKE) -C examples install
- $(MAKE) -C xentrace install
- $(MAKE) -C python install
- $(MAKE) -C xfrd install
- $(MAKE) -C sv install
- $(MAKE) -C xcs install
- $(MAKE) -C ioemu install

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +0 -5
-
-clean build:
- $(MAKE) -C check $@
- $(MAKE) -C libxutil $@
- $(MAKE) -C libxc $@

tools/Makefile 2005-03-25 10:59:12.000000000 -0600

Quoted 10 lines
tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +3 -7
- $(MAKE) -C misc $@
- $(MAKE) -C examples $@
- $(MAKE) -C xentrace $@
- $(MAKE) -C python $@
- $(MAKE) -C xfrd $@
- $(MAKE) -C xcs clean
- $(MAKE) -C ioemu clean
+
+check_clean:
+ $(MAKE) -C check clean

Even here, the source file is missing the tab. Did your editor barf?

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

#2 lore raw
Quoted 78 lines · Adam Heath
Quoted 30 lines · Jerone Young

A lot of good discussion on the how the makefile should be for the past week. I waited to see how everything would pan out. So I left things simple and fixed up the patch.

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +9 -11
@@ -1,37 +1,36 @@
+XEN_ROOT = ../
+include $(XEN_ROOT)/tools/Rules.mk
 
-all:
- $(MAKE) -C check
- $(MAKE) -C libxutil
- $(MAKE) -C libxc
- $(MAKE) -C misc
- $(MAKE) -C examples
- $(MAKE) -C xentrace
- $(MAKE) -C python
- $(MAKE) -C xfrd
- $(MAKE) -C xcs
- $(MAKE) -C ioemu
+SUBDIRS :=
+SUBDIRS += libxutil
+SUBDIRS += libxc
+SUBDIRS += misc
+SUBDIRS += examples
+SUBDIRS += xentrace
+SUBDIRS += python

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 line 20

Quoted 10 lines
tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +10 -0
+SUBDIRS += xfrd
+SUBDIRS += xcs
+SUBDIRS += ioemu
+
+.PHONY: all install clean check check_clean
+
+all: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done

How is this a valid makefile? Where's the tab?

Quoted 33 lines
tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +11 -1
-install:
+install: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done
+
+clean: check_clean
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done
+
+check:

$(MAKE) -C check
- $(MAKE) -C libxutil install
- $(MAKE) -C libxc install
- $(MAKE) -C misc install
- $(MAKE) -C examples install
- $(MAKE) -C xentrace install
- $(MAKE) -C python install
- $(MAKE) -C xfrd install
- $(MAKE) -C sv install
- $(MAKE) -C xcs install
- $(MAKE) -C ioemu install

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +0 -9
-
-clean build:
- $(MAKE) -C check $@
- $(MAKE) -C libxutil $@
- $(MAKE) -C libxc $@
- $(MAKE) -C misc $@
- $(MAKE) -C examples $@
- $(MAKE) -C xentrace $@
- $(MAKE) -C python $@
Quoted 8 lines

tools/Makefile 2005-03-25 10:59:12.000000000 -0600

Quoted 6 lines

- $(MAKE) -C xfrd $@
- $(MAKE) -C xcs clean
- $(MAKE) -C ioemu clean

tools/Makefile 2005-03-25 10:59:12.000000000 -0600 renamed from tools/Makefile 2005-03-24 22:16:33.000000000 -0600 +3 -0
+
+check_clean:
+ $(MAKE) -C check clean

Even here, the source file is missing the tab. Did your editor barf?

That's odd the file I did the diff from has the tabs just fine. Hmmm, I'll redo it.

Quoted 12 lines

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xen-devel

Signature · 12 lines
Jerone Young
IBM Linux Technology Center
[email protected]
512-838-1157 (T/L: 678-1157)



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
#3 lore raw
Quoted 3 lines · Jerone Young

That's odd the file I did the diff from has the tabs just fine. Hmmm, I'll redo it.

A lot of mail clients translate tabs into spaces when inlining patches. In general, it's better to attach patches (keeping a plain-text mime type of course) if you have such a mail client.

Regards,
Anthony Liguori

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

#4 lore raw
Quoted 8 lines · Anthony Liguori
Quoted 3 lines · Jerone Young

That's odd the file I did the diff from has the tabs just fine. Hmmm, I'll redo it.

A lot of mail clients translate tabs into spaces when inlining patches. In general, it's better to attach patches (keeping a plain-text mime type of course) if you have such a mail client.

Any such mail client is broken.

For the record, I use pine, and it doesn't have these problems.

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

#5 lore raw
In reply to Adam Heath
Quoted 1 line · Adam Heath

Even here, the source file is missing the tab. Did your editor barf?

Actually it was Evolution (my mail client) that did this I've attached the original patch. I guess it removed the tabs when I inserted the patch into the email.

Quoted 12 lines

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xen-devel

Signature · 4 lines
Jerone Young
IBM Linux Technology Center
[email protected]
512-838-1157 (T/L: 678-1157)
tools/Makefile +33 -34
@@ -1,37 +1,36 @@
+XEN_ROOT = ../
+include $(XEN_ROOT)/tools/Rules.mk
 
-all:	
-	$(MAKE) -C check
-	$(MAKE) -C libxutil
-	$(MAKE) -C libxc
-	$(MAKE) -C misc
-	$(MAKE) -C examples
-	$(MAKE) -C xentrace
-	$(MAKE) -C python
-	$(MAKE) -C xfrd
-	$(MAKE) -C xcs
-	$(MAKE) -C ioemu
+SUBDIRS :=
+SUBDIRS += libxutil
+SUBDIRS += libxc
+SUBDIRS += misc
+SUBDIRS += examples
+SUBDIRS += xentrace
+SUBDIRS += python
+SUBDIRS += xfrd
+SUBDIRS += xcs
+SUBDIRS += ioemu
+
+.PHONY: all install clean check check_clean
+
+all: check
+	@for subdir in $(SUBDIRS); do \
+		$(MAKE) -C $$subdir $@ || exit -1; \
+	done
 
-install: 
+install: check
+	@for subdir in $(SUBDIRS); do \
+		$(MAKE) -C $$subdir $@ || exit -1; \
+	done
+
+clean: check_clean
+	@for subdir in $(SUBDIRS); do \
+		$(MAKE) -C $$subdir $@ || exit -1; \
+	done
+
+check:
 	$(MAKE) -C check
-	$(MAKE) -C libxutil install
-	$(MAKE) -C libxc install
-	$(MAKE) -C misc install
-	$(MAKE) -C examples install
-	$(MAKE) -C xentrace install
-	$(MAKE) -C python install
-	$(MAKE) -C xfrd install
-	$(MAKE) -C sv install
-	$(MAKE) -C xcs install
-	$(MAKE) -C ioemu install
-
-clean build:
-	$(MAKE) -C check $@
-	$(MAKE) -C libxutil $@
-	$(MAKE) -C libxc $@
-	$(MAKE) -C misc $@
-	$(MAKE) -C examples $@
-	$(MAKE) -C xentrace $@
-	$(MAKE) -C python $@
-	$(MAKE) -C xfrd $@
-	$(MAKE) -C xcs clean
-	$(MAKE) -C ioemu clean
+
+check_clean:
+	$(MAKE) -C check clean
#6 lore raw
In reply to Adam Heath
Quoted 8 lines · Adam Heath
Quoted 4 lines · Jerone Young

+all: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done

How is this a valid makefile? Where's the tab?

Please use "@set -e; for ...", and remove the "|| exit -1".

Besides, exit -1 is poor, it s/b a positive number. It's not really possible to exit with a negative value.

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

#7 lore raw

That can easily be fixed when put in the tree. The main point is to exit with a non zero value. True by exiting with -1 can't get the negative exit code from the shell (you would get 255). But still bahaviors the same way if $? != 0 then we know something is wrong.

Quoted 16 lines · Adam Heath
Quoted 8 lines · Adam Heath
Quoted 4 lines · Jerone Young

+all: check
+ @for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@ || exit -1; \
+ done

How is this a valid makefile? Where's the tab?

Please use "@set -e; for ...", and remove the "|| exit -1".

Besides, exit -1 is poor, it s/b a positive number. It's not really possible to exit with a negative value.

Signature · 12 lines
Jerone Young
IBM Linux Technology Center
[email protected]
512-838-1157 (T/L: 678-1157)



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click