diff options
author | Matt Turner <mattst88@gmail.com> | 2014-08-14 12:20:12 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2014-08-18 18:24:09 -0700 |
commit | c3ce1a942f90843ba637e558e990275bc742571c (patch) | |
tree | b7e49ed0bb4b65c24267b7feee37511e2277407e /src/mapi | |
parent | 4ccd2a9f9b0813887716d38321829175459665e0 (diff) |
mapi: Inline shared-glapi/Makefile.
Diffstat (limited to 'src/mapi')
-rw-r--r-- | src/mapi/Makefile.am | 46 | ||||
-rw-r--r-- | src/mapi/shared-glapi/Makefile.am | 34 |
2 files changed, 43 insertions, 37 deletions
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am index ef538039b9a..94657b0c3c7 100644 --- a/src/mapi/Makefile.am +++ b/src/mapi/Makefile.am @@ -1,4 +1,4 @@ -# Copyright © 2013 Intel Corporation +# Copyright © 2013, 2014 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -19,10 +19,48 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = glapi/gen +SUBDIRS = glapi/gen . + +TOP = $(top_srcdir) + +BUILT_SOURCES = +CLEANFILES = $(BUILT_SOURCES) + +lib_LTLIBRARIES = + +AM_CFLAGS = $(PTHREAD_CFLAGS) +AM_CPPFLAGS = \ + $(DEFINES) \ + $(SELINUX_CFLAGS) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ + -I$(top_builddir)/src/mapi + +GLAPI = $(top_srcdir)/src/mapi/glapi +include Makefile.sources +include glapi/gen/glapi_gen.mk if HAVE_SHARED_GLAPI -SUBDIRS += shared-glapi +SUBDIRS += shared-glapi/tests + +BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h + +lib_LTLIBRARIES += shared-glapi/libglapi.la +shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) +shared_glapi_libglapi_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DMAPI_MODE_GLAPI \ + -DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\" +shared_glapi_libglapi_la_LIBADD = \ + $(PTHREAD_LIBS) \ + $(SELINUX_LIBS) +shared_glapi_libglapi_la_LDFLAGS = \ + -no-undefined \ + $(GC_SECTIONS) \ + $(LD_NO_UNDEFINED) + +shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) + $(call glapi_gen_mapi,$<,shared-glapi) endif if HAVE_OPENGL @@ -40,3 +78,5 @@ endif if HAVE_OPENVG SUBDIRS += vgapi endif + +include $(top_srcdir)/install-lib-links.mk diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am deleted file mode 100644 index 330719c85b0..00000000000 --- a/src/mapi/shared-glapi/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Used by OpenGL ES or when --enable-shared-glapi is specified - -SUBDIRS = . tests - -TOP = $(top_srcdir) -GLAPI = $(top_srcdir)/src/mapi/glapi -include $(top_srcdir)/src/mapi/Makefile.sources - -lib_LTLIBRARIES = libglapi.la -libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) -libglapi_la_LIBADD = $(PTHREAD_LIBS) $(SELINUX_LIBS) -libglapi_la_LDFLAGS = \ - -no-undefined \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -include $(GLAPI)/gen/glapi_gen.mk -glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) - $(call glapi_gen_mapi,$<,shared-glapi) - -BUILT_SOURCES = glapi_mapi_tmp.h -CLEANFILES = $(BUILT_SOURCES) - -AM_CFLAGS = $(PTHREAD_CFLAGS) -AM_CPPFLAGS = \ - $(DEFINES) \ - $(SELINUX_CFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi \ - -DMAPI_MODE_GLAPI \ - -DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\" - -include $(top_srcdir)/install-lib-links.mk |