[PATCH][RESUBMIT] tools top level makefile cleanup

[PATCH][RESUBMIT] tools top level makefile cleanup

[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.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

--- xen-unstable/tools/Makefile 2005-03-24 22:16:33.000000000 -0600
+++ xen-unstable.work/tools/Makefile 2005-03-25 10:59:12.000000000 -0600
@@ -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


-- 
Jerone Young
IBM Linux Technology Center
jyoung5@us.ibm.com
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

Re: [PATCH][RESUBMIT] tools top level makefile cleanup

[Adam Heath]

On Fri, 25 Mar 2005, Jerone Young wrote:

> 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.
>
> Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
>
> --- xen-unstable/tools/Makefile 2005-03-24 22:16:33.000000000 -0600
> +++ xen-unstable.work/tools/Makefile 2005-03-25 10:59:12.000000000 -0600
> @@ -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

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

>
> -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

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

Re: [PATCH][RESUBMIT] tools top level makefile cleanup

[Jerone Young]

On Fri, 2005-03-25 at 12:38 -0600, Adam Heath wrote:
> On Fri, 25 Mar 2005, Jerone Young wrote:
> 
> > 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.
> >
> > Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
> >
> > --- xen-unstable/tools/Makefile 2005-03-24 22:16:33.000000000 -0600
> > +++ xen-unstable.work/tools/Makefile 2005-03-25 10:59:12.000000000 -0600
> > @@ -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
> 
> How is this a valid makefile?  Where's the tab?
> 
> >
> > -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
> 
> 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. 
> 
> 
> -------------------------------------------------------
> 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
> Xen-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/xen-devel
> 
-- 
Jerone Young
IBM Linux Technology Center
jyoung5@us.ibm.com
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

Re: [PATCH][RESUBMIT] tools top level makefile cleanup

[Jerone Young]

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]


On Fri, 2005-03-25 at 12:38 -0600, Adam Heath wrote:

> 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.
> 
> 
> -------------------------------------------------------
> 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
> Xen-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/xen-devel
> 
-- 
Jerone Young
IBM Linux Technology Center
jyoung5@us.ibm.com
512-838-1157 (T/L: 678-1157)

[-- Attachment #2: tools_clean_makefile.patch --]
[-- Type: text/x-patch, Size: 1542 bytes --]

--- xen-unstable/tools/Makefile	2005-03-24 22:16:33.000000000 -0600
+++ xen-unstable.work/tools/Makefile	2005-03-25 10:59:12.000000000 -0600
@@ -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

Re: [PATCH][RESUBMIT] tools top level makefile cleanup

[Anthony Liguori]

Jerone Young wrote:

>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

Re: [PATCH][RESUBMIT] tools top level makefile cleanup

[Adam Heath]

On Fri, 25 Mar 2005, Anthony Liguori wrote:

> Jerone Young wrote:
>
> >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

Re: [PATCH][RESUBMIT] tools top level makefile cleanup

[Adam Heath]

On Fri, 25 Mar 2005, Adam Heath wrote:

> On Fri, 25 Mar 2005, Jerone Young wrote:
>
> > +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

Re: [PATCH][RESUBMIT] tools top level makefile cleanup

[Jerone Young]

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.

On Fri, 2005-03-25 at 14:21 -0600, Adam Heath wrote:
> On Fri, 25 Mar 2005, Adam Heath wrote:
> 
> > On Fri, 25 Mar 2005, Jerone Young wrote:
> >
> > > +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.
> 
-- 
Jerone Young
IBM Linux Technology Center
jyoung5@us.ibm.com
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