[PATCH 1/6] build: pull common fragments into a common.rules file

Johannes Berg johannes at sipsolutions.net
Sun Jun 21 08:45:46 EDT 2020


On Sun, 2020-06-21 at 13:04 +0300, Jouni Malinen wrote:
> On Fri, Jun 19, 2020 at 11:47:46AM +0200, Johannes Berg wrote:
> >  src/common.rules        | 42 ++++++++++++++++++++++++++
> 
> That name is not exactly convenient for someone who is working with
> src/common/* files and tab completion.. Maybe src/build.rules?

Ah, yeah, I sort of noticed. Sure, don't care about the name.

> > +clean: common-clean
> > +	rm -f core *~ *.o *.d
> >  	rm -f ../../src/utils/*.o
> 
> What is this common-clean? It does not seem to be defined anywhere:

Hmm. I think I just squashed too much into this patch.

> > --include $(OBJS:%.o=%.d)
> 
> Why would that use of *.d be removed?

because that also belongs to a different patch.

> > +clean: common-clean
> > +	rm -f core *~
> 
> And this is that overriding recipe part..

Yeah, again, bad squash.

> > diff --git a/hs20/server/Makefile b/hs20/server/Makefile
> > @@ -43,11 +33,12 @@ CFLAGS += $(shell xml2-config --cflags)
> >  LIBS += $(shell xml2-config --libs)
> >  OBJS += ../../src/utils/xml_libxml2.o
> >  
> > +$(call BUILDOBJS,OBJS)
> >  hs20_spp_server: $(OBJS)
> 
> What does that call do?

Also belongs to the 6th patch...

So, yeah, bad rebase/squash. I'll rework this later/tomorrow.

johannes




More information about the Hostap mailing list