Merge branch 'mesa_7_5_branch'

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

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 96742bb4bc65b2ded4602a4378e7bfd161e70083..7cab005214d389f887a8a15b1f3a8439b471f94f 100644 (file)
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -4,12 +4,14 @@ TOP = ../../..
 include $(TOP)/configs/current
 
 
-INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/mesa/glapi
+INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/mesa/glapi $(X11_INCLUDES)
 
 HEADERS = \
+       eglcompiler.h \
        eglconfig.h \
        eglconfigutil.h \
        eglcontext.h \
+       eglcurrent.h \
        egldefines.h \
        egldisplay.h \
        egldriver.h \
@@ -28,6 +30,7 @@ SOURCES = \
        eglconfig.c \
        eglconfigutil.c \
        eglcontext.c \
+       eglcurrent.c \
        egldisplay.c \
        egldriver.c \
        eglglobals.c \
@@ -46,8 +49,6 @@ OBJECTS = $(SOURCES:.c=.o)
 # Undefined for now
 LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1
 
-LIBS = -lX11
-
 
 .c.o:
        $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
@@ -61,14 +62,18 @@ default: depend library
 library: $(TOP)/$(LIB_DIR)/libEGL.so
 
 $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS)
-       $(TOP)/bin/mklib -o EGL -major 1 -minor 0 \
-               -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) $(LIBS)
-
+       $(MKLIB) -o EGL -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major 1 -minor 0 \
+               -install $(TOP)/$(LIB_DIR) \
+               $(EGL_LIB_DEPS) $(OBJECTS)
 
+install: default
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(MINSTALL) $(TOP)/$(LIB_DIR)/libEGL.so* $(DESTDIR)$(INSTALL_LIB_DIR)
 
 clean:
-       rm -f *.o *.so*
-       rm -f core.*
+       -rm -f *.o *.so*
+       -rm -f core.*
 
 
 depend: $(SOURCES) $(HEADERS)