| Message ID | 1263489103-8419-1-git-send-email-weil@mail.berlios.de |
|---|---|
| State | New |
| Headers | show |
Am 14.01.2010 um 18:11 schrieb Stefan Weil: > When make is called without a valid configuration, > it should tell the user what to do. > > Revision 0e8c9214ba1d4128cf92442cd343bc3733478261 > was a regression which resulted in a message > which was no longer user friendly > (reported by Aurelien Jarno). > > This patch restores the old behaviour. > > Cc: Aurelien Jarno <aurelien@aurel32.net> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> Reviewed-by: Andreas Färber <afaerber@opensolaris.org> Looks okay, thanks. Andreas > --- > Makefile | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/Makefile b/Makefile > index fa7f851..b1bbe6d 100644 > --- a/Makefile > +++ b/Makefile > @@ -75,7 +75,9 @@ SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) > subdir-%: $(GENERATED_HEADERS) > $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" > TARGET_DIR="$*/" all,) > > +ifneq ($(wildcard config-host.mak),) > include $(SRC_PATH)/Makefile.objs > +endif > > $(common-obj-y): $(GENERATED_HEADERS) > $(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) > -- > 1.6.5 >
On Thu, Jan 14, 2010 at 06:11:43PM +0100, Stefan Weil wrote: > When make is called without a valid configuration, > it should tell the user what to do. > > Revision 0e8c9214ba1d4128cf92442cd343bc3733478261 > was a regression which resulted in a message > which was no longer user friendly > (reported by Aurelien Jarno). > > This patch restores the old behaviour. Thanks for the quick reaction, applied. > Cc: Aurelien Jarno <aurelien@aurel32.net> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > Makefile | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/Makefile b/Makefile > index fa7f851..b1bbe6d 100644 > --- a/Makefile > +++ b/Makefile > @@ -75,7 +75,9 @@ SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) > subdir-%: $(GENERATED_HEADERS) > $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,) > > +ifneq ($(wildcard config-host.mak),) > include $(SRC_PATH)/Makefile.objs > +endif > > $(common-obj-y): $(GENERATED_HEADERS) > $(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) > -- > 1.6.5 > > > >
diff --git a/Makefile b/Makefile index fa7f851..b1bbe6d 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,9 @@ SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) subdir-%: $(GENERATED_HEADERS) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,) +ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs +endif $(common-obj-y): $(GENERATED_HEADERS) $(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y)
When make is called without a valid configuration, it should tell the user what to do. Revision 0e8c9214ba1d4128cf92442cd343bc3733478261 was a regression which resulted in a message which was no longer user friendly (reported by Aurelien Jarno). This patch restores the old behaviour. Cc: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)