diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-01-10 03:23:05 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-01-10 03:23:05 +0000 |
| commit | 2949c705f11f8710301555c039bcecbe748cabd9 (patch) | |
| tree | 899bf7b1553bd0a48c8c319462253834612c84c1 /hw/xgl | |
| parent | 4fc9eb592a446ad5711bdaa82c60e9fe010fd76a (diff) | |
Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST.
Attempt to build xeglmodule.c, not xglxmodule.c.
Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same
treatment as _SOURCES in terms of automatically DISTing.
Diffstat (limited to 'hw/xgl')
| -rw-r--r-- | hw/xgl/Makefile.am | 5 | ||||
| -rw-r--r-- | hw/xgl/egl/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xgl/egl/module/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xgl/glx/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xgl/glx/module/Makefile.am | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am index c1ea814fd..8e32a26c7 100644 --- a/hw/xgl/Makefile.am +++ b/hw/xgl/Makefile.am @@ -10,6 +10,8 @@ if XEGL XEGL_SUBDIRS = egl endif +DIST_SUBDIRS = glxext glx egl + SUBDIRS = \ . \ $(GLX_SUBDIRS) \ @@ -52,6 +54,9 @@ libxgl_a_SOURCES = \ xglloader.c \ xglglx.c +EXTRA_DIST = \ + xglmodule.h + Xgl_LDFLAGS = -export-dynamic Xgl_SOURCES = \ xglinit.c \ diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am index a43bcda6c..701320de5 100644 --- a/hw/xgl/egl/Makefile.am +++ b/hw/xgl/egl/Makefile.am @@ -2,6 +2,8 @@ if XGL XGL_MODULE_DIRS = module endif +DIST_SUBDIRS = module + SUBDIRS = \ . \ $(XGL_MODULE_DIRS) @@ -25,7 +27,7 @@ libxegl_la_SOURCES = \ Xegl_DEPENDENCIES = @XEGL_LIBS@ Xegl_LDFLAGS = -export-dynamic Xegl_SOURCES = \ - xglxinit.c \ + xeglinit.c \ $(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/Xext/dpmsstubs.c \ $(top_srcdir)/Xi/stubs.c \ diff --git a/hw/xgl/egl/module/Makefile.am b/hw/xgl/egl/module/Makefile.am index ec1e2c45e..7ed217322 100644 --- a/hw/xgl/egl/module/Makefile.am +++ b/hw/xgl/egl/module/Makefile.am @@ -11,4 +11,4 @@ libxegl_la_LIBADD = \ moduledir = @xglmoduledir@ -module_LTLIBRARIES = libxegl.la
\ No newline at end of file +module_LTLIBRARIES = libxegl.la diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am index 934efa1fc..0198d0906 100644 --- a/hw/xgl/glx/Makefile.am +++ b/hw/xgl/glx/Makefile.am @@ -2,6 +2,8 @@ if XGL XGL_MODULE_DIRS = module endif +DIST_SUBDIRS = module + SUBDIRS = \ . \ $(XGL_MODULE_DIRS) diff --git a/hw/xgl/glx/module/Makefile.am b/hw/xgl/glx/module/Makefile.am index 5c22c67f2..e2d1de74e 100644 --- a/hw/xgl/glx/module/Makefile.am +++ b/hw/xgl/glx/module/Makefile.am @@ -11,4 +11,4 @@ libxglx_la_LIBADD = \ moduledir = @xglmoduledir@ -module_LTLIBRARIES = libxglx.la
\ No newline at end of file +module_LTLIBRARIES = libxglx.la |