diff options
Diffstat (limited to 'GL')
| -rw-r--r-- | GL/mesa/Makefile.am | 7 | ||||
| -rw-r--r-- | GL/mesa/X/Makefile.am | 38 |
2 files changed, 21 insertions, 24 deletions
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am index 99d3834ac..6d1a439da 100644 --- a/GL/mesa/Makefile.am +++ b/GL/mesa/Makefile.am @@ -1,9 +1,10 @@ -SUBDIRS = main math swrast swrast_setup tnl shader X glapi vbo +SUBDIRS = X +SUBDIRS += main math swrast swrast_setup tnl shader glapi vbo noinst_LTLIBRARIES = libGLcore.la libGLcore_la_SOURCES = dummy.c -libGLcore_la_LIBADD = main/libmain.la \ +MESA_LIBS = main/libmain.la \ math/libmath.la \ swrast/libswrast.la \ swrast_setup/libss.la \ @@ -12,4 +13,6 @@ libGLcore_la_LIBADD = main/libmain.la \ shader/grammar/libgrammar.la \ shader/slang/libslang.la \ vbo/libvbo.la \ + +libGLcore_la_LIBADD = $(MESA_LIBS) \ X/libX.la diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index ace118170..d8abbc6bd 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -1,19 +1,10 @@ noinst_LTLIBRARIES = libX.la INCLUDES = -I@MESA_SOURCE@/include \ - -I../X \ - -I../glapi \ - -I../main \ - -I../math \ - -I../shader \ - -I../swrast \ - -I../swrast_setup \ - -I../tnl \ - -I.. \ - -I../../glx \ - -I$(top_srcdir)/GL/glx \ - -I$(top_srcdir)/GL/include \ - -I$(top_srcdir)/hw/xfree86/os-support + -I. \ + -I@MESA_SOURCE@/src/mesa/glapi \ + -I@MESA_SOURCE@/src/mesa/main \ + -I@MESA_SOURCE@/src/mesa # -DXFree86Server is required because the X11 driver in Mesa thinks that # symbol means "being built in the server" @@ -22,12 +13,15 @@ AM_CFLAGS = \ -DXFree86Server \ @GLX_DEFINES@ -nodist_libX_la_SOURCES = \ - xm_api.c \ - xm_buffer.c \ - xm_dd.c \ - xm_image.c \ - xm_line.c \ - xm_span.c \ - xm_tri.c \ - drivers/common/driverfuncs.c +XM_SOURCES = \ + xm_api.c \ + xm_buffer.c \ + xm_dd.c \ + xm_image.c \ + xm_line.c \ + xm_span.c \ + xm_tri.c + +XM_SOURCES += drivers/common/driverfuncs.c + +nodist_libX_la_SOURCES = $(XM_SOURCES) |