| Message ID | 1349675426-7572-2-git-send-email-tapani.palli@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 08, 2012 at 08:50:24AM +0300, Tapani Pälli wrote: > From: Chad Versace <chad.versace@linux.intel.com> > > Factor the source file list for libdrm.so from Makefile.am into > sources.mk. Ditto for libdrm_intel.so. > > This is in preparation for adding support for Android. The sources.mk's > will be shared between autotools and Android. > > Rationale: The most commonly changed parts of any makefile are the source > lists. So, by sharing the lists between the two build systems, we can > reduce the frequency at which modifications to the Linux build breaks the > Android build. > > Signed-off-by: Chad Versace <chad.versace@linux.intel.com> > Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com> > Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> > --- > Makefile.am | 9 ++++----- > intel/Makefile.am | 9 ++++----- > intel/sources.mk | 30 ++++++++++++++++++++++++++++++ > sources.mk | 30 ++++++++++++++++++++++++++++++ > 4 files changed, 68 insertions(+), 10 deletions(-) > create mode 100644 intel/sources.mk > create mode 100644 sources.mk > > diff --git a/Makefile.am b/Makefile.am > index 8ecd9d9..b854703 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -49,6 +49,9 @@ if HAVE_EXYNOS > EXYNOS_SUBDIR = exynos > endif > > +# Import variable LIBDRM_SOURCES. > +include sources.mk > + > SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) tests include man > > libdrm_la_LTLIBRARIES = libdrm.la > @@ -59,11 +62,7 @@ libdrm_la_LIBADD = @CLOCK_LIB@ > libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm > > libdrm_la_SOURCES = \ > - xf86drm.c \ > - xf86drmHash.c \ > - xf86drmRandom.c \ > - xf86drmSL.c \ > - xf86drmMode.c \ > + $(LIBDRM_SOURCES) \ > xf86atomic.h \ > libdrm_lists.h > > diff --git a/intel/Makefile.am b/intel/Makefile.am > index f49b099..e937c4b 100644 > --- a/intel/Makefile.am > +++ b/intel/Makefile.am > @@ -22,6 +22,9 @@ > # Authors: > # Eric Anholt <eric@anholt.net> > > +# Import variable LIBDRM_INTEL_SOURCES. > +include sources.mk > + > AM_CFLAGS = \ > $(WARN_CFLAGS) \ > -I$(top_srcdir) \ > @@ -40,13 +43,9 @@ libdrm_intel_la_LIBADD = ../libdrm.la \ > @CLOCK_LIB@ > > libdrm_intel_la_SOURCES = \ > - intel_bufmgr.c \ > + $(LIBDRM_INTEL_SOURCES) \ > intel_bufmgr_priv.h \ > - intel_bufmgr_fake.c \ > - intel_bufmgr_gem.c \ > - intel_decode.c \ > intel_chipset.h \ > - mm.c \ > mm.h > > intel_bufmgr_gem_o_CFLAGS = $(AM_CFLAGS) -c99 > diff --git a/intel/sources.mk b/intel/sources.mk > new file mode 100644 > index 0000000..2f6f744 > --- /dev/null > +++ b/intel/sources.mk > @@ -0,0 +1,30 @@ > +# > +# Copyright © 2012 Intel Corporation > +# > +# Permission is hereby granted, free of charge, to any person obtaining a > +# copy of this software and associated documentation files (the "Software"), > +# to deal in the Software without restriction, including without limitation > +# the rights to use, copy, modify, merge, publish, distribute, sublicense, > +# and/or sell copies of the Software, and to permit persons to whom the > +# Software is furnished to do so, subject to the following conditions: > +# > +# The above copyright notice and this permission notice (including the next > +# paragraph) shall be included in all copies or substantial portions of the > +# Software. > +# > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > +# IN THE SOFTWARE. > +# > + > +# for libdrm_intel.so > +LIBDRM_INTEL_SOURCES := \ > + intel_bufmgr.c \ > + intel_bufmgr_fake.c \ > + intel_bufmgr_gem.c \ > + intel_decode.c \ > + mm.c > diff --git a/sources.mk b/sources.mk > new file mode 100644 > index 0000000..19aa059 > --- /dev/null > +++ b/sources.mk > @@ -0,0 +1,30 @@ > +# > +# Copyright © 2012 Intel Corporation > +# > +# Permission is hereby granted, free of charge, to any person obtaining a > +# copy of this software and associated documentation files (the "Software"), > +# to deal in the Software without restriction, including without limitation > +# the rights to use, copy, modify, merge, publish, distribute, sublicense, > +# and/or sell copies of the Software, and to permit persons to whom the > +# Software is furnished to do so, subject to the following conditions: > +# > +# The above copyright notice and this permission notice (including the next > +# paragraph) shall be included in all copies or substantial portions of the > +# Software. > +# > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > +# IN THE SOFTWARE. > +# > + > +# for libdrm.so > +LIBDRM_SOURCES := \ > + xf86drm.c \ > + xf86drmHash.c \ > + xf86drmRandom.c \ > + xf86drmSL.c \ > + xf86drmMode.c > -- > 1.7.11.7 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/Makefile.am b/Makefile.am index 8ecd9d9..b854703 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,9 @@ if HAVE_EXYNOS EXYNOS_SUBDIR = exynos endif +# Import variable LIBDRM_SOURCES. +include sources.mk + SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) tests include man libdrm_la_LTLIBRARIES = libdrm.la @@ -59,11 +62,7 @@ libdrm_la_LIBADD = @CLOCK_LIB@ libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm libdrm_la_SOURCES = \ - xf86drm.c \ - xf86drmHash.c \ - xf86drmRandom.c \ - xf86drmSL.c \ - xf86drmMode.c \ + $(LIBDRM_SOURCES) \ xf86atomic.h \ libdrm_lists.h diff --git a/intel/Makefile.am b/intel/Makefile.am index f49b099..e937c4b 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -22,6 +22,9 @@ # Authors: # Eric Anholt <eric@anholt.net> +# Import variable LIBDRM_INTEL_SOURCES. +include sources.mk + AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ @@ -40,13 +43,9 @@ libdrm_intel_la_LIBADD = ../libdrm.la \ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ + $(LIBDRM_INTEL_SOURCES) \ intel_bufmgr_priv.h \ - intel_bufmgr_fake.c \ - intel_bufmgr_gem.c \ - intel_decode.c \ intel_chipset.h \ - mm.c \ mm.h intel_bufmgr_gem_o_CFLAGS = $(AM_CFLAGS) -c99 diff --git a/intel/sources.mk b/intel/sources.mk new file mode 100644 index 0000000..2f6f744 --- /dev/null +++ b/intel/sources.mk @@ -0,0 +1,30 @@ +# +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# + +# for libdrm_intel.so +LIBDRM_INTEL_SOURCES := \ + intel_bufmgr.c \ + intel_bufmgr_fake.c \ + intel_bufmgr_gem.c \ + intel_decode.c \ + mm.c diff --git a/sources.mk b/sources.mk new file mode 100644 index 0000000..19aa059 --- /dev/null +++ b/sources.mk @@ -0,0 +1,30 @@ +# +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# + +# for libdrm.so +LIBDRM_SOURCES := \ + xf86drm.c \ + xf86drmHash.c \ + xf86drmRandom.c \ + xf86drmSL.c \ + xf86drmMode.c