[Mesa-dev] [PATCH 1/4] gallium/drivers: Use automake to generate makefile

Jose Fonseca jfonseca at vmware.com
Tue Mar 13 12:24:34 PDT 2012 

FWIW, I personally have no objections against the "automakification" provided it does not cause build failures, or that any unintended build failure is soon addressed. That is, better not commit this sort of stuff right before leaving for the pub ;-)

Jose

----- Original Message -----
> If no one objects, I'm going to push this series tomorrow.
> 
> On Sun, Mar 04, 2012 at 07:14:18PM -0500, Tom Stellard wrote:
> > ---
> >  configure.ac                          |    1 +
> >  src/gallium/drivers/.gitignore        |    3 +++
> >  src/gallium/drivers/Makefile          |   12 ------------
> >  src/gallium/drivers/Makefile.am       |    4 ++++
> >  src/gallium/drivers/galahad/Makefile  |    3 +++
> >  src/gallium/drivers/i915/Makefile     |    3 +++
> >  src/gallium/drivers/identity/Makefile |    3 +++
> >  src/gallium/drivers/llvmpipe/Makefile |    3 +++
> >  src/gallium/drivers/noop/Makefile     |    3 +++
> >  src/gallium/drivers/nouveau/Makefile  |    3 +++
> >  src/gallium/drivers/nv50/Makefile     |    3 +++
> >  src/gallium/drivers/nvc0/Makefile     |    3 +++
> >  src/gallium/drivers/nvfx/Makefile     |    3 +++
> >  src/gallium/drivers/r300/Makefile.am  |    4 ----
> >  src/gallium/drivers/r600/Makefile     |    3 +++
> >  src/gallium/drivers/rbug/Makefile     |    3 +++
> >  src/gallium/drivers/softpipe/Makefile |    3 +++
> >  src/gallium/drivers/svga/Makefile     |    3 +++
> >  src/gallium/drivers/trace/Makefile    |    3 +++
> >  19 files changed, 50 insertions(+), 16 deletions(-)
> >  create mode 100644 src/gallium/drivers/.gitignore
> >  delete mode 100644 src/gallium/drivers/Makefile
> >  create mode 100644 src/gallium/drivers/Makefile.am
> > 
> > diff --git a/configure.ac b/configure.ac
> > index a2d906a..4515731 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -1948,6 +1948,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
> >  
> >  dnl Substitute the config
> >  AC_CONFIG_FILES([configs/autoconf
> > +		src/gallium/drivers/Makefile
> >  		src/gallium/drivers/r300/Makefile
> >  		src/gbm/Makefile
> >  		src/gbm/main/gbm.pc
> > diff --git a/src/gallium/drivers/.gitignore
> > b/src/gallium/drivers/.gitignore
> > new file mode 100644
> > index 0000000..a963aad
> > --- /dev/null
> > +++ b/src/gallium/drivers/.gitignore
> > @@ -0,0 +1,3 @@
> > +Makefile
> > +Makefile.in
> > +.deps/
> > diff --git a/src/gallium/drivers/Makefile
> > b/src/gallium/drivers/Makefile
> > deleted file mode 100644
> > index 9fe9b2c..0000000
> > --- a/src/gallium/drivers/Makefile
> > +++ /dev/null
> > @@ -1,12 +0,0 @@
> > -# src/gallium/drivers/Makefile
> > -TOP = ../../..
> > -include $(TOP)/configs/current
> > -
> > -SUBDIRS = $(GALLIUM_DRIVERS_DIRS)
> > -
> > -default install clean:
> > -	@for dir in $(SUBDIRS) ; do \
> > -		if [ -d $$dir ] ; then \
> > -			(cd $$dir && $(MAKE) $@) || exit 1; \
> > -		fi \
> > -	done
> > diff --git a/src/gallium/drivers/Makefile.am
> > b/src/gallium/drivers/Makefile.am
> > new file mode 100644
> > index 0000000..b6954e2
> > --- /dev/null
> > +++ b/src/gallium/drivers/Makefile.am
> > @@ -0,0 +1,4 @@
> > +SUBDIRS = $(GALLIUM_DRIVERS_DIRS)
> > +
> > +# FIXME: Remove when the rest of Gallium is converted to automake.
> > +default: all
> > diff --git a/src/gallium/drivers/galahad/Makefile
> > b/src/gallium/drivers/galahad/Makefile
> > index e9c4f7e..15ea136 100644
> > --- a/src/gallium/drivers/galahad/Makefile
> > +++ b/src/gallium/drivers/galahad/Makefile
> > @@ -9,3 +9,6 @@ C_SOURCES = \
> >  	glhd_screen.c
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/i915/Makefile
> > b/src/gallium/drivers/i915/Makefile
> > index 0e57678..b7d8a1f 100644
> > --- a/src/gallium/drivers/i915/Makefile
> > +++ b/src/gallium/drivers/i915/Makefile
> > @@ -7,3 +7,6 @@ LIBNAME = i915
> >  include Makefile.sources
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/identity/Makefile
> > b/src/gallium/drivers/identity/Makefile
> > index 74692d9..a15e17e 100644
> > --- a/src/gallium/drivers/identity/Makefile
> > +++ b/src/gallium/drivers/identity/Makefile
> > @@ -9,3 +9,6 @@ C_SOURCES = \
> >  	id_screen.c
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/llvmpipe/Makefile
> > b/src/gallium/drivers/llvmpipe/Makefile
> > index 1a4e93d..8df891c 100644
> > --- a/src/gallium/drivers/llvmpipe/Makefile
> > +++ b/src/gallium/drivers/llvmpipe/Makefile
> > @@ -62,6 +62,9 @@ CLEAN_EXTRA = *.o
> >  
> >  include ../../Makefile.template
> >  
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > +
> >  PROGS_DEPS := ../../auxiliary/libgallium.a
> >  
> >  lp_tile_soa.c: lp_tile_soa.py
> >  ../../auxiliary/util/u_format_parse.py
> >  ../../auxiliary/util/u_format_pack.py
> >  ../../auxiliary/util/u_format.csv
> > diff --git a/src/gallium/drivers/noop/Makefile
> > b/src/gallium/drivers/noop/Makefile
> > index 29b8d73..75e65ed 100644
> > --- a/src/gallium/drivers/noop/Makefile
> > +++ b/src/gallium/drivers/noop/Makefile
> > @@ -11,3 +11,6 @@ C_SOURCES = \
> >  	noop_state.c
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/nouveau/Makefile
> > b/src/gallium/drivers/nouveau/Makefile
> > index d583324..cfb8831 100644
> > --- a/src/gallium/drivers/nouveau/Makefile
> > +++ b/src/gallium/drivers/nouveau/Makefile
> > @@ -14,3 +14,6 @@ LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm
> > libdrm_nouveau --cflags-only-oth
> >  include Makefile.sources
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/nv50/Makefile
> > b/src/gallium/drivers/nv50/Makefile
> > index 18e30b0..2dd37ee 100644
> > --- a/src/gallium/drivers/nv50/Makefile
> > +++ b/src/gallium/drivers/nv50/Makefile
> > @@ -10,3 +10,6 @@ LIBRARY_INCLUDES = \
> >  	$(LIBDRM_CFLAGS)
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/nvc0/Makefile
> > b/src/gallium/drivers/nvc0/Makefile
> > index c412625..a60127f 100644
> > --- a/src/gallium/drivers/nvc0/Makefile
> > +++ b/src/gallium/drivers/nvc0/Makefile
> > @@ -10,3 +10,6 @@ LIBRARY_INCLUDES = \
> >  	$(LIBDRM_CFLAGS)
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/nvfx/Makefile
> > b/src/gallium/drivers/nvfx/Makefile
> > index 53292d6..9b6ed1c 100644
> > --- a/src/gallium/drivers/nvfx/Makefile
> > +++ b/src/gallium/drivers/nvfx/Makefile
> > @@ -11,3 +11,6 @@ LIBRARY_INCLUDES = \
> >  	-I$(TOP)/src/gallium/drivers/nouveau/include
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/r300/Makefile.am
> > b/src/gallium/drivers/r300/Makefile.am
> > index 8ec47d7..af352aa 100644
> > --- a/src/gallium/drivers/r300/Makefile.am
> > +++ b/src/gallium/drivers/r300/Makefile.am
> > @@ -32,7 +32,3 @@ r300_compiler_tests_SOURCES = \
> >  	$(testdir)/radeon_compiler_util_tests.c \
> >  	$(testdir)/rc_test_helpers.c \
> >  	$(testdir)/unit_test.c
> > -
> > -# FIXME: remove this when the rest of the gallium
> > -# build system is converted to automake.
> > -default: libr300.a
> > diff --git a/src/gallium/drivers/r600/Makefile
> > b/src/gallium/drivers/r600/Makefile
> > index 62e760c..e15e2ff 100644
> > --- a/src/gallium/drivers/r600/Makefile
> > +++ b/src/gallium/drivers/r600/Makefile
> > @@ -12,3 +12,6 @@ LIBRARY_INCLUDES = -I$(TOP)/include
> >  include Makefile.sources
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/rbug/Makefile
> > b/src/gallium/drivers/rbug/Makefile
> > index 64e172f..a426727 100644
> > --- a/src/gallium/drivers/rbug/Makefile
> > +++ b/src/gallium/drivers/rbug/Makefile
> > @@ -10,3 +10,6 @@ C_SOURCES = \
> >  	rbug_screen.c
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/softpipe/Makefile
> > b/src/gallium/drivers/softpipe/Makefile
> > index 27b5d991..bcafa3c 100644
> > --- a/src/gallium/drivers/softpipe/Makefile
> > +++ b/src/gallium/drivers/softpipe/Makefile
> > @@ -35,3 +35,6 @@ C_SOURCES = \
> >  	sp_surface.c
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/svga/Makefile
> > b/src/gallium/drivers/svga/Makefile
> > index 97f68f0..825f15b 100644
> > --- a/src/gallium/drivers/svga/Makefile
> > +++ b/src/gallium/drivers/svga/Makefile
> > @@ -17,3 +17,6 @@ LIBRARY_DEFINES = \
> >  	-DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > diff --git a/src/gallium/drivers/trace/Makefile
> > b/src/gallium/drivers/trace/Makefile
> > index 99e5fb8..c842be8 100644
> > --- a/src/gallium/drivers/trace/Makefile
> > +++ b/src/gallium/drivers/trace/Makefile
> > @@ -11,3 +11,6 @@ C_SOURCES = \
> >  	tr_texture.c
> >  
> >  include ../../Makefile.template
> > +
> > +# FIXME: Remove when this driver is converted to automake.
> > +all: default
> > --
> > 1.7.3.4
> > 
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> > 
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>

More information about the mesa-dev mailing list