On Fri, Mar 12, 2010 at 4:50 AM, Pauli Nieminen <suok...@gmail.com> wrote: > Cleanup make system so that all noninstalled headers are put > to noinst_HEADERS. This quarentees that header will be present > in tar ball but not installed with make install. > > CC: nouveau@lists.freedesktop.org > Signed-off-by: Pauli Nieminen <suok...@gmail.com> > --- > Makefile.am | 6 +++--- > intel/Makefile.am | 10 ++++++---- > nouveau/Makefile.am | 4 +++- > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index e434e1d..61da186 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -55,13 +55,13 @@ libdrm_la_SOURCES = \ > xf86drmHash.c \ > xf86drmRandom.c \ > xf86drmSL.c \ > - xf86drmMode.c \ > - libdrm_lists.h > + xf86drmMode.c > > libdrmincludedir = ${includedir} > libdrminclude_HEADERS = xf86drm.h xf86drmMode.h > > -noinst_HEADERS = xf86atomic.h > +noinst_HEADERS = xf86atomic.h \ > + libdrm_lists.h > > > EXTRA_DIST = libdrm.pc.in include/drm/* > diff --git a/intel/Makefile.am b/intel/Makefile.am > index 9add505..d56b03a 100644 > --- a/intel/Makefile.am > +++ b/intel/Makefile.am > @@ -36,14 +36,16 @@ libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ > @CLOCK_LIB@ > > libdrm_intel_la_SOURCES = \ > intel_bufmgr.c \ > - intel_bufmgr_priv.h \ > intel_bufmgr_fake.c \ > intel_bufmgr_gem.c \ > - intel_chipset.h \ > - mm.c \ > - mm.h > + mm.c > > libdrm_intelincludedir = ${includedir} > libdrm_intelinclude_HEADERS = intel_bufmgr.h > > +noinst_HEADERS = \ > + intel_bufmgr_priv.h \ > + intel_chipset.h \ > + mm.h > + > pkgconfig_DATA = libdrm_intel.pc > diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am > index 5d759c5..53099eb 100644 > --- a/nouveau/Makefile.am > +++ b/nouveau/Makefile.am > @@ -18,7 +18,6 @@ libdrm_nouveau_la_SOURCES = \ > nouveau_notifier.c \ > nouveau_bo.c \ > nouveau_resource.c \ > - nouveau_private.h \ > nouveau_reloc.c > > libdrm_nouveaucommonincludedir = ${includedir}/nouveau > @@ -38,5 +37,8 @@ libdrm_nouveauincludedir = ${includedir}/drm > libdrm_nouveauinclude_HEADERS = \ > nouveau_drmif.h > > +noinst_HEADERS = \ > + nouveau_private.h > + > pkgconfigdir = @pkgconfigdir@ > pkgconfig_DATA = libdrm_nouveau.pc
I don't think this is the best strategy. Having the headers under _SOURCES already means they'll get distributed. The only reason for the separate _HEADERS declarations is if you need to install them. http://www.gnu.org/software/automake/manual/automake.html#Headers -- Dan _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau