Reviewed-by: Jeremy Huddleston Sequoia <jerem...@apple.com> with one minor change (see below):
On May 13, 2014, at 05:15, Jon TURNEY <jon.tur...@dronecode.org.uk> wrote: ... > diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am > index eee7c2c..c18d1c5 100644 > --- a/src/glx/Makefile.am > +++ b/src/glx/Makefile.am > @@ -24,7 +24,7 @@ SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI > SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la > endif > > -SUBDIRS=. tests > +SUBDIRS= > > if HAVE_XF86VIDMODE > EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE > @@ -88,6 +88,8 @@ libglx_la_SOURCES = \ > drisw_glx.c \ > glxhash.c > > +libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la > + > if HAVE_DRICOMMON > libglx_la_SOURCES += \ > dri_common.c > @@ -110,9 +112,10 @@ endif > if HAVE_APPLEDRI > libglx_la_SOURCES += \ > applegl_glx.c > -endif > > -libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la > +SUBDIRS += apple > +libglx_la_LIBADD += $(builddir)/apple/libappleglx.la > +endif > > GL_LIBS = \ > libglx.la \ > @@ -131,4 +134,6 @@ lib@GL_LIB@_la_SOURCES = > lib@GL_LIB@_la_LIBADD = $(GL_LIBS) > lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS) > > +SUBDIRS+=. tests > + > include $(top_srcdir)/install-lib-links.mk Because SUBDIRS is set conditionally, you should add: DIST_SUBDIRS = tests apple to handle what I assume is an eventual goal of supporting 'make dist' _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
