diff options
author | marha <marha@users.sourceforge.net> | 2015-02-22 14:31:16 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-02-22 14:31:16 +0100 |
commit | f1c2db43dcf35d2cf4715390bd2391c28e42a8c2 (patch) | |
tree | 46b537271afe0f6534231b1bd4cc4f91ae1fb446 /mesalib/src/Makefile.am | |
parent | 5e5a48ff8cd08f123601cd0625ca62a86675aac9 (diff) | |
download | vcxsrv-f1c2db43dcf35d2cf4715390bd2391c28e42a8c2.tar.gz vcxsrv-f1c2db43dcf35d2cf4715390bd2391c28e42a8c2.tar.bz2 vcxsrv-f1c2db43dcf35d2cf4715390bd2391c28e42a8c2.zip |
xwininfo fontconfig libX11 libXdmcp libfontenc libxcb libxcb/xcb-proto mesalib xserver xkeyboard-config mkfontscale git update 22 Feb 2015
xserver commit 3a06faf3fcdb7451125a46181f9152e8e59e9770
libxcb commit e3ec1f74637237ce500dfd0ca59f2e422da4e019
libxcb/xcb-proto commit 4c550465934164aab2449a125f75f4ca07816233
xkeyboard-config commit 26f344c93f8c6141e9233eb68088ba4fd56bc9ef
libX11 commit c8e19b393defd53f046ddc2da3a16881221b3c34
libXdmcp commit 9f4cac7656b221ce2a8f97e7bd31e5e23126d001
libfontenc commit de1843aaf76015c9d99416f3122d169fe331b849
mkfontscale commit 87d628f8eec170ec13bb9feefb1ce05aed07d1d6
xwininfo commit 0c49f8f2bd56b1e77721e81030ea948386dcdf4e
fontconfig commit d6d5adeb7940c0d0beb86489c2a1c2ce59e5c044
mesa commit 4359954d842caa2a9f8d4b50d70ecc789884b68b
Diffstat (limited to 'mesalib/src/Makefile.am')
-rw-r--r-- | mesalib/src/Makefile.am | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/mesalib/src/Makefile.am b/mesalib/src/Makefile.am index 85b75a93b..8edf33373 100644 --- a/mesalib/src/Makefile.am +++ b/mesalib/src/Makefile.am @@ -19,7 +19,9 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = gtest util mapi/glapi/gen mapi +AUTOMAKE_OPTIONS = subdir-objects + +SUBDIRS = . gtest util mapi/glapi/gen mapi if NEED_OPENGL_COMMON SUBDIRS += glsl mesa @@ -52,3 +54,16 @@ SUBDIRS += gallium endif EXTRA_DIST = egl/docs getopt hgl SConscript + +AM_CPPFLAGS = \ + -I$(top_srcdir)/include/ \ + -I$(top_srcdir)/src/mapi/ \ + -I$(top_srcdir)/src/mesa/ \ + $(DEFINES) + +noinst_LTLIBRARIES = libglsl_util.la + +libglsl_util_la_SOURCES = \ + mesa/main/imports.c \ + mesa/program/prog_hash_table.c \ + mesa/program/symbol_table.c |