[openib-general] Re: [patch] userspace/management/Makefile small fixes
Hal Rosenstock
halr at voltaire.com
Sun Jan 15 08:10:43 PST 2006
Hi Sssha,
On Sun, 2006-01-15 at 07:42, Sasha Khapyrsky wrote:
> Hello Hal,
>
> I found small outdates in userspace/management/Makefile. Fixes are
> attached.
Thanks. They are a vestige of history and didn't keep the Makefile
sync'd up with these changes.
Thanks. Applied.
Please see below for comment about emailing patch.
-- Hal
> Sasha.
>
>
> Small fixes in Makefile:
> - remove nonexisted 'UTIL' dir
> - fix DIAG dir definition (so 'make all' will make diags as well)
>
> Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
>
> Index: Makefile
> ===================================================================
> --- Makefile (revision 4999)
> +++ Makefile (working copy)
> @@ -2,10 +2,9 @@
> LIBS:=libibcommon libibumad libibmad
> OSM:=osm
> OSMLIBS:=complib libvendor
> -UTIL:=$(wildcard util/*)
> -DIAG:=$(wildcard diags/*)
> +DIAG:=diags
>
> -SUBDIRS=$(UTIL) $(DIAG) $(OSM)
> +SUBDIRS=$(DIAG) $(OSM)
>
> all: BUILD_TARG=all
> all: libs_install subdirs
> @@ -31,12 +30,12 @@
> if !(cd $(OSM)/$$i; ./autogen.sh && ./configure && make && make
> install); then exit 1; fi\
Need to setup mailer not to line wrap (this should have been one line in
the patch and it made it into 2). I fixed this up by hand.
> fi\
> done
> - @for i in $(UTIL) $(DIAG) $(OSM)/opensm; do\
> + @for i in $(DIAG) $(OSM)/opensm; do\
> if [ -x $$i/autogen.sh ]; then\
> if !(cd $$i; ./autogen.sh && ./configure); then exit 1; fi\
> fi\
> done
> - @for i in $(UTIL) $(DIAG) $(OSM)/opensm; do\
> + @for i in $(DIAG) $(OSM)/opensm; do\
> if [ -x $$i/autogen.sh ]; then\
> if !(cd $$i; make && make install); then exit 1; fi\
> fi\
> @@ -46,7 +45,7 @@
> install: subdirs
> @echo Install done
>
> -clean: SUBDIRS=$(LIBS) $(UTIL) $(DIAG) $(OSM)
> +clean: SUBDIRS=$(LIBS) $(DIAG) $(OSM)
> clean: BUILD_TARG=clean
> clean: subdirs
> @rm -f build_tag
> @@ -55,7 +54,7 @@
> rmdep:
> find $(SUBDIRS) -name ".depend" | xargs rm -f
>
> -depend: SUBDIRS=$(LIBS) $(UTIL) $(DIAG) $(OSM)
> +depend: SUBDIRS=$(LIBS) $(DIAG) $(OSM)
> depend: BUILD_TARG=depend
> depend: rmdep subdirs
> @echo Depend done
>
>
More information about the general
mailing list