Lucas Stach
2012-Aug-02 23:53 UTC
[Nouveau] [PATCH 0/4] Convert Nouveau gallium drivers to automake
Trivial series to convert Nouveau gallium drivers to automake in order to generate Makefiles. This is just the general direction in which the MESA buildsystem is moving. Aside from this it makes the "make" output a lot more readable and therefore helps to spot compiler warnings more easily. Lucas Stach (4): nouveau: use automake to generate Makefile nv30: use automake to generate Makefile nv50: use automake to generate Makefile nvc0: use automake to generate Makefile configure.ac | 4 ++++ src/gallium/drivers/nouveau/Makefile | 16 ---------------- src/gallium/drivers/nouveau/Makefile.am | 16 ++++++++++++++++ src/gallium/drivers/nv30/Makefile | 12 ------------ src/gallium/drivers/nv30/Makefile.am | 16 ++++++++++++++++ src/gallium/drivers/nv50/Makefile | 12 ------------ src/gallium/drivers/nv50/Makefile.am | 25 +++++++++++++++++++++++++ src/gallium/drivers/nvc0/Makefile | 12 ------------ src/gallium/drivers/nvc0/Makefile.am | 25 +++++++++++++++++++++++++ 9 Dateien ge??ndert, 86 Zeilen hinzugef??gt(+), 52 Zeilen entfernt(-) delete mode 100644 src/gallium/drivers/nouveau/Makefile create mode 100644 src/gallium/drivers/nouveau/Makefile.am delete mode 100644 src/gallium/drivers/nv30/Makefile create mode 100644 src/gallium/drivers/nv30/Makefile.am delete mode 100644 src/gallium/drivers/nv50/Makefile create mode 100644 src/gallium/drivers/nv50/Makefile.am delete mode 100644 src/gallium/drivers/nvc0/Makefile create mode 100644 src/gallium/drivers/nvc0/Makefile.am -- 1.7.11.2
Lucas Stach
2012-Aug-02 23:53 UTC
[Nouveau] [PATCH 1/4] nouveau: use automake to generate Makefile
--- configure.ac | 1 + src/gallium/drivers/nouveau/Makefile | 16 ---------------- src/gallium/drivers/nouveau/Makefile.am | 16 ++++++++++++++++ 3 Dateien ge??ndert, 17 Zeilen hinzugef??gt(+), 16 Zeilen entfernt(-) delete mode 100644 src/gallium/drivers/nouveau/Makefile create mode 100644 src/gallium/drivers/nouveau/Makefile.am diff --git a/configure.ac b/configure.ac index b6481a6..d1fc0f3 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,6 +2129,7 @@ AC_CONFIG_FILES([configs/current src/gallium/auxiliary/pipe-loader/Makefile src/gallium/state_trackers/clover/Makefile src/gallium/drivers/Makefile + src/gallium/drivers/nouveau/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile src/gallium/targets/opencl/Makefile diff --git a/src/gallium/drivers/nouveau/Makefile b/src/gallium/drivers/nouveau/Makefile deleted file mode 100644 index d583324..0000000 --- a/src/gallium/drivers/nouveau/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = nouveau - -LIBRARY_INCLUDES = \ - $(LIBDRM_CFLAGS) \ - -I$(TOP)/src/gallium/drivers/nouveau/include - -LIBRARY_INCLUDES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-I) -LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-other) - -# get C_SOURCES -include Makefile.sources - -include ../../Makefile.template diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am new file mode 100644 index 0000000..dd4a767 --- /dev/null +++ b/src/gallium/drivers/nouveau/Makefile.am @@ -0,0 +1,16 @@ +include Makefile.sources + +noinst_LIBRARIES = libnouveau.a + +AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(NOUVEAU_CFLAGS) \ + $(DEFINES) \ + $(PIC_FLAGS) \ + $(VISIBILITY_CFLAGS) + +libnouveau_a_SOURCES = \ + $(C_SOURCES) \ No newline at end of file -- 1.7.11.2
Lucas Stach
2012-Aug-02 23:53 UTC
[Nouveau] [PATCH 2/4] nv30: use automake to generate Makefile
--- configure.ac | 1 + src/gallium/drivers/nv30/Makefile | 12 ------------ src/gallium/drivers/nv30/Makefile.am | 16 ++++++++++++++++ 3 Dateien ge??ndert, 17 Zeilen hinzugef??gt(+), 12 Zeilen entfernt(-) delete mode 100644 src/gallium/drivers/nv30/Makefile create mode 100644 src/gallium/drivers/nv30/Makefile.am diff --git a/configure.ac b/configure.ac index d1fc0f3..59b4b68 100644 --- a/configure.ac +++ b/configure.ac @@ -2130,6 +2130,7 @@ AC_CONFIG_FILES([configs/current src/gallium/state_trackers/clover/Makefile src/gallium/drivers/Makefile src/gallium/drivers/nouveau/Makefile + src/gallium/drivers/nv30/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile src/gallium/targets/opencl/Makefile diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile deleted file mode 100644 index de521aa..0000000 --- a/src/gallium/drivers/nv30/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = nv30 - -include Makefile.sources - -LIBRARY_INCLUDES = \ - $(LIBDRM_CFLAGS) - -include ../../Makefile.template -# DO NOT DELETE diff --git a/src/gallium/drivers/nv30/Makefile.am b/src/gallium/drivers/nv30/Makefile.am new file mode 100644 index 0000000..e4034168 --- /dev/null +++ b/src/gallium/drivers/nv30/Makefile.am @@ -0,0 +1,16 @@ +include Makefile.sources + +noinst_LIBRARIES = libnv30.a + +AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(NOUVEAU_CFLAGS) \ + $(DEFINES) \ + $(PIC_FLAGS) \ + $(VISIBILITY_CFLAGS) + +libnv30_a_SOURCES = \ + $(C_SOURCES) \ No newline at end of file -- 1.7.11.2
Lucas Stach
2012-Aug-02 23:53 UTC
[Nouveau] [PATCH 3/4] nv50: use automake to generate Makefile
--- configure.ac | 1 + src/gallium/drivers/nv50/Makefile | 12 ------------ src/gallium/drivers/nv50/Makefile.am | 25 +++++++++++++++++++++++++ 3 Dateien ge??ndert, 26 Zeilen hinzugef??gt(+), 12 Zeilen entfernt(-) delete mode 100644 src/gallium/drivers/nv50/Makefile create mode 100644 src/gallium/drivers/nv50/Makefile.am diff --git a/configure.ac b/configure.ac index 59b4b68..aa20393 100644 --- a/configure.ac +++ b/configure.ac @@ -2131,6 +2131,7 @@ AC_CONFIG_FILES([configs/current src/gallium/drivers/Makefile src/gallium/drivers/nouveau/Makefile src/gallium/drivers/nv30/Makefile + src/gallium/drivers/nv50/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile src/gallium/targets/opencl/Makefile diff --git a/src/gallium/drivers/nv50/Makefile b/src/gallium/drivers/nv50/Makefile deleted file mode 100644 index 18e30b0..0000000 --- a/src/gallium/drivers/nv50/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = nv50 - -# get C/CPP_SOURCES -include Makefile.sources - -LIBRARY_INCLUDES = \ - $(LIBDRM_CFLAGS) - -include ../../Makefile.template diff --git a/src/gallium/drivers/nv50/Makefile.am b/src/gallium/drivers/nv50/Makefile.am new file mode 100644 index 0000000..bdef611 --- /dev/null +++ b/src/gallium/drivers/nv50/Makefile.am @@ -0,0 +1,25 @@ +include Makefile.sources + +noinst_LIBRARIES = libnv50.a + +AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(NOUVEAU_CFLAGS) \ + $(DEFINES) \ + $(PIC_FLAGS) \ + $(VISIBILITY_CFLAGS) + +AM_CXXFLAGS = \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/drivers \ + $(DEFINES) \ + $(PIC_FLAGS) \ + $(VISIBILITY_CFLAGS) + +libnv50_a_SOURCES = \ + $(C_SOURCES) \ + $(CPP_SOURCES) \ No newline at end of file -- 1.7.11.2
Lucas Stach
2012-Aug-02 23:53 UTC
[Nouveau] [PATCH 4/4] nvc0: use automake to generate Makefile
--- configure.ac | 1 + src/gallium/drivers/nvc0/Makefile | 12 ------------ src/gallium/drivers/nvc0/Makefile.am | 25 +++++++++++++++++++++++++ 3 Dateien ge??ndert, 26 Zeilen hinzugef??gt(+), 12 Zeilen entfernt(-) delete mode 100644 src/gallium/drivers/nvc0/Makefile create mode 100644 src/gallium/drivers/nvc0/Makefile.am diff --git a/configure.ac b/configure.ac index aa20393..dca7352 100644 --- a/configure.ac +++ b/configure.ac @@ -2132,6 +2132,7 @@ AC_CONFIG_FILES([configs/current src/gallium/drivers/nouveau/Makefile src/gallium/drivers/nv30/Makefile src/gallium/drivers/nv50/Makefile + src/gallium/drivers/nvc0/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile src/gallium/targets/opencl/Makefile diff --git a/src/gallium/drivers/nvc0/Makefile b/src/gallium/drivers/nvc0/Makefile deleted file mode 100644 index c412625..0000000 --- a/src/gallium/drivers/nvc0/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = nvc0 - -# get C/CPP_SOURCES -include Makefile.sources - -LIBRARY_INCLUDES = \ - $(LIBDRM_CFLAGS) - -include ../../Makefile.template diff --git a/src/gallium/drivers/nvc0/Makefile.am b/src/gallium/drivers/nvc0/Makefile.am new file mode 100644 index 0000000..8d60c6e --- /dev/null +++ b/src/gallium/drivers/nvc0/Makefile.am @@ -0,0 +1,25 @@ +include Makefile.sources + +noinst_LIBRARIES = libnvc0.a + +AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(NOUVEAU_CFLAGS) \ + $(DEFINES) \ + $(PIC_FLAGS) \ + $(VISIBILITY_CFLAGS) + +AM_CXXFLAGS = \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/drivers \ + $(DEFINES) \ + $(PIC_FLAGS) \ + $(VISIBILITY_CFLAGS) + +libnvc0_a_SOURCES = \ + $(C_SOURCES) \ + $(CPP_SOURCES) \ No newline at end of file -- 1.7.11.2