Merge branch 'master' into glsl2

[mesa.git] / src / egl / main / Makefile

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 66f8f01b8e2dd388c07419f103d245ab8dc2de4a..41d301fc14056b6b3a02f659b354308a1b0f060d 100644 (file)
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -19,6 +19,7 @@ HEADERS = \
        egldisplay.h \
        egldriver.h \
        eglglobals.h \
+       eglimage.h \
        egllog.h \
        eglmisc.h \
        eglmode.h \
@@ -29,6 +30,7 @@ HEADERS = \
 
 SOURCES = \
        eglapi.c \
+       eglarray.c \
        eglconfig.c \
        eglconfigutil.c \
        eglcontext.c \
@@ -36,6 +38,7 @@ SOURCES = \
        egldisplay.c \
        egldriver.c \
        eglglobals.c \
+       eglimage.c \
        egllog.c \
        eglmisc.c \
        eglmode.c \
@@ -47,13 +50,23 @@ OBJECTS = $(SOURCES:.c=.o)
 
 
 # use dl*() to load drivers
-LOCAL_CFLAGS = -D_EGL_PLATFORM_POSIX=1
-
-EGL_DEFAULT_DISPLAY = $(word 1, $(EGL_DISPLAYS))
+LOCAL_CFLAGS = -D_EGL_OS_UNIX=1
+
+# translate --with-egl-platforms to _EGLPlatformType
+EGL_NATIVE_PLATFORM=_EGL_INVALID_PLATFORM
+ifeq ($(firstword $(EGL_PLATFORMS)),x11)
+EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11
+endif
+ifeq ($(firstword $(EGL_PLATFORMS)),kms)
+EGL_NATIVE_PLATFORM=_EGL_PLATFORM_DRM
+endif
+ifeq ($(firstword $(EGL_PLATFORMS)),fbdev)
+EGL_NATIVE_PLATFORM=_EGL_PLATFORM_FBDEV
+endif
 
 LOCAL_CFLAGS += \
-       -D_EGL_DEFAULT_DISPLAY=\"$(EGL_DEFAULT_DISPLAY)\" \
-       -D_EGL_DRIVER_SEARCH_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
+       -D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
+       -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\"
 
 .c.o:
        $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
@@ -72,10 +85,35 @@ $(TOP)/$(LIB_DIR)/$(EGL_LIB_NAME): $(OBJECTS)
                -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                $(EGL_LIB_DEPS) $(OBJECTS)
 
-install: default
+install-headers:
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/KHR
+       $(INSTALL) -m 644 $(TOP)/include/KHR/*.h \
+               $(DESTDIR)$(INSTALL_INC_DIR)/KHR
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/EGL
+       $(INSTALL) -m 644 $(TOP)/include/EGL/*.h \
+               $(DESTDIR)$(INSTALL_INC_DIR)/EGL
+
+PKG_CONFIG_DIR = $(INSTALL_LIB_DIR)/pkgconfig
+
+gl_pcedit = sed \
+       -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
+       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
+       -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
+       -e 's,@EGL_PC_REQ_PRIV@,$(EGL_PC_REQ_PRIV),' \
+       -e 's,@EGL_PC_LIB_PRIV@,$(EGL_PC_LIB_PRIV),' \
+       -e 's,@EGL_PC_CFLAGS@,$(EGL_PC_CFLAGS),' \
+       -e 's,@EGL_LIB@,$(EGL_LIB),'
+
+egl.pc: egl.pc.in
+       $(gl_pcedit) $< > $@
+
+install: default install-headers egl.pc
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
        $(MINSTALL) $(TOP)/$(LIB_DIR)/$(EGL_LIB_GLOB) \
                $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(INSTALL) -d $(DESTDIR)$(PKG_CONFIG_DIR)
+       $(INSTALL) -m 644 egl.pc $(DESTDIR)$(PKG_CONFIG_DIR)
 
 clean:
        -rm -f *.o