diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-18 11:35:53 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-01-27 09:30:47 -0800 |
| commit | d26f5335151a9e962afa4bbf29ca5b94660a33ca (patch) | |
| tree | ac13bb1c427fcdeb55856c36938c0da62d39221b /Makefile.am | |
| parent | 54e78ec31e030d488765341a0c143c5a060c3768 (diff) | |
glamor: Hook the module back up to the build.
For now we're just building an uninstalled library. The extra EGL
stubs are required so that we can get the DIX building and usable
without pulling in the xf86 DDX code in glamor_egl.c.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index add69d193..fb527a8f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,10 @@ if PRESENT PRESENT_DIR=present endif +if GLAMOR +GLAMOR_DIR=glamor +endif + SUBDIRS = \ doc \ man \ @@ -51,6 +55,7 @@ SUBDIRS = \ $(PRESENT_DIR) \ $(DRI3_DIR) \ exa \ + $(GLAMOR_DIR) \ config \ hw \ test @@ -102,6 +107,7 @@ DIST_SUBDIRS = \ composite \ glx \ exa \ + $(GLAMOR_DIR) \ config \ dri3 \ present \ |