diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-23 09:22:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-23 09:22:39 +0200 |
| commit | a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c (patch) | |
| tree | d00e9cb782f34582f722e3da544b9c42b16ac850 /mesalib/src | |
| parent | 81d811ac780a2524fff09a516b6f0212c3f209a2 (diff) | |
| parent | 5c340ceb9356ea029dea53b73440268d4769d5a5 (diff) | |
| download | vcxsrv-a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c.tar.gz vcxsrv-a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c.tar.bz2 vcxsrv-a7c19a157eb0ba6a7789fe31f5bf7a2066d7966c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu mesa xserver git update 23 July 2013
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/mapi/glapi/Makefile.am | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/Makefile.am | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/Makefile.am b/mesalib/src/mapi/glapi/Makefile.am index 1698d1474..05c67a6d4 100644 --- a/mesalib/src/mapi/glapi/Makefile.am +++ b/mesalib/src/mapi/glapi/Makefile.am @@ -19,6 +19,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +SUBDIRS = . tests + TOP = $(top_srcdir) include Makefile.sources include ../Makefile.sources diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am index d5f5f5b86..e9c16e78e 100644 --- a/mesalib/src/mesa/Makefile.am +++ b/mesalib/src/mesa/Makefile.am @@ -23,7 +23,7 @@ if NEED_LIBDRICORE DRICORE_SUBDIR = libdricore endif -SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) +SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) main/tests if HAVE_X11_DRIVER SUBDIRS += drivers/x11 |