Merge branch 'master' into glsl2

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

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index c951b070f1f4a8aa9d9c01d21a7a6a9146ffdcde..41d301fc14056b6b3a02f659b354308a1b0f060d 100644 (file)
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -4,7 +4,10 @@ TOP = ../../..
 include $(TOP)/configs/current
 
 
-INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/mesa/glapi $(X11_INCLUDES)
+EGL_MAJOR = 1
+EGL_MINOR = 0
+
+INCLUDE_DIRS = -I$(TOP)/include
 
 HEADERS = \
        eglcompiler.h \
@@ -16,6 +19,7 @@ HEADERS = \
        egldisplay.h \
        egldriver.h \
        eglglobals.h \
+       eglimage.h \
        egllog.h \
        eglmisc.h \
        eglmode.h \
@@ -26,6 +30,7 @@ HEADERS = \
 
 SOURCES = \
        eglapi.c \
+       eglarray.c \
        eglconfig.c \
        eglconfigutil.c \
        eglcontext.c \
@@ -33,6 +38,7 @@ SOURCES = \
        egldisplay.c \
        egldriver.c \
        eglglobals.c \
+       eglimage.c \
        egllog.c \
        eglmisc.c \
        eglmode.c \
@@ -43,9 +49,24 @@ SOURCES = \
 OBJECTS = $(SOURCES:.c=.o)
 
 
-# Undefined for now
-LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1
+# use dl*() to load drivers
+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_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
+       -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\"
 
 .c.o:
        $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
@@ -56,21 +77,46 @@ default: depend library
 
 
 # EGL Library
-library: $(TOP)/$(LIB_DIR)/libEGL.so
+library: $(TOP)/$(LIB_DIR)/$(EGL_LIB_NAME)
 
-$(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS)
-       $(MKLIB) -o EGL -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-               -major 1 -minor 0 \
-               -install $(TOP)/$(LIB_DIR) \
+$(TOP)/$(LIB_DIR)/$(EGL_LIB_NAME): $(OBJECTS)
+       $(MKLIB) -o $(EGL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major $(EGL_MAJOR) -minor $(EGL_MINOR) \
+               -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)/libEGL.so* $(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 *.so*
-       -rm -f core.*
+       -rm -f *.o
        -rm -f depend depend.bak
 
 
@@ -82,5 +128,5 @@ depend: $(SOURCES) $(HEADERS)
                $(SOURCES) $(HEADERS) > /dev/null 2>/dev/null
 
 
-include depend
+-include depend
 # DO NOT DELETE