projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Link glsl_test with pthreads library.
[mesa.git]
/
src
/
egl
/
main
/
Makefile.am
diff --git
a/src/egl/main/Makefile.am
b/src/egl/main/Makefile.am
index 4c20d1215ee0467b2c169282363b59b34255fd01..d21d8a9eb5aeba30aeee2a4fe1a3258051ee9925 100644
(file)
--- a/
src/egl/main/Makefile.am
+++ b/
src/egl/main/Makefile.am
@@
-19,9
+19,7
@@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-if HAVE_XF86VIDMODE
-EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
-endif
+include Makefile.sources
AM_CFLAGS = \
-I$(top_srcdir)/include \
AM_CFLAGS = \
-I$(top_srcdir)/include \
@@
-30,50
+28,22
@@
AM_CFLAGS = \
$(VISIBILITY_CFLAGS) \
$(EGL_CFLAGS) \
-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
$(VISIBILITY_CFLAGS) \
$(EGL_CFLAGS) \
-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
- -D_EGL_DRIVER_SEARCH_DIR=\"$(
EGL_DRIVER_INSTALL_DIR)
\" \
+ -D_EGL_DRIVER_SEARCH_DIR=\"$(
libdir)/egl
\" \
-D_EGL_OS_UNIX=1
lib_LTLIBRARIES = libEGL.la
libEGL_la_SOURCES = \
-D_EGL_OS_UNIX=1
lib_LTLIBRARIES = libEGL.la
libEGL_la_SOURCES = \
- eglapi.c \
- eglarray.c \
- eglconfig.c \
- eglcontext.c \
- eglcurrent.c \
- egldisplay.c \
- egldriver.c \
- eglfallbacks.c \
- eglglobals.c \
- eglimage.c \
- egllog.c \
- eglmisc.c \
- eglmode.c \
- eglscreen.c \
- eglstring.c \
- eglsurface.c \
- eglsync.c \
- eglcompiler.h \
- eglconfig.h \
- eglcontext.h \
- eglcurrent.h \
- egldefines.h \
- egldisplay.h \
- egldriver.h \
- eglglobals.h \
- eglimage.h \
- egllog.h \
- eglmisc.h \
- eglmode.h \
- eglmutex.h \
- eglscreen.h \
- eglstring.h \
- eglsurface.h \
- eglsync.h
+ ${LIBEGL_C_FILES}
libEGL_la_LIBADD = \
$(EGL_LIB_DEPS)
libEGL_la_LIBADD = \
$(EGL_LIB_DEPS)
-libEGL_la_LDFLAGS = -Wl,-Bsymbolic -version-number 1:0 -no-undefined
+libEGL_la_LDFLAGS = \
+ -no-undefined \
+ -version-number 1:0 \
+ $(BSYMBOLIC) \
+ $(GC_SECTIONS) \
+ $(LD_NO_UNDEFINED)
if HAVE_EGL_PLATFORM_X11
AM_CFLAGS += -DHAVE_X11_PLATFORM
if HAVE_EGL_PLATFORM_X11
AM_CFLAGS += -DHAVE_X11_PLATFORM
@@
-102,12
+72,6
@@
if HAVE_EGL_PLATFORM_NULL
AM_CFLAGS += -DHAVE_NULL_PLATFORM
endif
AM_CFLAGS += -DHAVE_NULL_PLATFORM
endif
-if HAVE_EGL_DRIVER_GLX
-AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
-libEGL_la_LIBADD += ../drivers/glx/libegl_glx.la
-libEGL_la_LIBADD += $(DLOPEN_LIBS)
-endif
-
if HAVE_EGL_DRIVER_DRI2
AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
AM_CFLAGS += -DHAVE_XCB_DRI2
if HAVE_EGL_DRIVER_DRI2
AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
AM_CFLAGS += -DHAVE_XCB_DRI2
@@
-128,5
+92,11
@@
egldir = $(includedir)/EGL
egl_HEADERS = \
$(top_srcdir)/include/EGL/eglext.h \
$(top_srcdir)/include/EGL/egl.h \
egl_HEADERS = \
$(top_srcdir)/include/EGL/eglext.h \
$(top_srcdir)/include/EGL/egl.h \
+ $(top_srcdir)/include/EGL/eglextchromium.h \
$(top_srcdir)/include/EGL/eglmesaext.h \
$(top_srcdir)/include/EGL/eglplatform.h
$(top_srcdir)/include/EGL/eglmesaext.h \
$(top_srcdir)/include/EGL/eglplatform.h
+
+EXTRA_DIST = \
+ egl.def \
+ README.txt \
+ SConscript