diff options
Diffstat (limited to 'src/glx/Makefile.am')
| -rw-r--r-- | src/glx/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 4553de01a17..cdd898efc87 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 @@ -86,6 +86,8 @@ libglx_la_SOURCES = \ glx_query.c \ glxhash.c +libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la + if HAVE_DRISW libglx_la_SOURCES += \ drisw_glx.c @@ -114,9 +116,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 \ @@ -135,4 +138,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 |