> Date: Sun, 19 Oct 2014 09:25:51 +0200 > From: Matthieu Herrb <matth...@herrb.eu> > > On Thu, Oct 16, 2014 at 08:14:16PM +0200, Mark Kettenis wrote: > > Hi Marc, > > > > Is there a reason why conditional includes (sinclude/-include) aren't > > enabled in OpenBSD? > > > > I'm asking because the Xorg people now use it in one of the xserver > > Makefile. We could of course try to convince them to revert the > > change they made. But it is a somewhat useful feature. > > So, now that espie@ has committed the bit, ok to remove the local > change that made the inclusion unconditionnal (and slightly broke make > clean in xserver) ?
That's exactly why I wanted it. ok kettenis@ > Index: Makefile.am > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/xserver/hw/xfree86/Makefile.am,v > retrieving revision 1.9 > diff -u -r1.9 Makefile.am > --- Makefile.am 27 Sep 2014 17:53:01 -0000 1.9 > +++ Makefile.am 19 Oct 2014 07:23:22 -0000 > @@ -138,7 +138,7 @@ > $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh > $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS) > > SDKSYMS_DEP = sdksyms.dep > -include $(SDKSYMS_DEP) > +-include $(SDKSYMS_DEP) > > i2c/libi2c.la: > $(AM_V_at)cd i2c && $(MAKE) libi2c.la > Index: Makefile.in > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/xserver/hw/xfree86/Makefile.in,v > retrieving revision 1.29 > diff -u -r1.29 Makefile.in > --- Makefile.in 27 Sep 2014 17:53:01 -0000 1.29 > +++ Makefile.in 19 Oct 2014 07:23:22 -0000 > @@ -1116,7 +1116,7 @@ > > sdksyms.dep sdksyms.c: sdksyms.sh > $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh > $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS) > -include $(SDKSYMS_DEP) > +-include $(SDKSYMS_DEP) > > i2c/libi2c.la: > $(AM_V_at)cd i2c && $(MAKE) libi2c.la > > -- > Matthieu Herrb >
