diff options
| author | Keith Packard <keithp@keithp.com> | 2014-01-27 14:11:09 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-27 14:11:09 -0800 |
| commit | 0fbb3d711efec5222a57b45a70d28fc98380f3a1 (patch) | |
| tree | 86dbf8bc68bd9471cd40e52589811e56ec595b80 /Makefile.am | |
| parent | 7ddef4f7033c10b6e92866182d4475a4d49c5083 (diff) | |
| parent | b98e49379c8d7cecce991207048489f51b10028c (diff) | |
Merge remote-tracking branch 'anholt/glamor-reformat'
Conflicts:
Makefile.am
Conflict caused by adding PSEUDORAMIX and GLAMOR directory defines in
separate branches
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 b296e0cfa..7c93d8d20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,10 @@ if PSEUDORAMIX PSEUDORAMIX_DIR=pseudoramiX endif +if GLAMOR +GLAMOR_DIR=glamor +endif + SUBDIRS = \ doc \ man \ @@ -55,6 +59,7 @@ SUBDIRS = \ $(PRESENT_DIR) \ $(DRI3_DIR) \ exa \ + $(GLAMOR_DIR) \ config \ hw \ test @@ -106,6 +111,7 @@ DIST_SUBDIRS = \ composite \ glx \ exa \ + $(GLAMOR_DIR) \ config \ dri3 \ present \ |